- Subsume and collaps toolchain options in one menu

This is ment to ease configuration by providing toolchain related options in one place
  No functional changes, just shuffling the menus around..
This commit is contained in:
Bernhard Reutner-Fischer 2007-09-22 14:16:25 +00:00
parent 5f0baad293
commit 51a61c9011
8 changed files with 15 additions and 23 deletions

View File

@ -6,8 +6,6 @@ config BR2_HAVE_DOT_CONFIG
bool bool
default y default y
source "project/Config.in"
choice choice
prompt "Target Architecture" prompt "Target Architecture"
default BR2_i386 default BR2_i386

View File

@ -1,4 +1,4 @@
menu "Project Options" comment "Project Options"
config BR2_PROJECT config BR2_PROJECT
string "Project name" string "Project name"
@ -23,4 +23,3 @@ config BR2_BANNER
help help
The banner string is stored in "/etc/issue" The banner string is stored in "/etc/issue"
endmenu

View File

@ -8,8 +8,7 @@ choice
system or an external pre-built toolchain. system or an external pre-built toolchain.
config BR2_TOOLCHAIN_NORMAL config BR2_TOOLCHAIN_NORMAL
bool bool "Use default sources for toolchain"
prompt "Use default sources for toolchain"
depends on !BR2_avr32 depends on !BR2_avr32
help help
Download vanilla binutils, gcc, uclibc and gdb from their Download vanilla binutils, gcc, uclibc and gdb from their
@ -18,8 +17,7 @@ config BR2_TOOLCHAIN_NORMAL
I.E: Do not download a prepatched vendor source suite. I.E: Do not download a prepatched vendor source suite.
config BR2_TOOLCHAIN_ATMEL_AVR32 config BR2_TOOLCHAIN_ATMEL_AVR32
bool bool "Use prepatched source for AVR32 toolchain"
prompt "Use prepatched source for AVR32 toolchain"
depends on BR2_avr32 depends on BR2_avr32
depends on BR2_GCC_VERSION_4_1_2 depends on BR2_GCC_VERSION_4_1_2
depends on BR2_GDB_VERSION_6_4 || !BR2_PACKAGE_GDB depends on BR2_GDB_VERSION_6_4 || !BR2_PACKAGE_GDB

View File

@ -1,4 +1,4 @@
menu "Toolchain type" menu "Toolchain"
choice choice
prompt "Toolchain type" prompt "Toolchain type"
default BR2_TOOLCHAIN_BUILDROOT default BR2_TOOLCHAIN_BUILDROOT
@ -7,17 +7,17 @@ choice
system or an external pre-built toolchain. system or an external pre-built toolchain.
config BR2_TOOLCHAIN_BUILDROOT config BR2_TOOLCHAIN_BUILDROOT
bool bool "Buildroot toolchain"
prompt "Buildroot toolchain"
config BR2_TOOLCHAIN_EXTERNAL config BR2_TOOLCHAIN_EXTERNAL
bool bool "External toolchain"
prompt "External toolchain"
endchoice endchoice
source "target/device/Toolchain.in" source "target/device/Toolchain.in"
endmenu
source "toolchain/Config.in.2" source "toolchain/Config.in.2"
source "toolchain/external-toolchain/Config.in" source "toolchain/external-toolchain/Config.in"
source "project/Config.in"
endmenu

View File

@ -1,8 +1,6 @@
# #
menu "Toolchain Options" if BR2_TOOLCHAIN_BUILDROOT
depends on BR2_TOOLCHAIN_BUILDROOT
source "toolchain/kernel-headers/Config.in" source "toolchain/kernel-headers/Config.in"
source "toolchain/uClibc/Config.in" source "toolchain/uClibc/Config.in"
source "toolchain/binutils/Config.in" source "toolchain/binutils/Config.in"
@ -81,4 +79,4 @@ config BR2_CROSS_TOOLCHAIN_TARGET_UTILS
Answer Y if you want these apps (if built) copied into the Answer Y if you want these apps (if built) copied into the
cross toolchain dir under <arch>-linux-uclibc/target_utils/. cross toolchain dir under <arch>-linux-uclibc/target_utils/.
endmenu endif

View File

@ -1,6 +1,6 @@
# #
menu "Toolchain Options" menu "External Toolchain Options"
depends on BR2_TOOLCHAIN_EXTERNAL depends on BR2_TOOLCHAIN_EXTERNAL
config BR2_TOOLCHAIN_EXTERNAL_LIB_C config BR2_TOOLCHAIN_EXTERNAL_LIB_C

View File

@ -1,6 +1,6 @@
# Choose gcc version. # Choose gcc version.
comment "Gcc Options" comment "GCC Options"
choice choice
prompt "GCC compiler Version" prompt "GCC compiler Version"

View File

@ -2,7 +2,7 @@
# ignored if you are building your own kernel or using the system kernel. # ignored if you are building your own kernel or using the system kernel.
# #
menu "Kernel Header Options" comment "Kernel Header Options"
choice choice
prompt "Kernel Headers" prompt "Kernel Headers"
@ -113,4 +113,3 @@ config BR2_DEFAULT_KERNEL_HEADERS
default "2.6.22.1" if BR2_KERNEL_HEADERS_2_6_22_1 default "2.6.22.1" if BR2_KERNEL_HEADERS_2_6_22_1
default "2.6.22.6" if BR2_KERNEL_HEADERS_2_6_22 default "2.6.22.6" if BR2_KERNEL_HEADERS_2_6_22
endmenu