Commit 9474421d authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

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: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 36319e23

Config.in.legacy

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

arch/Config.in.arm

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

toolchain/gcc/Config.in

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

toolchain/uClibc/Config.in

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

toolchain/uClibc/uClibc-0.9.31.config

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