From 5010039460817ceb3893a0f0c8ea15e8d8484023 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Tue, 25 Sep 2007 07:55:45 +0000 Subject: - revert patch that obfuscates the config UI and doesn't reflect the order of config steps --- toolchain/Config.in.2 | 1 + toolchain/gcc/Config.in | 34 ---------------------------------- toolchain/kernel-headers/Config.in | 2 +- 3 files changed, 2 insertions(+), 35 deletions(-) (limited to 'toolchain') diff --git a/toolchain/Config.in.2 b/toolchain/Config.in.2 index 2483b70e0..c3bada025 100644 --- a/toolchain/Config.in.2 +++ b/toolchain/Config.in.2 @@ -1,6 +1,7 @@ # if BR2_TOOLCHAIN_BUILDROOT +source "toolchain/kernel-headers/Config.in" source "toolchain/uClibc/Config.in" source "toolchain/binutils/Config.in" source "toolchain/gcc/Config.in" diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in index ebaf05d7b..2561dec14 100644 --- a/toolchain/gcc/Config.in +++ b/toolchain/gcc/Config.in @@ -117,40 +117,6 @@ config BR2_GCC_VERSION default "4.2.1" if BR2_GCC_VERSION_4_2_1 default "4.3" if BR2_GCC_VERSION_4_3 -choice - prompt "Target ABI" - depends BR2_arm || BR2_armeb - default BR2_ARM_OABI - help - Application Binary Interface to use - -config BR2_ARM_OABI - bool "OABI" -config BR2_ARM_EABI - bool "EABI" -endchoice - -config BR2_GCC_TARGET_ABI - string - default apcs-gnu if BR2_arm_dunno - default atpcs if BR2_arm_dunno - default aapcs if BR2_arm_dunno - default aapcs-linux if BR2_arm_dunno - default iwmmxt if BR2_iwmmxt - default 32 if BR2_mipsel && BR2_OABI - default n32 if BR2_mipsel && BR2_EABI - default o64 if BR2_mips && BR2_OABI - default 64 if BR2_mips && BR2_ABI64 - default eabi if BR2_mips && BR2_EABI - default mmixware if BR2_mmix && BR2_ABI_native - default gnu if BR2_mmix && !BR2_ABI_native - default altivec if BR2_powerpc && BR2_ABI_altivec - default no-altivec if BR2_powerpc && BR2_ABI_no-altivec - default spe if BR2_powerpc && BR2_ABI_spe - default no-spe if BR2_powerpc && BR2_ABI_no-spe - default ibmlongdouble if BR2_powerpc && BR2_ABI_ibmlongdouble - default ieeelongdouble if BR2_powerpc && BR2_ABI_ieeelongdouble - config BR2_TOOLCHAIN_SYSROOT bool "Enable toolchain with --sysroot support" depends on !BR2_GCC_VERSION_3_3_5 && !BR2_GCC_VERSION_3_3_6 && !BR2_GCC_VERSION_3_4_2 && !BR2_GCC_VERSION_3_4_3 && !BR2_GCC_VERSION_3_4_4 && !BR2_GCC_VERSION_3_4_5 && !BR2_GCC_VERSION_3_4_6 && !BR2_GCC_VERSION_4_0_0 && !BR2_GCC_VERSION_4_0_1 && !BR2_GCC_VERSION_4_0_2 && !BR2_GCC_VERSION_4_0_3 && !BR2_GCC_VERSION_4_0_4 && !BR2_GCC_VERSION_4_1_0 && !BR2_GCC_VERSION_4_1_1 && !BR2_GCC_VERSION_4_1_2 diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in index 70b133cdc..d66fa177e 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. # -comment "Kernel Header Options - Should not be modified once toolchain is built" +comment "Kernel Header Options" choice prompt "Kernel Headers" -- cgit v1.2.3