make target selection nicer, choose arch automatically

SVN-Revision: 2947
master
Imre Kaloz 19 years ago
parent ecc5aefc05
commit 5bb18eb8e1
  1. 34
      openwrt/Config.in
  2. 33
      openwrt/Config.in.devel
  3. 15
      openwrt/target/Config.in

@ -10,58 +10,52 @@ config BR2_HAVE_DOT_CONFIG
bool bool
default y default y
choice
prompt "Target Architecture"
default BR2_mipsel
# Supported architectures # Supported architectures
config BR2_i386 config BR2_i386
bool "i386" tristate
config BR2_mips config BR2_mips
bool "mips" tristate
config BR2_mipsel config BR2_mipsel
bool "mipsel" tristate
# Unsupported architectures
if CONFIG_DEVEL if CONFIG_DEVEL
# Unsupported architectures
config BR2_arm config BR2_arm
bool "arm" tristate
config BR2_armeb config BR2_armeb
bool "armeb" tristate
config BR2_cris config BR2_cris
bool "cris" tristate
config BR2_m68k config BR2_m68k
bool "m68k" tristate
config BR2_powerpc config BR2_powerpc
bool "powerpc" tristate
config BR2_sh3 config BR2_sh3
bool "sh3" tristate
config BR2_sh3eb config BR2_sh3eb
bool "sh3eb" tristate
config BR2_sh4 config BR2_sh4
bool "sh4" tristate
config BR2_sh4eb config BR2_sh4eb
bool "sh4eb" tristate
config BR2_sparc config BR2_sparc
bool "sparc" tristate
endif endif
endchoice
config BR2_ARCH config BR2_ARCH
string string

@ -13,55 +13,50 @@ config BR2_HAVE_DOT_CONFIG
bool bool
default y default y
choice
prompt "Target Architecture"
default BR2_mipsel
# Supported architectures # Supported architectures
config BR2_i386 config BR2_i386
bool "i386" tristate
config BR2_mips config BR2_mips
bool "mips" tristate
config BR2_mipsel config BR2_mipsel
bool "mipsel" tristate
# Unsupported architectures
if CONFIG_DEVEL if CONFIG_DEVEL
# Unsupported architectures
config BR2_arm config BR2_arm
bool "arm" tristate
config BR2_armeb config BR2_armeb
bool "armeb" tristate
config BR2_cris config BR2_cris
bool "cris" tristate
config BR2_m68k config BR2_m68k
bool "m68k" tristate
config BR2_powerpc config BR2_powerpc
bool "powerpc" tristate
config BR2_sh3 config BR2_sh3
bool "sh3" tristate
config BR2_sh3eb config BR2_sh3eb
bool "sh3eb" tristate
config BR2_sh4 config BR2_sh4
bool "sh4" tristate
config BR2_sh4eb config BR2_sh4eb
bool "sh4eb" tristate
config BR2_sparc config BR2_sparc
bool "sparc" tristate
endif endif
endchoice endchoice

@ -1,22 +1,23 @@
choice choice
prompt "Target System" prompt "Target System"
default BR2_LINUX_2_4_BRCM
config BR2_LINUX_2_4_AR531X config BR2_LINUX_2_4_AR531X
bool "Atheros AR531x [2.4]" bool "Atheros AR531x [2.4]"
depends BR2_mips select BR2_mips
help help
Build firmware images for Atheros AR531x based boards Build firmware images for Atheros AR531x based boards
(e.g. Netgear WGT624, Linksys WRT55AG) (e.g. Netgear WGT624, Linksys WRT55AG)
config BR2_LINUX_2_6_ARUBA config BR2_LINUX_2_6_ARUBA
bool "Aruba [2.6]" bool "Aruba [2.6]"
depends BR2_mips select BR2_mips
help help
Build firmware images for Aruba boards Build firmware images for Aruba boards
config BR2_LINUX_2_4_BRCM config BR2_LINUX_2_4_BRCM
bool "Broadcom BCM47xx/53xx [2.4]" bool "Broadcom BCM47xx/53xx [2.4]"
depends BR2_mipsel select BR2_mipsel
select BR2_LINUX_PCMCIA_SUPPORT select BR2_LINUX_PCMCIA_SUPPORT
help help
Build firmware images for Broadcom based routers Build firmware images for Broadcom based routers
@ -28,7 +29,7 @@ config BR2_LINUX_2_4_BRCM
config BR2_LINUX_2_6_BRCM config BR2_LINUX_2_6_BRCM
bool "Broadcom BCM47xx/53xx [2.6]" bool "Broadcom BCM47xx/53xx [2.6]"
depends BR2_mipsel select BR2_mipsel
select BR2_LINUX_PCMCIA_SUPPORT select BR2_LINUX_PCMCIA_SUPPORT
help help
Build firmware images for Broadcom based routers Build firmware images for Broadcom based routers
@ -36,13 +37,13 @@ config BR2_LINUX_2_6_BRCM
config BR2_LINUX_2_4_AR7 config BR2_LINUX_2_4_AR7
bool "TI AR7 [2.4]" bool "TI AR7 [2.4]"
depends BR2_mipsel select BR2_mipsel
help help
Build firmware images for TI AR7 based routers (w.g. Linksys WAG54G v2) Build firmware images for TI AR7 based routers (w.g. Linksys WAG54G v2)
config BR2_LINUX_2_4_X86 config BR2_LINUX_2_4_X86
bool "x86 [2.4]" bool "x86 [2.4]"
depends BR2_i386 select BR2_i386
select BR2_LINUX_PCMCIA_SUPPORT select BR2_LINUX_PCMCIA_SUPPORT
help help
Build firmware images for x86 based boards Build firmware images for x86 based boards
@ -50,7 +51,7 @@ config BR2_LINUX_2_4_X86
config BR2_LINUX_2_6_X86 config BR2_LINUX_2_6_X86
bool "x86 [2.6]" bool "x86 [2.6]"
depends BR2_i386 select BR2_i386
select BR2_LINUX_PCMCIA_SUPPORT select BR2_LINUX_PCMCIA_SUPPORT
help help
Build firmware images for x86 based boards Build firmware images for x86 based boards

Loading…
Cancel
Save