ARM: rmobile: Fix to enable icache early in Gen3

This patch fixes the problem that u-boot will not start unless icache is
enabled early.

Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com>
Signed-off-by: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com>
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
This commit is contained in:
Takeshi Kihara 2018-12-04 11:53:24 +09:00 committed by Marek Vasut
parent 10854bcc25
commit 5055a4e900
2 changed files with 5 additions and 3 deletions

View file

@ -7,8 +7,6 @@
#include <asm/io.h> #include <asm/io.h>
#include <linux/ctype.h> #include <linux/ctype.h>
/* R-Car Gen3 caches are enabled in memmap-gen3.c */
#ifndef CONFIG_RCAR_GEN3
#ifdef CONFIG_ARCH_CPU_INIT #ifdef CONFIG_ARCH_CPU_INIT
int arch_cpu_init(void) int arch_cpu_init(void)
{ {
@ -17,6 +15,8 @@ int arch_cpu_init(void)
} }
#endif #endif
/* R-Car Gen3 D-cache is enabled in memmap-gen3.c */
#ifndef CONFIG_RCAR_GEN3
#ifndef CONFIG_SYS_DCACHE_OFF #ifndef CONFIG_SYS_DCACHE_OFF
void enable_caches(void) void enable_caches(void)
{ {

View file

@ -140,6 +140,8 @@ void enable_caches(void)
gen3_mem_map[i].attrs = 0; gen3_mem_map[i].attrs = 0;
} }
icache_enable(); if (!icache_status())
icache_enable();
dcache_enable(); dcache_enable();
} }