- 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..

8 files changed, 15 insertions, 23 deletions

diff --git a/Config.in b/Config.in
index 6ea21dddb..c02dd8f4b 100644
--- a/Config.in
+++ b/Config.in
@@ -6,8 +6,6 @@ config BR2_HAVE_DOT_CONFIG
 	bool
 	default y
 
-source "project/Config.in"
-
 choice
 	prompt "Target Architecture"
 	default BR2_i386
diff --git a/project/Config.in b/project/Config.in
index 67dd080e7..e5927c2e3 100644
--- a/project/Config.in
+++ b/project/Config.in
@@ -1,4 +1,4 @@
-menu "Project Options"
+comment "Project Options"
 
 config BR2_PROJECT
 	string "Project name"
@@ -23,4 +23,3 @@ config BR2_BANNER
 	help
 	  The banner string is stored in "/etc/issue"
 
-endmenu
diff --git a/target/device/Toolchain.in b/target/device/Toolchain.in
index 6a35332e4..67881cd96 100644
--- a/target/device/Toolchain.in
+++ b/target/device/Toolchain.in
@@ -8,8 +8,7 @@ choice
 	  system or an external pre-built toolchain.
 
 config BR2_TOOLCHAIN_NORMAL
-	bool
-	prompt "Use default sources for toolchain"
+	bool "Use default sources for toolchain"
 	depends on !BR2_avr32
 	help
 	  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.
 
 config BR2_TOOLCHAIN_ATMEL_AVR32
-	bool
-	prompt "Use prepatched source for AVR32 toolchain"
+	bool "Use prepatched source for AVR32 toolchain"
 	depends on BR2_avr32
 	depends on BR2_GCC_VERSION_4_1_2
 	depends on BR2_GDB_VERSION_6_4 || !BR2_PACKAGE_GDB
diff --git a/toolchain/Config.in b/toolchain/Config.in
index 85d7b341a..775c464ea 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 d9473d325..c3bada025 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 564936739..197f06968 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 c255343a2..2561dec14 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 619f6f657..36198d12b 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