make target/linux/* directories self-contained, use the selected kernel version for the toolchain, autogenerate menuconfig and makefile code for target selection

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

15 files changed, 117 insertions, 138 deletions

diff --git a/target/Config.in b/target/Config.in
index 647aa12b3..be8736612 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -1,143 +1,7 @@
 choice
 	prompt "Target System"
-	default LINUX_2_4_BRCM
-	
-config LINUX_2_6_AU1000
-	bool "AMD Alchemy AUxx [2.6]"
-	select mipsel
-	select LINUX_2_6
-	select PCI_SUPPORT
-	select USB_SUPPORT
-	select USES_JFFS2
-	help
-	  Build firmware for AMD Alchemy 1500 boards
-	  (e.g. 4G-Systems Mesh/Access Cube ...)
-
-config LINUX_2_6_ARUBA
-	bool "Aruba [2.6]"
-	select mips
-	select LINUX_2_6
-	select PCI_SUPPORT
-	select USB_SUPPORT
-	select USES_JFFS2
-	help
-          Build firmware images for Aruba boards 
-
-config LINUX_2_4_AR531X
-	bool "Atheros AR531x [2.4]"
-	depends BROKEN
-	select mips
-	select LINUX_2_4
-	select USES_JFFS2
-	help
-	  Build firmware images for Atheros AR531x based boards
-	  (e.g. Netgear WGT624, Linksys WRT55AG)
-
-config LINUX_2_4_BRCM
-	bool "Broadcom BCM47xx/53xx [2.4]"
-	select mipsel
-	select PCI_SUPPORT
-	select USB_SUPPORT
-	select PCMCIA_SUPPORT
-	select USES_SQUASHFS
-	select USES_JFFS2
-	help
-	  Build firmware images for Broadcom based routers
-	  (e.g. Linksys WRT54G(S), Asus WL-500g, Motorola WR850G)
-	  
-	  This one builds the generic .trx images, activate one of the
-	  options below for creating device specific files for use 
-	  with TFTP client too. 
-
-config LINUX_2_6_BRCM
-	bool "Broadcom BCM47xx/53xx [2.6]"
-	select mipsel
-	select LINUX_2_6
-	select PCI_SUPPORT
-	select USB_SUPPORT
-	select ATM_SUPPORT
-	#select PCMCIA_SUPPORT
-	select USES_SQUASHFS
-	select USES_JFFS2
-	help
-	  Build firmware images for Broadcom based routers
-	  (e.g. Netgear WGT634u)
-
-config LINUX_2_6_BRCM63XX
-	bool "Broadcom BCM63xx [2.6]"
-	depends BROKEN
-	select mips
-	select LINUX_2_6
-	select PCI_SUPPORT
-	select USB_SUPPORT
-	select ATM_SUPPORT
-	select PCMCIA_SUPPORT
-	select USES_SQUASHFS
-	select USES_JFFS2
-	help
-	  Build firmware images for Broadcom based xDSL/routers
-	  (e.g. Inventel Livebox, Siemens SE515)
-
-config LINUX_2_6_IXP4XX
-	bool "Intel XScale IXP4xx [2.6]"
-	select armeb
-	select LINUX_2_6
-	select PCI_SUPPORT
-	select USB_SUPPORT
-	select USES_JFFS2
 
-config LINUX_2_6_MAGICBOX
-	bool "Magicbox [2.6]"
-	select powerpc
-	select LINUX_2_6
-	select PCI_SUPPORT
-	select USES_JFFS2
-
-config LINUX_2_6_RB532
-	bool "Mikrotik RB532 [2.6]"
-	select mipsel
-	select LINUX_2_6
-	select PCI_SUPPORT
-	select USES_JFFS2
-
-config LINUX_2_6_RDC
-	bool "RDC x86 [2.6]"
-	depends BROKEN
-	select i386
-	select LINUX_2_6
-	select PCI_SUPPORT
-	select USES_JFFS2
-	help
-	  Build firmware images for RDC R3203 based routers (e.g. Airlink101 AR525W)
-
-config LINUX_2_4_AR7
-	bool "TI AR7 [2.4]"
-	select mipsel
-	select USES_SQUASHFS
-	select USES_JFFS2
-	help
-	  Build firmware images for TI AR7 based routers (w.g. Linksys WAG54G v2)
-
-config LINUX_2_6_X86
-	bool "x86 [2.6]"
-	select i386
-	select LINUX_2_6
-	select PCI_SUPPORT
-	select USB_SUPPORT
-	select ATM_SUPPORT
-	select PCMCIA_SUPPORT
-	select USES_JFFS2
-	select USES_EXT2
-	help
-	  Build firmware images for x86 based boards
-	  (e.g. Soekris net4521 and net4801, PC Engines WRAP...)
-
-config LINUX_2_6_UML
-	bool "x86 [uml]"
-	select i386
-	select LINUX_2_6
-	help
-	  Build uml targetted images
+source "tmp/.config-target.in"
 
 if DEVEL
 
@@ -288,5 +152,4 @@ config ARCH
 	default "sh4"     if sh4
 	default "sh4eb"   if sh4eb
 	default "sparc"   if sparc
-	default "mipsel"  if !DEVEL
 
diff --git a/target/linux/ar531x-2.4/Makefile b/target/linux/ar531x-2.4/Makefile
index e15eb09b5..7201c04d2 100644
--- a/target/linux/ar531x-2.4/Makefile
+++ b/target/linux/ar531x-2.4/Makefile
@@ -6,6 +6,17 @@
 #
 include $(TOPDIR)/rules.mk
 
+ARCH:=mips
+BOARD:=ar531x
+BOARDNAME:=Atheros AR531x
+FEATURES:=broken jffs2
+
+define Target/Description
+	Build firmware images for Atheros AR531x based boards
+	(e.g. Netgear WGT624, Linksys WRT55AG)
+endef
+
+
 LINUX_VERSION:=2.4.32
 LINUX_RELEASE:=1
 LINUX_KERNEL_MD5SUM:=38f4d0830e95a20f4bfed17622d5557c
diff --git a/target/linux/ar7-2.4/Makefile b/target/linux/ar7-2.4/Makefile
index e15eb09b5..f3d55da19 100644
--- a/target/linux/ar7-2.4/Makefile
+++ b/target/linux/ar7-2.4/Makefile
@@ -6,6 +6,15 @@
 #
 include $(TOPDIR)/rules.mk
 
+ARCH:=mipsel
+BOARD:=ar7
+BOARDNAME:=TI AR7
+FEATURES:=atm squashfs jffs2
+
+define Target/Description
+	Build firmware images for TI AR7 based routers (w.g. Linksys WAG54G v2)
+endef
+
 LINUX_VERSION:=2.4.32
 LINUX_RELEASE:=1
 LINUX_KERNEL_MD5SUM:=38f4d0830e95a20f4bfed17622d5557c
diff --git a/target/linux/aruba-2.6/Makefile b/target/linux/aruba-2.6/Makefile
index 323eb2c3f..c3946e2d1 100644
--- a/target/linux/aruba-2.6/Makefile
+++ b/target/linux/aruba-2.6/Makefile
@@ -6,6 +6,15 @@
 #
 include $(TOPDIR)/rules.mk
 
+ARCH:=mips
+BOARD:=aruba
+BOARDNAME:=Aruba
+FEATURES:=jffs2 pci usb
+
+define Target/Description
+	Build firmware images for Aruba boards
+endef
+
 LINUX_VERSION:=2.6.17
 LINUX_RELEASE:=1
 LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
diff --git a/target/linux/au1000-2.6/Makefile b/target/linux/au1000-2.6/Makefile
index 62d9acbdd..7b36c339a 100644
--- a/target/linux/au1000-2.6/Makefile
+++ b/target/linux/au1000-2.6/Makefile
@@ -6,6 +6,16 @@
 #
 include $(TOPDIR)/rules.mk
 
+ARCH:=mipsel
+BOARD:=au1000
+BOARDNAME:=AMD Alchemy AU1x00
+FEATURES:=pci usb jffs2
+
+define Target/Description
+	Build firmware for AMD Alchemy 1500 boards
+	(e.g. 4G-Systems Mesh/Access Cube ...)
+endef
+
 LINUX_VERSION:=2.6.17
 LINUX_RELEASE:=1
 LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
diff --git a/target/linux/brcm-2.4/Makefile b/target/linux/brcm-2.4/Makefile
index e15eb09b5..7319ccabd 100644
--- a/target/linux/brcm-2.4/Makefile
+++ b/target/linux/brcm-2.4/Makefile
@@ -6,9 +6,24 @@
 #
 include $(TOPDIR)/rules.mk
 
+ARCH:=mipsel
+BOARD:=brcm
+BOARDNAME:=Broadcom BCM947xx/953xx
+FEATURES:=pci usb pcmcia squashfs jffs2
+
+define Target/Description
+	Build firmware images for Broadcom based routers
+	(e.g. Linksys WRT54G(S), Asus WL-500g, Motorola WR850G)
+
+	This one builds the generic .trx images, activate one of the
+	options below for creating device specific files for use
+	with TFTP client too.
+endef
+
 LINUX_VERSION:=2.4.32
 LINUX_RELEASE:=1
 LINUX_KERNEL_MD5SUM:=38f4d0830e95a20f4bfed17622d5557c
 
 include $(INCLUDE_DIR)/kernel-build.mk
+
 $(eval $(call BuildKernel))
diff --git a/target/linux/brcm-2.6/Makefile b/target/linux/brcm-2.6/Makefile
index b2e53bb21..599282803 100644
--- a/target/linux/brcm-2.6/Makefile
+++ b/target/linux/brcm-2.6/Makefile
@@ -6,6 +6,20 @@
 #
 include $(TOPDIR)/rules.mk
 
+ARCH:=mipsel
+BOARD:=brcm
+BOARDNAME:=Broadcom BCM947xx/953xx
+FEATURES:=pci usb pcmcia squashfs jffs2
+
+define Target/Description
+	Build firmware images for Broadcom based routers
+	(e.g. Linksys WRT54G(S), Asus WL-500g, Motorola WR850G)
+
+	This one builds the generic .trx images, activate one of the
+	options below for creating device specific files for use
+	with TFTP client too.
+endef
+
 LINUX_VERSION:=2.6.17
 LINUX_RELEASE:=1
 LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
diff --git a/target/linux/brcm63xx-2.6/Makefile b/target/linux/brcm63xx-2.6/Makefile
index 323eb2c3f..7e61c731b 100644
--- a/target/linux/brcm63xx-2.6/Makefile
+++ b/target/linux/brcm63xx-2.6/Makefile
@@ -6,6 +6,16 @@
 #
 include $(TOPDIR)/rules.mk
 
+ARCH:=mips
+BOARD:=brcm63xx
+BOARDNAME:=Broadcom BCM963xx
+FEATURES:=pci usb atm squashfs jffs2
+
+define Target/Description
+	Build firmware images for Broadcom based xDSL/routers
+	(e.g. Inventel Livebox, Siemens SE515)
+endef
+
 LINUX_VERSION:=2.6.17
 LINUX_RELEASE:=1
 LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
diff --git a/target/linux/ixp4xx-2.6/Makefile b/target/linux/ixp4xx-2.6/Makefile
index 323eb2c3f..86df91fd8 100644
--- a/target/linux/ixp4xx-2.6/Makefile
+++ b/target/linux/ixp4xx-2.6/Makefile
@@ -6,6 +6,15 @@
 #
 include $(TOPDIR)/rules.mk
 
+ARCH:=arm
+BOARD:=ixp4xx
+BOARDNAME:=Intel XScale IXP4xx
+FEATURES:=pci usb jffs2
+
+define Target/Description
+endef
+
+
 LINUX_VERSION:=2.6.17
 LINUX_RELEASE:=1
 LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
diff --git a/target/linux/magicbox-2.6/Makefile b/target/linux/magicbox-2.6/Makefile
index 323eb2c3f..d51c8e483 100644
--- a/target/linux/magicbox-2.6/Makefile
+++ b/target/linux/magicbox-2.6/Makefile
@@ -6,6 +6,11 @@
 #
 include $(TOPDIR)/rules.mk
 
+ARCH:=powerpc
+BOARD:=magicbox
+BOARDNAME:=Magicbox
+FEATURES:=pci jffs2
+
 LINUX_VERSION:=2.6.17
 LINUX_RELEASE:=1
 LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
diff --git a/target/linux/rb532-2.6/Makefile b/target/linux/rb532-2.6/Makefile
index 323eb2c3f..35c4f6d6f 100644
--- a/target/linux/rb532-2.6/Makefile
+++ b/target/linux/rb532-2.6/Makefile
@@ -6,6 +6,11 @@
 #
 include $(TOPDIR)/rules.mk
 
+ARCH:=mipsel
+BOARD:=rb532
+BOARDNAME:=Mikrotik RouterBoard 532
+FEATURES:=pci jffs2
+
 LINUX_VERSION:=2.6.17
 LINUX_RELEASE:=1
 LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
diff --git a/target/linux/rdc-2.6/Makefile b/target/linux/rdc-2.6/Makefile
index 323eb2c3f..3c508c244 100644
--- a/target/linux/rdc-2.6/Makefile
+++ b/target/linux/rdc-2.6/Makefile
@@ -6,6 +6,11 @@
 #
 include $(TOPDIR)/rules.mk
 
+ARCH:=i386
+BOARD:=rdc
+BOARDNAME:=RDC x86
+FEATURES:=broken pci jffs2
+
 LINUX_VERSION:=2.6.17
 LINUX_RELEASE:=1
 LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
diff --git a/target/linux/sibyte-2.6/Makefile b/target/linux/sibyte-2.6/Makefile
index 323eb2c3f..1b4fdfbc9 100644
--- a/target/linux/sibyte-2.6/Makefile
+++ b/target/linux/sibyte-2.6/Makefile
@@ -6,6 +6,11 @@
 #
 include $(TOPDIR)/rules.mk
 
+ARCH:=mips
+BOARD:=sibyte
+BOARDNAME:=SiByte MIPS
+FEATURES:=broken
+
 LINUX_VERSION:=2.6.17
 LINUX_RELEASE:=1
 LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
diff --git a/target/linux/uml-2.6/Makefile b/target/linux/uml-2.6/Makefile
index 323eb2c3f..3ca6b021d 100644
--- a/target/linux/uml-2.6/Makefile
+++ b/target/linux/uml-2.6/Makefile
@@ -6,6 +6,10 @@
 #
 include $(TOPDIR)/rules.mk
 
+ARCH:=i386
+BOARD:=uml
+BOARDNAME:=User Mode Linux
+
 LINUX_VERSION:=2.6.17
 LINUX_RELEASE:=1
 LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e
diff --git a/target/linux/x86-2.6/Makefile b/target/linux/x86-2.6/Makefile
index 323eb2c3f..77912e6fb 100644
--- a/target/linux/x86-2.6/Makefile
+++ b/target/linux/x86-2.6/Makefile
@@ -6,6 +6,11 @@
 #
 include $(TOPDIR)/rules.mk
 
+ARCH=i386
+BOARD:=x86
+BOARDNAME:=x86
+FEATURES:=pci usb atm pcmcia jffs2 ext2
+
 LINUX_VERSION:=2.6.17
 LINUX_RELEASE:=1
 LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e