diff options
| author | Stefano Babic <sbabic@denx.de> | 2015-11-12 17:13:26 +0100 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2015-11-12 17:13:26 +0100 |
| commit | 5f5620ab2679608f94b3a77e51c77d0a770103bd (patch) | |
| tree | ec983c06d2f62384909968bb870add121b8a1502 /arch/arm/cpu/arm926ejs | |
| parent | 78e9ca52edaab74ad645d719676ff4c24d2f462c (diff) | |
| parent | 038be18fd95aa6283eafb85ceabc0b880976424b (diff) | |
| download | blackbird-obmc-uboot-5f5620ab2679608f94b3a77e51c77d0a770103bd.tar.gz blackbird-obmc-uboot-5f5620ab2679608f94b3a77e51c77d0a770103bd.zip | |
Merge git://git.denx.de/u-boot
Diffstat (limited to 'arch/arm/cpu/arm926ejs')
| -rw-r--r-- | arch/arm/cpu/arm926ejs/Makefile | 11 | ||||
| -rw-r--r-- | arch/arm/cpu/arm926ejs/cache.c | 5 |
2 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/cpu/arm926ejs/Makefile b/arch/arm/cpu/arm926ejs/Makefile index 63fa159db6..fe78922170 100644 --- a/arch/arm/cpu/arm926ejs/Makefile +++ b/arch/arm/cpu/arm926ejs/Makefile @@ -20,3 +20,14 @@ obj-$(CONFIG_MX25) += mx25/ obj-$(CONFIG_MX27) += mx27/ obj-$(if $(filter mxs,$(SOC)),y) += mxs/ obj-$(if $(filter spear,$(SOC)),y) += spear/ + +# some files can only build in ARM or THUMB2, not THUMB1 + +ifdef CONFIG_SYS_THUMB_BUILD +ifndef CONFIG_HAS_THUMB2 + +CFLAGS_cpu.o := -marm +CFLAGS_cache.o := -marm + +endif +endif diff --git a/arch/arm/cpu/arm926ejs/cache.c b/arch/arm/cpu/arm926ejs/cache.c index e5c1a6ae6c..2839c863e8 100644 --- a/arch/arm/cpu/arm926ejs/cache.c +++ b/arch/arm/cpu/arm926ejs/cache.c @@ -82,4 +82,9 @@ void flush_dcache_all(void) /* * Stub implementations for l2 cache operations */ + __weak void l2_cache_disable(void) {} + +#if defined CONFIG_SYS_THUMB_BUILD +__weak void invalidate_l2_cache(void) {} +#endif |
