diff options
| author | Tom Rini <trini@konsulko.com> | 2019-05-19 09:36:48 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-05-19 09:36:48 -0400 |
| commit | d3d212b6240f75006c18e4c59b3b28d81eedb7d3 (patch) | |
| tree | 106781344a5074a0e1cc26e8e371016cef0d0570 /arch/arm/cpu/armv7/kona-common/hwinit-common.c | |
| parent | 98b3156b0df4b0df9cb3a0bbfc240d0c4edd2638 (diff) | |
| parent | 612f6b223d2cb03ae0170d3eadcb78f7b473ecfb (diff) | |
Merge branch '2019-05-19-master-imports'
- Convert SYS_[DI]CACHE_OFF to Kconfig, introduce SPL variant.
- Various bcm96* fixes.
- Import include/android_bootloader_message.h from AOSP
- Assorted other small fixes.
Diffstat (limited to 'arch/arm/cpu/armv7/kona-common/hwinit-common.c')
| -rw-r--r-- | arch/arm/cpu/armv7/kona-common/hwinit-common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/kona-common/hwinit-common.c b/arch/arm/cpu/armv7/kona-common/hwinit-common.c index 8783893cf6..10e7488879 100644 --- a/arch/arm/cpu/armv7/kona-common/hwinit-common.c +++ b/arch/arm/cpu/armv7/kona-common/hwinit-common.c @@ -6,7 +6,7 @@ #include <common.h> #include <linux/sizes.h> -#ifndef CONFIG_SYS_DCACHE_OFF +#if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) void enable_caches(void) { /* Enable D-cache. I-cache is already enabled in start.S */ |