* [Buildroot] [PATCH 1/4] toolchain/arm: drop generic and old, add fa526/626, unify strongarm
@ 2013-04-04 17:29 Gustavo Zacarias
2013-04-04 17:29 ` [Buildroot] [PATCH 2/4] openssl: adjust ARM optimizations Gustavo Zacarias
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Gustavo Zacarias @ 2013-04-04 17:29 UTC (permalink / raw)
To: buildroot
* 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>
---
Config.in.legacy | 16 ++++++++++++++++
arch/Config.in.arm | 29 +++++++++--------------------
toolchain/gcc/Config.in | 6 +++---
toolchain/uClibc/Config.in | 7 ++-----
toolchain/uClibc/uClibc-0.9.31.config | 2 +-
toolchain/uClibc/uclibc.mk | 3 +++
6 files changed, 34 insertions(+), 29 deletions(-)
diff --git a/Config.in.legacy b/Config.in.legacy
index 43e2afe..4cd62b8 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -44,6 +44,22 @@ endif
# Legacy options since 2013.02
#
+config BR2_sa110
+ bool "sa110 ARM target switched to strongarm"
+ select BR2_LEGACY
+ select BR2_strongarm
+ help
+ The SA110 is the same as a generic StrongARM, it just differs
+ in speed, peripherals and cache.
+
+config BR2_sa1100
+ bool "sa1100 ARM target switched to strongarm"
+ select BR2_LEGACY
+ select BR2_strongarm
+ help
+ The SA1100 is the same as a generic StrongARM, it just differs
+ in speed, peripherals and cache.
+
config BR2_PACKAGE_GDISK
bool "gdisk has been replaced by gptfdisk"
select BR2_LEGACY
diff --git a/arch/Config.in.arm b/arch/Config.in.arm
index 79f08f7..f706dcc 100644
--- a/arch/Config.in.arm
+++ b/arch/Config.in.arm
@@ -9,18 +9,12 @@ config BR2_ARM_CPU_MAYBE_HAS_NEON
choice
prompt "Target Architecture Variant"
depends on BR2_arm || BR2_armeb
- default BR2_generic_arm
+ default BR2_arm926t
help
Specific CPU variant to use
-config BR2_generic_arm
- bool "generic_arm"
config BR2_arm7tdmi
bool "arm7tdmi"
-config BR2_arm610
- bool "arm610"
-config BR2_arm710
- bool "arm710"
config BR2_arm720t
bool "arm720t"
config BR2_arm920t
@@ -51,10 +45,10 @@ config BR2_cortex_a9
config BR2_cortex_a15
bool "cortex-A15"
select BR2_ARM_CPU_HAS_NEON
-config BR2_sa110
- bool "sa110"
-config BR2_sa1100
- bool "sa1100"
+config BR2_fa526
+ bool "fa526/626"
+config BR2_strongarm
+ bool "strongarm sa110/sa1100"
config BR2_xscale
bool "xscale"
config BR2_iwmmxt
@@ -105,9 +99,6 @@ config BR2_ENDIAN
default "BIG" if BR2_armeb
config BR2_GCC_TARGET_TUNE
- default "arm600" if BR2_arm600
- default "arm610" if BR2_arm610
- default "arm620" if BR2_arm620
default "arm7tdmi" if BR2_arm7tdmi
default "arm7tdmi" if BR2_arm720t
default "arm7tdmi" if BR2_arm740t
@@ -123,15 +114,13 @@ config BR2_GCC_TARGET_TUNE
default "cortex-a8" if BR2_cortex_a8
default "cortex-a9" if BR2_cortex_a9
default "cortex-a15" if BR2_cortex_a15
- default "strongarm110" if BR2_sa110
- default "strongarm1100" if BR2_sa1100
+ default "fa526" if BR2_fa526
+ default "strongarm" if BR2_strongarm
default "xscale" if BR2_xscale
default "iwmmxt" if BR2_iwmmxt
config BR2_GCC_TARGET_ARCH
default "armv4t" if BR2_arm7tdmi
- default "armv3" if BR2_arm610
- default "armv3" if BR2_arm710
default "armv4t" if BR2_arm720t
default "armv4t" if BR2_arm920t
default "armv4t" if BR2_arm922t
@@ -145,8 +134,8 @@ config BR2_GCC_TARGET_ARCH
default "armv7-a" if BR2_cortex_a8
default "armv7-a" if BR2_cortex_a9
default "armv7-a" if BR2_cortex_a15
- default "armv4" if BR2_sa110
- default "armv4" if BR2_sa1100
+ default "armv4" if BR2_fa526
+ default "armv4" if BR2_strongarm
default "armv5te" if BR2_xscale
default "iwmmxt" if BR2_iwmmxt
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index f8cb82a..527288f 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 57c9933..b53bb24 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 2f363db..e990178 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 e8b2bb4..113dc79 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
--
1.8.1.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/4] openssl: adjust ARM optimizations
2013-04-04 17:29 [Buildroot] [PATCH 1/4] toolchain/arm: drop generic and old, add fa526/626, unify strongarm Gustavo Zacarias
@ 2013-04-04 17:29 ` Gustavo Zacarias
2013-04-04 17:29 ` [Buildroot] [PATCH 3/4] speex: " Gustavo Zacarias
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Gustavo Zacarias @ 2013-04-04 17:29 UTC (permalink / raw)
To: buildroot
We no longer support ARM less than v4 so just kill dead code that we had
for those cases.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/openssl/openssl.mk | 6 ------
1 file changed, 6 deletions(-)
diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index 96f817d..7701d51 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -29,14 +29,8 @@ endif
# Some architectures are optimized in OpenSSL
ifeq ($(ARCH),arm)
-ifneq ($(BR2_generic_arm),y)
-ifneq ($(BR2_arm610),y)
-ifneq ($(BR2_arm710),y)
OPENSSL_TARGET_ARCH = armv4
endif
-endif
-endif
-endif
ifeq ($(ARCH),powerpc)
# 4xx cores seem to have trouble with openssl's ASM optimizations
ifeq ($(BR2_powerpc_401)$(BR2_powerpc_403)$(BR2_powerpc_405)$(BR2_powerpc_405fp)$(BR2_powerpc_440)$(BR2_powerpc_440fp),)
--
1.8.1.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 3/4] speex: adjust ARM optimizations
2013-04-04 17:29 [Buildroot] [PATCH 1/4] toolchain/arm: drop generic and old, add fa526/626, unify strongarm Gustavo Zacarias
2013-04-04 17:29 ` [Buildroot] [PATCH 2/4] openssl: adjust ARM optimizations Gustavo Zacarias
@ 2013-04-04 17:29 ` Gustavo Zacarias
2013-04-04 17:29 ` [Buildroot] [PATCH 4/4] ffmpeg: " Gustavo Zacarias
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Gustavo Zacarias @ 2013-04-04 17:29 UTC (permalink / raw)
To: buildroot
We no longer support ARM less than v4 so drop the generic asm option.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/speex/Config.in | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/package/speex/Config.in b/package/speex/Config.in
index 424a830..7e87566 100644
--- a/package/speex/Config.in
+++ b/package/speex/Config.in
@@ -8,18 +8,13 @@ config BR2_PACKAGE_SPEEX
http://www.speex.org/
-config BR2_PACKAGE_SPEEX_ARM_GENERIC
- bool
- default y
- depends on BR2_PACKAGE_SPEEX && (BR2_generic_arm || BR2_arm610 || BR2_arm710)
-
config BR2_PACKAGE_SPEEX_ARM4
bool
default y
- depends on BR2_PACKAGE_SPEEX && (BR2_arm7tdmi || BR2_arm720t || BR2_arm920t || BR2_arm922t || BR2_sa110 || BR2_sa1100)
+ depends on BR2_PACKAGE_SPEEX && (BR2_arm7tdmi || BR2_arm720t || BR2_arm920t || BR2_arm922t || BR2_strongarm || BR2_fa526)
config BR2_PACKAGE_SPEEX_ARM5E
default y
bool
- depends on BR2_PACKAGE_SPEEX && BR2_arm && !(BR2_PACKAGE_SPEEX_ARM_GENERIC || BR2_PACKAGE_SPEEX_ARM4)
+ depends on BR2_PACKAGE_SPEEX && BR2_arm && !BR2_PACKAGE_SPEEX_ARM4
--
1.8.1.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 4/4] ffmpeg: adjust ARM optimizations
2013-04-04 17:29 [Buildroot] [PATCH 1/4] toolchain/arm: drop generic and old, add fa526/626, unify strongarm Gustavo Zacarias
2013-04-04 17:29 ` [Buildroot] [PATCH 2/4] openssl: adjust ARM optimizations Gustavo Zacarias
2013-04-04 17:29 ` [Buildroot] [PATCH 3/4] speex: " Gustavo Zacarias
@ 2013-04-04 17:29 ` Gustavo Zacarias
2013-04-07 20:01 ` [Buildroot] [PATCH 1/4] toolchain/arm: drop generic and old, add fa526/626, unify strongarm Thomas Petazzoni
2013-04-11 7:30 ` Peter Korsgaard
4 siblings, 0 replies; 6+ messages in thread
From: Gustavo Zacarias @ 2013-04-04 17:29 UTC (permalink / raw)
To: buildroot
We no longer support ARM less than v3 so kill dead code.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/multimedia/ffmpeg/ffmpeg.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk
index b018ea0..2e88b6b 100644
--- a/package/multimedia/ffmpeg/ffmpeg.mk
+++ b/package/multimedia/ffmpeg/ffmpeg.mk
@@ -136,7 +136,7 @@ endif
# Explicitly disable everything that doesn't match for ARM
# FFMPEG "autodetects" by compiling an extended instruction via AS
# This works on compilers that aren't built for generic by default
-ifeq ($(BR2_generic_arm)$(BR2_arm7tdmi)$(BR2_arm610)$(BR2_arm710)$(BR2_arm720t)$(BR2_arm920t)$(BR2_arm922t),y)
+ifeq ($(BR2_arm7tdmi)$(BR2_arm720t)$(BR2_arm920t)$(BR2_arm922t)$(BR2_strongarm)$(BR2_fa526),y)
FFMPEG_CONF_OPT += --disable-armv5te
endif
ifeq ($(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf-s),y)
--
1.8.1.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/4] toolchain/arm: drop generic and old, add fa526/626, unify strongarm
2013-04-04 17:29 [Buildroot] [PATCH 1/4] toolchain/arm: drop generic and old, add fa526/626, unify strongarm Gustavo Zacarias
` (2 preceding siblings ...)
2013-04-04 17:29 ` [Buildroot] [PATCH 4/4] ffmpeg: " Gustavo Zacarias
@ 2013-04-07 20:01 ` Thomas Petazzoni
2013-04-11 7:30 ` Peter Korsgaard
4 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2013-04-07 20:01 UTC (permalink / raw)
To: buildroot
Dear Gustavo Zacarias,
On Thu, 4 Apr 2013 14:29:45 -0300, Gustavo Zacarias wrote:
> * 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>
For the four patches:
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/4] toolchain/arm: drop generic and old, add fa526/626, unify strongarm
2013-04-04 17:29 [Buildroot] [PATCH 1/4] toolchain/arm: drop generic and old, add fa526/626, unify strongarm Gustavo Zacarias
` (3 preceding siblings ...)
2013-04-07 20:01 ` [Buildroot] [PATCH 1/4] toolchain/arm: drop generic and old, add fa526/626, unify strongarm Thomas Petazzoni
@ 2013-04-11 7:30 ` Peter Korsgaard
4 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2013-04-11 7:30 UTC (permalink / raw)
To: buildroot
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> * Add Faraday FA526/626 as suggested on bug #1291
Gustavo> Note however that these cores are v4 and NOT v4t.
Gustavo> * Make the sa110 & sa1110 cores -> strongarm since they're the same.
Gustavo> * Drop all of the ARM variants lower than v4 including generic, there's
Gustavo> no point in supporting obsolete targets.
Gustavo> * Fix uClibc USE_BX logic, it was always on, this would break the new
Gustavo> FA526/626 support and broke StrongARM since it's a v4 core.
Committed all 4, thanks!
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-04-11 7:30 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-04 17:29 [Buildroot] [PATCH 1/4] toolchain/arm: drop generic and old, add fa526/626, unify strongarm Gustavo Zacarias
2013-04-04 17:29 ` [Buildroot] [PATCH 2/4] openssl: adjust ARM optimizations Gustavo Zacarias
2013-04-04 17:29 ` [Buildroot] [PATCH 3/4] speex: " Gustavo Zacarias
2013-04-04 17:29 ` [Buildroot] [PATCH 4/4] ffmpeg: " Gustavo Zacarias
2013-04-07 20:01 ` [Buildroot] [PATCH 1/4] toolchain/arm: drop generic and old, add fa526/626, unify strongarm Thomas Petazzoni
2013-04-11 7:30 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox