diff options
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/gcc/Config.in | 6 | ||||
| -rw-r--r-- | toolchain/uClibc/Config.in | 7 | ||||
| -rw-r--r-- | toolchain/uClibc/uClibc-0.9.31.config | 2 | ||||
| -rw-r--r-- | toolchain/uClibc/uclibc.mk | 3 |
4 files changed, 9 insertions, 9 deletions
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in index f8cb82aab..527288f71 100644 --- a/toolchain/gcc/Config.in +++ b/toolchain/gcc/Config.in @@ -18,15 +18,15 @@ choice bool "gcc 4.2.2-avr32-2.1.5" config BR2_GCC_VERSION_4_3_X - depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_cortex_a5 && !BR2_cortex_a8 && !BR2_cortex_a9 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_e300c2 && !BR2_powerpc_e300c3 && !BR2_powerpc_e500mc && !BR2_powerpc_464 && !BR2_powerpc_464fp && !BR2_powerpc_476 && !BR2_powerpc_476fp + depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_cortex_a5 && !BR2_cortex_a8 && !BR2_cortex_a9 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_e300c2 && !BR2_powerpc_e300c3 && !BR2_powerpc_e500mc && !BR2_powerpc_464 && !BR2_powerpc_464fp && !BR2_powerpc_476 && !BR2_powerpc_476fp && !BR2_fa526 bool "gcc 4.3.x" config BR2_GCC_VERSION_4_4_X - depends on !BR2_avr32 && !BR2_cortex_a5 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_476 && !BR2_powerpc_476fp + depends on !BR2_avr32 && !BR2_cortex_a5 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_476 && !BR2_powerpc_476fp && !BR2_fa526 bool "gcc 4.4.x" config BR2_GCC_VERSION_4_5_X - depends on !BR2_avr32 && !BR2_cortex_a15 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 + depends on !BR2_avr32 && !BR2_cortex_a15 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_fa526 select BR2_GCC_NEEDS_MPC bool "gcc 4.5.x" diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in index 57c993349..b53bb2450 100644 --- a/toolchain/uClibc/Config.in +++ b/toolchain/uClibc/Config.in @@ -81,9 +81,7 @@ config BR2_UCLIBC_INSTALL_TEST_SUITE config BR2_UCLIBC_ARM_TYPE string depends on BR2_arm || BR2_armeb - default GENERIC_ARM if BR2_generic_arm - default ARM610 if BR2_arm610 - default ARM710 if BR2_arm710 + default GENERIC_ARM if BR2_fa526 default ARM7TDMI if BR2_arm7tdmi default ARM720T if BR2_arm720t default ARM920T if BR2_arm920t @@ -93,8 +91,7 @@ config BR2_UCLIBC_ARM_TYPE default ARM1136JF_S if BR2_arm1136jf_s default ARM1176JZ_S if BR2_arm1176jz_s default ARM1176JZF_S if BR2_arm1176jzf_s - default ARM_SA110 if BR2_sa110 - default ARM_SA1100 if BR2_sa1100 + default ARM_SA1100 if BR2_strongarm default ARM_XSCALE if BR2_xscale default ARM_IWMMXT if BR2_iwmmxt default ARM_CORTEXA8 if BR2_cortex_a8 diff --git a/toolchain/uClibc/uClibc-0.9.31.config b/toolchain/uClibc/uClibc-0.9.31.config index 2f363db08..e990178df 100644 --- a/toolchain/uClibc/uClibc-0.9.31.config +++ b/toolchain/uClibc/uClibc-0.9.31.config @@ -238,7 +238,7 @@ WARNINGS="-Wall" # DOMULTI is not set # UCLIBC_MJN3_ONLY is not set -# USE_BX is not set +USE_BX=y # CONFIG_GENERIC_ARM is not set # CONFIG_ARM610 is not set # CONFIG_ARM710 is not set diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk index e8b2bb494..113dc79e5 100644 --- a/toolchain/uClibc/uclibc.mk +++ b/toolchain/uClibc/uclibc.mk @@ -130,6 +130,9 @@ ifeq ($(BR2_ARM_OABI),y) /bin/echo "CONFIG_ARM_OABI=y" >> $(UCLIBC_DIR)/.oldconfig /bin/echo "# CONFIG_ARM_EABI is not set" >> $(UCLIBC_DIR)/.oldconfig endif +ifeq ($(BR2_fa526)$(BR2_strongarm),y) + $(SED) 's,USE_BX=y,# USE_BX is not set,' $(UCLIBC_DIR)/.oldconfig +endif endif ifeq ($(UCLIBC_TARGET_ARCH),mips) $(SED) '/CONFIG_MIPS_[NO].._ABI/d' $(UCLIBC_DIR)/.oldconfig |