Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / arch / arm / mach-exynos / soc.c

diff --git a/arch/arm/mach-exynos/soc.c b/arch/arm/mach-exynos/soc.c
index cf149ad1a8cf05e3d3c7f69c666291958a6afc21..810fa348eeaf72843286cc352f723b36ecfad0ae 100644 (file)
--- a/arch/arm/mach-exynos/soc.c
+++ b/arch/arm/mach-exynos/soc.c
@@ -1,11 +1,12 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2010 Samsung Electronics.
  * Minkyu Kang <mk7.kang@samsung.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
+#include <cpu_func.h>
+#include <asm/cache.h>
 #include <asm/io.h>
 #include <asm/system.h>
 
@@ -21,12 +22,12 @@ void *secondary_boot_addr = (void *)_main;
 
 void reset_cpu(ulong addr)
 {
-#ifdef CONFIG_CPU_V7
+#ifdef CONFIG_CPU_V7A
        writel(0x1, samsung_get_base_swreset());
 #endif
 }
 
-#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 */