diff options
| author | Tom Rini <trini@konsulko.com> | 2018-11-04 08:12:21 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-11-04 08:12:21 -0500 |
| commit | 5ef76e59c12c79d106ebda70b710468aa6bd8b75 (patch) | |
| tree | 4e0120867b94d75ebac8b18bdc0c93a13c1c317c /arch/arm/mach-rmobile/cpu_info.c | |
| parent | 5d6fefa8051a29b26169983cbcf9378bb363f8b2 (diff) | |
| parent | a376dde1deb9cc42e3804b9c654f873c936cc8d4 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-sh
Diffstat (limited to 'arch/arm/mach-rmobile/cpu_info.c')
| -rw-r--r-- | arch/arm/mach-rmobile/cpu_info.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-rmobile/cpu_info.c b/arch/arm/mach-rmobile/cpu_info.c index e110737471b..c9ebc9f40ed 100644 --- a/arch/arm/mach-rmobile/cpu_info.c +++ b/arch/arm/mach-rmobile/cpu_info.c @@ -6,6 +6,8 @@ #include <common.h> #include <asm/io.h> +/* R-Car Gen3 caches are enabled in memmap-gen3.c */ +#ifndef CONFIG_RCAR_GEN3 #ifdef CONFIG_ARCH_CPU_INIT int arch_cpu_init(void) { @@ -20,6 +22,7 @@ void enable_caches(void) dcache_enable(); } #endif +#endif #ifdef CONFIG_DISPLAY_CPUINFO static u32 __rmobile_get_cpu_type(void) |