ar71xx: add a new subtarget for nand based devices - saves around 44k on the lzma compressed generic kernel image

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21396 3c298f89-4303-0410-b956-a3cf2f4a3e73

25 files changed, 61 insertions, 36 deletions

diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile
index 540fe51d1cd..d3bf6878d81 100644
--- a/target/linux/ar71xx/Makefile
+++ b/target/linux/ar71xx/Makefile
@@ -11,6 +11,7 @@ BOARD:=ar71xx
 BOARDNAME:=Atheros AR71xx/AR7240/AR913x
 FEATURES:=squashfs jffs2 targz
 CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -funit-at-a-time
+SUBTARGETS:=generic nand
 
 LINUX_VERSION:=2.6.32.12
 
diff --git a/target/linux/ar71xx/config-2.6.32 b/target/linux/ar71xx/config-2.6.32
index 5c17220634f..8987a634390 100644
--- a/target/linux/ar71xx/config-2.6.32
+++ b/target/linux/ar71xx/config-2.6.32
@@ -164,9 +164,6 @@ CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_JEDECPROBE=y
 CONFIG_MTD_M25P80=y
 CONFIG_MTD_MYLOADER_PARTS=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_RB4XX=y
-CONFIG_MTD_NAND_RB750=y
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2
 CONFIG_MTD_REDBOOT_PARTS=y
 CONFIG_MTD_WRT160NL_PARTS=y
@@ -240,13 +237,4 @@ CONFIG_TRAD_SIGNALS=y
 # CONFIG_TREE_PREEMPT_RCU is not set
 CONFIG_TREE_RCU=y
 CONFIG_USB_SUPPORT=y
-CONFIG_YAFFS_9BYTE_TAGS=y
-CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED=y
-CONFIG_YAFFS_AUTO_YAFFS2=y
-# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
-# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
-CONFIG_YAFFS_FS=y
-CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
-CONFIG_YAFFS_YAFFS1=y
-CONFIG_YAFFS_YAFFS2=y
 CONFIG_ZONE_DMA_FLAG=0
diff --git a/target/linux/ar71xx/config-2.6.33 b/target/linux/ar71xx/config-2.6.33
index ca49737f785..0cd23586621 100644
--- a/target/linux/ar71xx/config-2.6.33
+++ b/target/linux/ar71xx/config-2.6.33
@@ -203,9 +203,6 @@ CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_JEDECPROBE=y
 CONFIG_MTD_M25P80=y
 CONFIG_MTD_MYLOADER_PARTS=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_RB4XX=y
-CONFIG_MTD_NAND_RB750=y
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2
 CONFIG_MTD_REDBOOT_PARTS=y
 CONFIG_MTD_WRT160NL_PARTS=y
@@ -281,13 +278,4 @@ CONFIG_TRAD_SIGNALS=y
 # CONFIG_TREE_PREEMPT_RCU is not set
 CONFIG_TREE_RCU=y
 CONFIG_USB_SUPPORT=y
-CONFIG_YAFFS_9BYTE_TAGS=y
-CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED=y
-CONFIG_YAFFS_AUTO_YAFFS2=y
-# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
-# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
-CONFIG_YAFFS_FS=y
-CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
-CONFIG_YAFFS_YAFFS1=y
-CONFIG_YAFFS_YAFFS2=y
 CONFIG_ZONE_DMA_FLAG=0
diff --git a/target/linux/ar71xx/config-2.6.34 b/target/linux/ar71xx/config-2.6.34
index 7085b227bbb..b11442c13ca 100644
--- a/target/linux/ar71xx/config-2.6.34
+++ b/target/linux/ar71xx/config-2.6.34
@@ -226,9 +226,6 @@ CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_JEDECPROBE=y
 CONFIG_MTD_M25P80=y
 CONFIG_MTD_MYLOADER_PARTS=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_RB4XX=y
-CONFIG_MTD_NAND_RB750=y
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2
 CONFIG_MTD_REDBOOT_PARTS=y
 CONFIG_MTD_WRT160NL_PARTS=y
@@ -306,13 +303,4 @@ CONFIG_TRAD_SIGNALS=y
 # CONFIG_TREE_PREEMPT_RCU is not set
 CONFIG_USB_SUPPORT=y
 CONFIG_VLAN_8021Q=m
-CONFIG_YAFFS_9BYTE_TAGS=y
-CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED=y
-CONFIG_YAFFS_AUTO_YAFFS2=y
-# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
-# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
-CONFIG_YAFFS_FS=y
-CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
-CONFIG_YAFFS_YAFFS1=y
-CONFIG_YAFFS_YAFFS2=y
 CONFIG_ZONE_DMA_FLAG=0
diff --git a/target/linux/ar71xx/generic/config-default b/target/linux/ar71xx/generic/config-default
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/target/linux/ar71xx/generic/config-default
diff --git a/target/linux/ar71xx/profiles/00-default.mk b/target/linux/ar71xx/generic/profiles/00-default.mk
index aa46f22c54a..aa46f22c54a 100644
--- a/target/linux/ar71xx/profiles/00-default.mk
+++ b/target/linux/ar71xx/generic/profiles/00-default.mk
diff --git a/target/linux/ar71xx/profiles/01-minimal.mk b/target/linux/ar71xx/generic/profiles/01-minimal.mk
index 3651c88ab2d..3651c88ab2d 100644
--- a/target/linux/ar71xx/profiles/01-minimal.mk
+++ b/target/linux/ar71xx/generic/profiles/01-minimal.mk
diff --git a/target/linux/ar71xx/profiles/02-madwifi.mk b/target/linux/ar71xx/generic/profiles/02-madwifi.mk
index 7c22c53db57..7c22c53db57 100644
--- a/target/linux/ar71xx/profiles/02-madwifi.mk
+++ b/target/linux/ar71xx/generic/profiles/02-madwifi.mk
diff --git a/target/linux/ar71xx/profiles/atheros.mk b/target/linux/ar71xx/generic/profiles/atheros.mk
index 4ce0e605c63..4ce0e605c63 100644
--- a/target/linux/ar71xx/profiles/atheros.mk
+++ b/target/linux/ar71xx/generic/profiles/atheros.mk
diff --git a/target/linux/ar71xx/profiles/atlantis.mk b/target/linux/ar71xx/generic/profiles/atlantis.mk
index c63fd9c275c..c63fd9c275c 100644
--- a/target/linux/ar71xx/profiles/atlantis.mk
+++ b/target/linux/ar71xx/generic/profiles/atlantis.mk
diff --git a/target/linux/ar71xx/profiles/buffalo.mk b/target/linux/ar71xx/generic/profiles/buffalo.mk
index 69819e586df..69819e586df 100644
--- a/target/linux/ar71xx/profiles/buffalo.mk
+++ b/target/linux/ar71xx/generic/profiles/buffalo.mk
diff --git a/target/linux/ar71xx/profiles/compex.mk b/target/linux/ar71xx/generic/profiles/compex.mk
index 38d963a5c17..38d963a5c17 100644
--- a/target/linux/ar71xx/profiles/compex.mk
+++ b/target/linux/ar71xx/generic/profiles/compex.mk
diff --git a/target/linux/ar71xx/profiles/d-link.mk b/target/linux/ar71xx/generic/profiles/d-link.mk
index bf99e099a98..bf99e099a98 100644
--- a/target/linux/ar71xx/profiles/d-link.mk
+++ b/target/linux/ar71xx/generic/profiles/d-link.mk
diff --git a/target/linux/ar71xx/profiles/linksys.mk b/target/linux/ar71xx/generic/profiles/linksys.mk
index f3253e728f4..f3253e728f4 100644
--- a/target/linux/ar71xx/profiles/linksys.mk
+++ b/target/linux/ar71xx/generic/profiles/linksys.mk
diff --git a/target/linux/ar71xx/profiles/netgear.mk b/target/linux/ar71xx/generic/profiles/netgear.mk
index 8545cad0c6b..8545cad0c6b 100644
--- a/target/linux/ar71xx/profiles/netgear.mk
+++ b/target/linux/ar71xx/generic/profiles/netgear.mk
diff --git a/target/linux/ar71xx/profiles/planex.mk b/target/linux/ar71xx/generic/profiles/planex.mk
index 63e539c4e42..63e539c4e42 100644
--- a/target/linux/ar71xx/profiles/planex.mk
+++ b/target/linux/ar71xx/generic/profiles/planex.mk
diff --git a/target/linux/ar71xx/profiles/tp-link.mk b/target/linux/ar71xx/generic/profiles/tp-link.mk
index 7efb1a3766f..7efb1a3766f 100644
--- a/target/linux/ar71xx/profiles/tp-link.mk
+++ b/target/linux/ar71xx/generic/profiles/tp-link.mk
diff --git a/target/linux/ar71xx/profiles/trendnet.mk b/target/linux/ar71xx/generic/profiles/trendnet.mk
index 20a08f3842e..20a08f3842e 100644
--- a/target/linux/ar71xx/profiles/trendnet.mk
+++ b/target/linux/ar71xx/generic/profiles/trendnet.mk
diff --git a/target/linux/ar71xx/profiles/ubnt.mk b/target/linux/ar71xx/generic/profiles/ubnt.mk
index a7fd9a26190..a7fd9a26190 100644
--- a/target/linux/ar71xx/profiles/ubnt.mk
+++ b/target/linux/ar71xx/generic/profiles/ubnt.mk
diff --git a/target/linux/ar71xx/profiles/zyxel.mk b/target/linux/ar71xx/generic/profiles/zyxel.mk
index 73ae4e224c8..73ae4e224c8 100644
--- a/target/linux/ar71xx/profiles/zyxel.mk
+++ b/target/linux/ar71xx/generic/profiles/zyxel.mk
diff --git a/target/linux/ar71xx/generic/target.mk b/target/linux/ar71xx/generic/target.mk
new file mode 100644
index 00000000000..9ba527bff09
--- /dev/null
+++ b/target/linux/ar71xx/generic/target.mk
@@ -0,0 +1,7 @@
+BOARDNAME:=Generic
+
+define Target/Description
+	Build firmware images for generic Atheros AR71xx/AR913x based boards.
+endef
+
+
diff --git a/target/linux/ar71xx/nand/config-default b/target/linux/ar71xx/nand/config-default
new file mode 100644
index 00000000000..3fa8d7b160c
--- /dev/null
+++ b/target/linux/ar71xx/nand/config-default
@@ -0,0 +1,13 @@
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_RB4XX=y
+CONFIG_MTD_NAND_RB750=y
+CONFIG_YAFFS_9BYTE_TAGS=y
+CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED=y
+CONFIG_YAFFS_AUTO_YAFFS2=y
+# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
+# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
+CONFIG_YAFFS_FS=y
+CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
+CONFIG_YAFFS_YAFFS1=y
+CONFIG_YAFFS_YAFFS2=y
+
diff --git a/target/linux/ar71xx/nand/profiles/01-minimal.mk b/target/linux/ar71xx/nand/profiles/01-minimal.mk
new file mode 100644
index 00000000000..3651c88ab2d
--- /dev/null
+++ b/target/linux/ar71xx/nand/profiles/01-minimal.mk
@@ -0,0 +1,16 @@
+#
+# Copyright (C) 2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/DefaultNoWifi
+	NAME:=Default Profile (no WiFi)
+	PACKAGES:=
+endef
+
+define Profile/DefaultNoWifi/Description
+	Default package set compatible with most boards.
+endef
+$(eval $(call Profile,DefaultNoWifi))
diff --git a/target/linux/ar71xx/nand/profiles/02-madwifi.mk b/target/linux/ar71xx/nand/profiles/02-madwifi.mk
new file mode 100644
index 00000000000..7c22c53db57
--- /dev/null
+++ b/target/linux/ar71xx/nand/profiles/02-madwifi.mk
@@ -0,0 +1,16 @@
+#
+# Copyright (C) 2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/Madwifi
+	NAME:=Atheros WiFi (madwifi)
+	PACKAGES:=kmod-madwifi wpad-mini
+endef
+
+define Profile/Madwifi/Description
+	Package set compatible with hardware using Atheros WiFi cards.
+endef
+$(eval $(call Profile,Madwifi))
diff --git a/target/linux/ar71xx/nand/target.mk b/target/linux/ar71xx/nand/target.mk
new file mode 100644
index 00000000000..f01ef645faf
--- /dev/null
+++ b/target/linux/ar71xx/nand/target.mk
@@ -0,0 +1,8 @@
+BOARDNAME:=Devices with NAND flash
+
+define Target/Description
+	Build firmware images for Atheros AR71xx/AR913x based boards with 
+	NAND flash, e.g. MikroTik RB-4xx or RB-750
+endef
+
+