The arch-specific details of the cache being off are best handled inside the reserve_mmu(). This cleans up the init sequence a little.
Signed-off-by: Simon Glass sjg@chromium.org ---
common/board_f.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/board_f.c b/common/board_f.c index c7b5e0af9e..1fc73a70fe 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -380,10 +380,10 @@ static int reserve_round_4k(void) return 0; }
-#if !(defined(CONFIG_SYS_ICACHE_OFF) && defined(CONFIG_SYS_DCACHE_OFF)) && \ - defined(CONFIG_ARM) +#ifdef CONFIG_ARM static int reserve_mmu(void) { +#if !(defined(CONFIG_SYS_ICACHE_OFF) && defined(CONFIG_SYS_DCACHE_OFF)) /* reserve TLB table */ gd->arch.tlb_size = PGTABLE_SIZE; gd->relocaddr -= gd->arch.tlb_size; @@ -402,6 +402,7 @@ static int reserve_mmu(void) */ gd->arch.tlb_allocated = gd->arch.tlb_addr; #endif +#endif
return 0; } @@ -904,8 +905,7 @@ static const init_fnc_t init_sequence_f[] = { reserve_pram, #endif reserve_round_4k, -#if !(defined(CONFIG_SYS_ICACHE_OFF) && defined(CONFIG_SYS_DCACHE_OFF)) && \ - defined(CONFIG_ARM) +#ifdef CONFIG_ARM reserve_mmu, #endif #ifdef CONFIG_DM_VIDEO