Эх сурвалжийг харах

mpc86xx: Move setup_bats into cpu_init_f

In order to later allow for a physical relocation of the
flash, setup_bats, which sets up the final BAT mapping
for the board, needs to happen *after* init_laws().
Otherwise, there will be no window programmed for the flash
at the new physical location at the point when we change
the mmu translation.

Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
Becky Bruce 16 жил өмнө
parent
commit
24bfb48c35

+ 4 - 0
cpu/mpc86xx/cpu_init.c

@@ -33,6 +33,8 @@
 #include <asm/fsl_law.h>
 #include <asm/fsl_law.h>
 #include "mp.h"
 #include "mp.h"
 
 
+void setup_bats(void);
+
 DECLARE_GLOBAL_DATA_PTR;
 DECLARE_GLOBAL_DATA_PTR;
 
 
 /*
 /*
@@ -57,6 +59,8 @@ void cpu_init_f(void)
 	init_laws();
 	init_laws();
 #endif
 #endif
 
 
+	setup_bats();
+
 	/* Map banks 0 and 1 to the FLASH banks 0 and 1 at preliminary
 	/* Map banks 0 and 1 to the FLASH banks 0 and 1 at preliminary
 	 * addresses - these have to be modified later when FLASH size
 	 * addresses - these have to be modified later when FLASH size
 	 * has been determined
 	 * has been determined

+ 0 - 5
cpu/mpc86xx/start.S

@@ -272,11 +272,6 @@ in_flash:
 
 
 	GET_GOT			/* initialize GOT access	*/
 	GET_GOT			/* initialize GOT access	*/
 
 
-	/* setup the rest of the bats */
-	bl      setup_bats
-	sync
-
-
 	/* run low-level CPU init code	   (from Flash) */
 	/* run low-level CPU init code	   (from Flash) */
 	bl	cpu_init_f
 	bl	cpu_init_f
 	sync
 	sync