From f1afccc2d9b644d94efceb99a9f30f4ec4c5a7fb Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Fri, 5 Mar 2010 04:15:51 +0000 Subject: [PATCH] Add subtarget for each device SVN-Revision: 19986 --- target/linux/xburst/Makefile | 5 ++-- target/linux/xburst/config-2.6.32 | 33 +++++++++++------------ target/linux/xburst/image/Makefile | 18 +++++++++++-- target/linux/xburst/n526/config-2.6.32 | 1 + target/linux/xburst/n526/target.mk | 2 ++ target/linux/xburst/qi_lb60/config-2.6.32 | 19 +++++++++++++ target/linux/xburst/qi_lb60/target.mk | 2 ++ 7 files changed, 57 insertions(+), 23 deletions(-) create mode 100644 target/linux/xburst/n526/config-2.6.32 create mode 100644 target/linux/xburst/n526/target.mk create mode 100644 target/linux/xburst/qi_lb60/config-2.6.32 create mode 100644 target/linux/xburst/qi_lb60/target.mk diff --git a/target/linux/xburst/Makefile b/target/linux/xburst/Makefile index 24a8545de5..bd746de1b5 100644 --- a/target/linux/xburst/Makefile +++ b/target/linux/xburst/Makefile @@ -8,8 +8,9 @@ include $(TOPDIR)/rules.mk ARCH:=mipsel BOARD:=xburst -BOARDNAME:=XBurst JZ47x0 +BOARDNAME:=Ingenic XBurst FEATURES:=jffs2 tgz ubifs audio +SUBTARGETS:=qi_lb60 n526 LINUX_VERSION:=2.6.32.9 @@ -19,8 +20,6 @@ include $(INCLUDE_DIR)/target.mk KERNELNAME:=uImage -DEFAULT_PACKAGES += gpioctl - define Target/Description Build firmware images for XBurst JZ47x0 based boards. endef diff --git a/target/linux/xburst/config-2.6.32 b/target/linux/xburst/config-2.6.32 index 74df160e0d..85b880c3f7 100644 --- a/target/linux/xburst/config-2.6.32 +++ b/target/linux/xburst/config-2.6.32 @@ -11,10 +11,10 @@ CONFIG_ARCH_REQUIRE_GPIOLIB=y CONFIG_ARCH_SUPPORTS_OPROFILE=y CONFIG_ARCH_SUSPEND_POSSIBLE=y # CONFIG_ARPD is not set -CONFIG_BACKLIGHT_CLASS_DEVICE=y +# CONFIG_BACKLIGHT_CLASS_DEVICE is not set # CONFIG_BACKLIGHT_GENERIC is not set -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_BATTERY_JZ4740=y +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set +# CONFIG_BATTERY_JZ4740 is not set # CONFIG_BCM47XX is not set # CONFIG_BCM63XX is not set CONFIG_BITREVERSE=y @@ -92,7 +92,7 @@ CONFIG_FONTS=y CONFIG_FORCE_MAX_ZONEORDER=12 # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set -CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE is not set CONFIG_FREEZER=y # CONFIG_FSNOTIFY is not set CONFIG_GENERIC_CLOCKEVENTS_BUILD=y @@ -132,22 +132,23 @@ CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP=y CONFIG_IRQ_CPU=y CONFIG_JBD=y -CONFIG_JZ4740_ADC=y +# CONFIG_JZ4740_ADC is not set +# CONFIG_JZ4740_N516 is not set # CONFIG_JZ4740_N526 is not set -CONFIG_JZ4740_QI_LB60=y +# CONFIG_JZ4740_QI_LB60 is not set CONFIG_JZRISC=y CONFIG_JZSOC=y CONFIG_KALLSYMS=y CONFIG_KEYBOARD_ATKBD=y -CONFIG_KEYBOARD_GPIO=y +# CONFIG_KEYBOARD_GPIO is not set # CONFIG_KEYBOARD_LKKBD is not set -CONFIG_KEYBOARD_MATRIX=y +# CONFIG_KEYBOARD_MATRIX is not set # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_XTKBD is not set -CONFIG_LCD_CLASS_DEVICE=y -CONFIG_LCD_GPM940B0=y +# CONFIG_LCD_CLASS_DEVICE is not set +# CONFIG_LCD_GPM940B0 is not set # CONFIG_LCD_ILI9320 is not set # CONFIG_LCD_LMS283GF05 is not set # CONFIG_LCD_LTV350QV is not set @@ -160,8 +161,8 @@ CONFIG_LOCK_KERNEL=y # CONFIG_LOGO_LINUX_CLUT224 is not set # CONFIG_LOGO_LINUX_MONO is not set # CONFIG_LOGO_LINUX_VGA16 is not set -CONFIG_LOGO_OPENWRT_CLUT224=y -CONFIG_LOGO=y +# CONFIG_LOGO_OPENWRT_CLUT224 is not set +# CONFIG_LOGO is not set CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y # CONFIG_MACH_ALCHEMY is not set @@ -193,7 +194,7 @@ CONFIG_MMC=y # CONFIG_MTD_CFI is not set # CONFIG_MTD_COMPLEX_MAPPINGS is not set CONFIG_MTD_NAND_JZ4740=y -CONFIG_MTD_NAND_VERIFY_WRITE=y +# CONFIG_MTD_NAND_VERIFY_WRITE is not set CONFIG_MTD_NAND=y CONFIG_MTD_UBI_BEB_RESERVE=1 # CONFIG_MTD_UBI_DEBUG is not set @@ -316,11 +317,7 @@ CONFIG_SOC_JZ4740=y # CONFIG_SOUND_OSS_CORE_PRECLAIM is not set CONFIG_SOUND_OSS_CORE=y CONFIG_SOUND=y -CONFIG_SPI_BITBANG=y -CONFIG_SPI_GPIO=y -CONFIG_SPI_MASTER=y # CONFIG_SPI_SPIDEV is not set -CONFIG_SPI=y # CONFIG_SQUASHFS is not set # CONFIG_STAGING is not set CONFIG_SUSPEND_FREEZER=y @@ -381,7 +378,7 @@ CONFIG_USB_GADGET_VBUS_DRAW=2 CONFIG_USB_GADGET=y # CONFIG_USB_G_PRINTER is not set # CONFIG_USB_G_SERIAL is not set -CONFIG_USB_JZ4740=y +# CONFIG_USB_JZ4740 is not set # CONFIG_USB_MIDI_GADGET is not set CONFIG_USB_SUPPORT=y # CONFIG_USB_ZERO is not set diff --git a/target/linux/xburst/image/Makefile b/target/linux/xburst/image/Makefile index dcc97e7657..0947db0549 100644 --- a/target/linux/xburst/image/Makefile +++ b/target/linux/xburst/image/Makefile @@ -9,8 +9,23 @@ include $(INCLUDE_DIR)/image.mk JFFS2_BLOCKSIZE=256k 512k +ifneq ($(CONFIG_TARGET_QI_LB60),) UBIFS_OPTS = -m 4096 -e 516096 -c 4095 UBINIZE_OPTS = -m 4096 -p 512KiB +else +UBIFS_OPTS = -m 2048 -e 126KiB -c 4096 +UBINIZE_OPTS = -m 2048 -p 128KiB -s 512 +endif + +ifneq ($(CONFIG_XBURST_UBOOT),) + define Build/Clean + $(MAKE) -C u-boot clean + endef + + define Build/Compile + $(MAKE) -C u-boot compile + endef +endif define Image/BuildKernel cp $(KDIR)/linux-$(LINUX_VERSION)/arch/mips/boot/uImage $(BIN_DIR)/openwrt-$(BOARD)-uImage.bin @@ -21,8 +36,7 @@ define Image/Build/squashfs endef define Image/Build - $(call Image/Build/$(1)) - dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-root.$(1) bs=128k conv=sync + dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(SUBTARGET)-root.$(1) bs=128k conv=sync endef $(eval $(call BuildImage)) diff --git a/target/linux/xburst/n526/config-2.6.32 b/target/linux/xburst/n526/config-2.6.32 new file mode 100644 index 0000000000..baf1552fbf --- /dev/null +++ b/target/linux/xburst/n526/config-2.6.32 @@ -0,0 +1 @@ +CONFIG_JZ4740_N516=y diff --git a/target/linux/xburst/n526/target.mk b/target/linux/xburst/n526/target.mk new file mode 100644 index 0000000000..edc4d17d17 --- /dev/null +++ b/target/linux/xburst/n526/target.mk @@ -0,0 +1,2 @@ +BOARDNAME:=Hanvon N526 e-book reader +DEFAULT_PACKAGES += uboot-xburst-n526 diff --git a/target/linux/xburst/qi_lb60/config-2.6.32 b/target/linux/xburst/qi_lb60/config-2.6.32 new file mode 100644 index 0000000000..fdd2f01b52 --- /dev/null +++ b/target/linux/xburst/qi_lb60/config-2.6.32 @@ -0,0 +1,19 @@ +ONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_BATTERY_JZ4740=y +CONFIG_CHARGER_GPIO=y +CONFIG_FB_JZ4740=y +CONFIG_FONT_MINI_4x6=y +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_JZ4740_ADC=y +CONFIG_JZ4740_QI_LB60=y +CONFIG_KEYBOARD_GPIO=y +CONFIG_KEYBOARD_MATRIX=y +CONFIG_LCD_CLASS_DEVICE=y +CONFIG_LCD_GPM940B0=y +CONFIG_LOGO=y +CONFIG_LOGO_OPENWRT_CLUT224=y +CONFIG_SPI=y +CONFIG_SPI_BITBANG=y +CONFIG_SPI_GPIO=y +CONFIG_SPI_MASTER=y diff --git a/target/linux/xburst/qi_lb60/target.mk b/target/linux/xburst/qi_lb60/target.mk new file mode 100644 index 0000000000..40f667e803 --- /dev/null +++ b/target/linux/xburst/qi_lb60/target.mk @@ -0,0 +1,2 @@ +BOARDNAME:=QI Ben Nanonote (qi_lb60) +#DEFAULT_PACKAGES += uboot-xburst-qi_lb60