diff options
| author | Tom Rini <trini@konsulko.com> | 2017-01-10 08:19:21 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-01-10 08:19:21 -0500 |
| commit | 0b8404332ed08799ca0630e4cc868df039f206e3 (patch) | |
| tree | c5d4e2c1f963b5716ae9dd7024dce5341feb6856 /arch/arm/lib | |
| parent | a705ebc81b7f91bbd0ef7c634284208342901149 (diff) | |
| parent | eb77f5c9f69ef6c8cb39643b7b7107ef7bff5305 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
Diffstat (limited to 'arch/arm/lib')
| -rw-r--r-- | arch/arm/lib/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/lib/vectors.S | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile index 0051f76db02..024139da25f 100644 --- a/arch/arm/lib/Makefile +++ b/arch/arm/lib/Makefile @@ -77,8 +77,10 @@ ifndef CONFIG_HAS_THUMB2 # for C files, just apend -marm, which will override previous -mthumb* +ifndef CONFIG_ARM64 CFLAGS_cache.o := -marm CFLAGS_cache-cp15.o := -marm +endif # For .S, drop -mthumb* and other thumb-related options. # CFLAGS_REMOVE_* would not have an effet, so AFLAGS_REMOVE_* diff --git a/arch/arm/lib/vectors.S b/arch/arm/lib/vectors.S index 5cc132b7b84..9fe7415b66c 100644 --- a/arch/arm/lib/vectors.S +++ b/arch/arm/lib/vectors.S @@ -67,7 +67,6 @@ _start: * use it here. */ #include <asm/arch/boot0.h> -ARM_SOC_BOOT0_HOOK #endif /* |