Commit 51a61c90 authored by Bernhard Reutner-Fischer's avatar Bernhard Reutner-Fischer
Browse files

- 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..
parent 5f0baad2

Config.in

+0 −2
Original line number Diff line number Diff line
@@ -6,8 +6,6 @@ config BR2_HAVE_DOT_CONFIG 
	bool

	default y



source "project/Config.in"



choice

	prompt "Target Architecture"

	default BR2_i386

project/Config.in

+1 −2
Original line number Diff line number Diff line 
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

target/device/Toolchain.in

+2 −4
Original line number Diff line number Diff line
@@ -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

toolchain/Config.in

+7 −7
Original line number Diff line number Diff line 
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

toolchain/Config.in.2

+2 −4
Original line number Diff line number Diff line 
#



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