aboutsummaryrefslogtreecommitdiff
path: root/toolchain/uClibc
diff options
context:
space:
mode:
authorGravatar Gustavo Zacarias <gustavo@zacarias.com.ar>2013-04-04 07:29:45 +0000
committerGravatar Peter Korsgaard <jacmet@sunsite.dk>2013-04-11 09:22:48 +0200
commit9474421da36d8602f56b84b150e4cf4c78e788b3 (patch)
tree80ff1369f505ad06137f14e8e37cf8b02adda541 /toolchain/uClibc
parent36319e23e84fd04dec18d5cdce9848fff25f2cb0 (diff)
downloadbuildroot-9474421da36d8602f56b84b150e4cf4c78e788b3.tar.gz
buildroot-9474421da36d8602f56b84b150e4cf4c78e788b3.tar.bz2
toolchain/arm: drop generic and old, add fa526/626, unify strongarm
* Add Faraday FA526/626 as suggested on bug #1291 Note however that these cores are v4 and NOT v4t. * Make the sa110 & sa1110 cores -> strongarm since they're the same. * Drop all of the ARM variants lower than v4 including generic, there's no point in supporting obsolete targets. * Fix uClibc USE_BX logic, it was always on, this would break the new FA526/626 support and broke StrongARM since it's a v4 core. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'toolchain/uClibc')
-rw-r--r--toolchain/uClibc/Config.in7
-rw-r--r--toolchain/uClibc/uClibc-0.9.31.config2
-rw-r--r--toolchain/uClibc/uclibc.mk3
3 files changed, 6 insertions, 6 deletions
diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index 57c9933497..b53bb24500 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 2f363db08f..e990178df5 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 e8b2bb4944..113dc79e58 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