Removed uneeded and confusing auto* lines, thanks to mjt for reporting this

[openwrt.git] / openwrt / target / Config.in

diff --git a/openwrt/target/Config.in b/openwrt/target/Config.in
index dc9224f..03eabb7 100644 (file)
--- a/openwrt/target/Config.in
+++ b/openwrt/target/Config.in
@@ -1,10 +1,66 @@
-comment "after changing root fs, use make linux-dirclean"
-
 choice
-       prompt "Target Root Filesystem"
-       source "target/jffs2/Config.in"
-       source "target/squashfs/Config.in"
-       source "target/squashfs-lzma/Config.in"
+       prompt "Target System"
+       default BR2_LINUX_2_4_BRCM
+       
+config BR2_LINUX_2_4_AR531X
+       bool "Atheros AR531x [2.4]"
+       select BR2_mips
+       help
+         Build firmware images for Atheros AR531x based boards
+         (e.g. Netgear WGT624, Linksys WRT55AG)
+
+config BR2_LINUX_2_6_ARUBA
+       bool "Aruba [2.6]"
+       select BR2_mips
+       help
+          Build firmware images for Aruba boards 
+
+config BR2_LINUX_2_4_BRCM
+       bool "Broadcom BCM47xx/53xx [2.4]"
+       select BR2_mipsel
+       select BR2_LINUX_PCMCIA_SUPPORT
+       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 BR2_LINUX_2_6_BRCM
+       bool "Broadcom BCM47xx/53xx [2.6]"
+       select BR2_mipsel
+       select BR2_LINUX_PCMCIA_SUPPORT
+       help
+         Build firmware images for Broadcom based routers
+         (e.g. Netgear WGT634u)
+
+config BR2_LINUX_2_4_AR7
+       bool "TI AR7 [2.4]"
+       select BR2_mipsel
+       help
+         Build firmware images for TI AR7 based routers (w.g. Linksys WAG54G v2)
+
+config BR2_LINUX_2_4_X86
+       bool "x86 [2.4]"
+       select BR2_i386
+       select BR2_LINUX_PCMCIA_SUPPORT
+       help
+         Build firmware images for x86 based boards
+         (e.g. Soekris net4521 and net4801, PC Engines WRAP...)
+
+config BR2_LINUX_2_6_X86
+       bool "x86 [2.6]"
+       select BR2_i386
+       select BR2_LINUX_PCMCIA_SUPPORT
+       help
+         Build firmware images for x86 based boards
+         (e.g. Soekris net4521 and net4801, PC Engines WRAP...)
+
 endchoice
 
-source "target/device/Config.in"
+config BR2_LINUX_PCMCIA_SUPPORT
+       bool
+       default n
+       depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_4_BRCM || BR2_LINUX_2_6_X86 || BR2_LINUX_2_6_BRCM
+