rockchip: Enable PCIe/M.2 on rk3399 board w/ M.2

[oweals/u-boot.git] / arch / arm / mach-rmobile / cpu_info.c

diff --git a/arch/arm/mach-rmobile/cpu_info.c b/arch/arm/mach-rmobile/cpu_info.c
index aa5be52dfd7e65320b76383a6244a64ab2ef25b0..fdbbd72e2857acbc54092499c4de7b670f04536f 100644 (file)
--- a/arch/arm/mach-rmobile/cpu_info.c
+++ b/arch/arm/mach-rmobile/cpu_info.c
@@ -4,7 +4,11 @@
  * (C) Copyright 2012 Renesas Solutions Corp.
  */
 #include <common.h>
+#include <cpu_func.h>
+#include <asm/cache.h>
+#include <init.h>
 #include <asm/io.h>
+#include <env.h>
 #include <linux/ctype.h>
 
 #ifdef CONFIG_ARCH_CPU_INIT
@@ -17,7 +21,7 @@ int arch_cpu_init(void)
 
 /* R-Car Gen3 D-cache is enabled in memmap-gen3.c */
 #ifndef CONFIG_RCAR_GEN3
-#ifndef CONFIG_SYS_DCACHE_OFF
+#if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF)
 void enable_caches(void)
 {
        dcache_enable();
@@ -26,6 +30,7 @@ void enable_caches(void)
 #endif
 
 #ifdef CONFIG_DISPLAY_CPUINFO
+#ifndef CONFIG_RZA1
 static u32 __rmobile_get_cpu_type(void)
 {
        return 0x0;
@@ -63,6 +68,7 @@ static const struct {
        { RMOBILE_CPU_TYPE_R8A7796, "R8A7796" },
        { RMOBILE_CPU_TYPE_R8A77965, "R8A77965" },
        { RMOBILE_CPU_TYPE_R8A77970, "R8A77970" },
+       { RMOBILE_CPU_TYPE_R8A77980, "R8A77980" },
        { RMOBILE_CPU_TYPE_R8A77990, "R8A77990" },
        { RMOBILE_CPU_TYPE_R8A77995, "R8A77995" },
        { 0x0, "CPU" },
@@ -105,4 +111,11 @@ int print_cpuinfo(void)
 
        return 0;
 }
+#else
+int print_cpuinfo(void)
+{
+       printf("CPU: Renesas Electronics RZ/A1\n");
+       return 0;
+}
+#endif
 #endif /* CONFIG_DISPLAY_CPUINFO */