Explorar el Código

board_f: Move the extra #ifdef condition into reserve_mmu()

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>
Reviewed-by: York Sun <york.sun@nxp.com>
Simon Glass hace 8 años
padre
commit
80d4bcd3ec
Se han modificado 1 ficheros con 4 adiciones y 4 borrados
  1. 4 4
      common/board_f.c

+ 4 - 4
common/board_f.c

@@ -372,10 +372,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;
@@ -393,6 +393,7 @@ static int reserve_mmu(void)
 	 * with location within secure ram.
 	 */
 	gd->arch.tlb_allocated = gd->arch.tlb_addr;
+#endif
 #endif
 
 	return 0;
@@ -897,8 +898,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