aboutsummaryrefslogtreecommitdiff
path: root/toolchain
diff options
context:
space:
mode:
authorGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-09-22 14:16:25 +0000
committerGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-09-22 14:16:25 +0000
commit51a61c9011d838db18af16f5f8e294f9e301bad2 (patch)
tree67a30004a22b0645ecb141608516c7bd9d12e88a /toolchain
parent5f0baad2937640ecf09b65697e8b10d30368f7b9 (diff)
downloadbuildroot-51a61c9011d838db18af16f5f8e294f9e301bad2.tar.gz
buildroot-51a61c9011d838db18af16f5f8e294f9e301bad2.tar.bz2
- 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..
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/Config.in14
-rw-r--r--toolchain/Config.in.26
-rw-r--r--toolchain/external-toolchain/Config.in2
-rw-r--r--toolchain/gcc/Config.in2
-rw-r--r--toolchain/kernel-headers/Config.in3
5 files changed, 12 insertions, 15 deletions
diff --git a/toolchain/Config.in b/toolchain/Config.in
index 85d7b341a2..775c464eaf 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -1,4 +1,4 @@
-menu "Toolchain type"
+menu "Toolchain"
choice
prompt "Toolchain type"
default BR2_TOOLCHAIN_BUILDROOT
@@ -7,17 +7,17 @@ choice
system or an external pre-built toolchain.
config BR2_TOOLCHAIN_BUILDROOT
- bool
- prompt "Buildroot toolchain"
+ bool "Buildroot toolchain"
config BR2_TOOLCHAIN_EXTERNAL
- bool
- prompt "External toolchain"
+ bool "External toolchain"
endchoice
source "target/device/Toolchain.in"
-endmenu
-
source "toolchain/Config.in.2"
source "toolchain/external-toolchain/Config.in"
+
+source "project/Config.in"
+
+endmenu
diff --git a/toolchain/Config.in.2 b/toolchain/Config.in.2
index d9473d3251..c3bada0251 100644
--- a/toolchain/Config.in.2
+++ b/toolchain/Config.in.2
@@ -1,8 +1,6 @@
#
-menu "Toolchain Options"
- depends on BR2_TOOLCHAIN_BUILDROOT
-
+if BR2_TOOLCHAIN_BUILDROOT
source "toolchain/kernel-headers/Config.in"
source "toolchain/uClibc/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
cross toolchain dir under <arch>-linux-uclibc/target_utils/.
-endmenu
+endif
diff --git a/toolchain/external-toolchain/Config.in b/toolchain/external-toolchain/Config.in
index 5649367395..197f069680 100644
--- a/toolchain/external-toolchain/Config.in
+++ b/toolchain/external-toolchain/Config.in
@@ -1,6 +1,6 @@
#
-menu "Toolchain Options"
+menu "External Toolchain Options"
depends on BR2_TOOLCHAIN_EXTERNAL
config BR2_TOOLCHAIN_EXTERNAL_LIB_C
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index c255343a27..2561dec14b 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -1,6 +1,6 @@
# Choose gcc version.
-comment "Gcc Options"
+comment "GCC Options"
choice
prompt "GCC compiler Version"
diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 619f6f657e..36198d12b3 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -2,7 +2,7 @@
# ignored if you are building your own kernel or using the system kernel.
#
-menu "Kernel Header Options"
+comment "Kernel Header Options"
choice
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.6" if BR2_KERNEL_HEADERS_2_6_22
-endmenu