diff options
| author | Tom Rini <trini@konsulko.com> | 2017-03-18 13:01:44 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-03-19 00:28:01 (GMT) |
| commit | 3a649407a49b041ceb826d55b5919dc8297f8965 (patch) | |
| tree | 7ebd285b96a3f3299c31052d423b1b688acd697f /arch/arm/cpu | |
| parent | ae9b57b50b2dfad6fefb37af95991362f79abcd3 (diff) | |
| download | u-boot-3a649407a49b041ceb826d55b5919dc8297f8965.tar.xz | |
arm: Migrate SYS_THUMB_BUILD to Kconfig, introduce SPL_SYS_THUMB_BUILD
Today, we have cases where we wish to build all of U-Boot in Thumb2 mode for
various reasons. We also have cases where we only build SPL in Thumb2 mode due
to size constraints and wish to build the rest of the system in ARM mode. So
in this migration we introduce a new symbol as well, SPL_SYS_THUMB_BUILD to
control if we build everything or just SPL (or in theory, just U-Boot) in
Thumb2 mode.
Signed-off-by: Tom Rini <trini@konsulko.com>
Acked-by: Siarhei Siamashka <siarhei.siamashka@gmail.com>
Diffstat (limited to 'arch/arm/cpu')
| -rw-r--r-- | arch/arm/cpu/arm920t/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/arm926ejs/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/arm926ejs/cache.c | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/cache_v7_asm.S | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/pxa/cache.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/cpu/arm920t/Makefile b/arch/arm/cpu/arm920t/Makefile index 1832b9d..7aa432a 100644 --- a/arch/arm/cpu/arm920t/Makefile +++ b/arch/arm/cpu/arm920t/Makefile @@ -16,6 +16,6 @@ obj-$(CONFIG_S3C24X0) += s3c24x0/ # some files can only build in ARM mode -ifdef CONFIG_SYS_THUMB_BUILD +ifdef CONFIG_$(SPL_)SYS_THUMB_BUILD CFLAGS_cpu.o := -marm endif diff --git a/arch/arm/cpu/arm926ejs/Makefile b/arch/arm/cpu/arm926ejs/Makefile index fe78922..0f73011 100644 --- a/arch/arm/cpu/arm926ejs/Makefile +++ b/arch/arm/cpu/arm926ejs/Makefile @@ -23,7 +23,7 @@ obj-$(if $(filter spear,$(SOC)),y) += spear/ # some files can only build in ARM or THUMB2, not THUMB1 -ifdef CONFIG_SYS_THUMB_BUILD +ifdef CONFIG_$(SPL_)SYS_THUMB_BUILD ifndef CONFIG_HAS_THUMB2 CFLAGS_cpu.o := -marm diff --git a/arch/arm/cpu/arm926ejs/cache.c b/arch/arm/cpu/arm926ejs/cache.c index 02cb24c..d56e594 100644 --- a/arch/arm/cpu/arm926ejs/cache.c +++ b/arch/arm/cpu/arm926ejs/cache.c @@ -63,6 +63,6 @@ void flush_dcache_all(void) __weak void l2_cache_disable(void) {} -#if defined CONFIG_SYS_THUMB_BUILD +#if CONFIG_IS_ENABLED(SYS_THUMB_BUILD) __weak void invalidate_l2_cache(void) {} #endif diff --git a/arch/arm/cpu/armv7/cache_v7_asm.S b/arch/arm/cpu/armv7/cache_v7_asm.S index a433628..bd27ab2 100644 --- a/arch/arm/cpu/armv7/cache_v7_asm.S +++ b/arch/arm/cpu/armv7/cache_v7_asm.S @@ -7,7 +7,7 @@ #include <linux/sizes.h> #include <asm/system.h> -#ifdef CONFIG_SYS_THUMB_BUILD +#if CONFIG_IS_ENABLED(SYS_THUMB_BUILD) #define ARM(x...) #define THUMB(x...) x #else diff --git a/arch/arm/cpu/pxa/cache.c b/arch/arm/cpu/pxa/cache.c index d26354e..30e1e34 100644 --- a/arch/arm/cpu/pxa/cache.c +++ b/arch/arm/cpu/pxa/cache.c @@ -52,6 +52,6 @@ void flush_dcache_all(void) __weak void l2_cache_disable(void) {} -#if defined CONFIG_SYS_THUMB_BUILD +#if CONFIG_IS_ENABLED(SYS_THUMB_BUILD) __weak void invalidate_l2_cache(void) {} #endif |