leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm: Add Kconfig symbols used for Linux asm compatibility

Browse Source 
Rather than change asm files that come from Linux, add the symbols
to Kconfig. Since one of the symbols is for thumb2 builds, make
CPU_V7M always select them.

Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
This commit is contained in:
Phil Edworthy 2017-06-01 07:33:28 +01:00 committed by Tom Rini
parent a83afb6b1f
commit 111a6af97a
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/Kconfig
View File

@ -19,6 +19,15 @@ config HAS_VBAR
config HAS_THUMB2 config HAS_THUMB2
bool bool
# Used for compatibility with asm files copied from the kernel
config ARM_ASM_UNIFIED
bool
default y
# Used for compatibility with asm files copied from the kernel
config THUMB2_KERNEL
bool
# If set, the workarounds for these ARM errata are applied early during U-Boot # If set, the workarounds for these ARM errata are applied early during U-Boot
# startup. Note that in general these options force the workarounds to be # startup. Note that in general these options force the workarounds to be
# applied; no CPU-type/version detection exists, unlike the similar options in # applied; no CPU-type/version detection exists, unlike the similar options in
@ -128,6 +137,7 @@ config CPU_V7
config CPU_V7M config CPU_V7M
bool bool
select HAS_THUMB2 select HAS_THUMB2
select THUMB2_KERNEL
select SYS_CACHE_SHIFT_5 select SYS_CACHE_SHIFT_5
config CPU_PXA config CPU_PXA

2
arch/arm/lib/Makefile
View File

@ -72,8 +72,6 @@ ifneq (,$(findstring -mabi=aapcs-linux,$(PLATFORM_CPPFLAGS)))
extra-y += eabi_compat.o extra-y += eabi_compat.o
endif endif
asflags-y += -DCONFIG_ARM_ASM_UNIFIED
# some files can only build in ARM or THUMB2, not THUMB1 # some files can only build in ARM or THUMB2, not THUMB1
ifdef CONFIG_$(SPL_)SYS_THUMB_BUILD ifdef CONFIG_$(SPL_)SYS_THUMB_BUILD