summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBecky Bruce <becky.bruce@freescale.com>2008-11-05 14:55:30 -0600
committerJon Loeliger <jdl@freescale.com>2008-11-10 10:10:02 -0600
commit24bfb48c35fed6ad1f047e3e4a27df302482cd93 (patch)
tree14d1acffc20e3591459f3975ee64c682803ed1ad
parent05df3e5a638be8c5b0899eae1766bbe8e4b92c17 (diff)
downloadu-boot-imx-24bfb48c35fed6ad1f047e3e4a27df302482cd93.zip
u-boot-imx-24bfb48c35fed6ad1f047e3e4a27df302482cd93.tar.gz
u-boot-imx-24bfb48c35fed6ad1f047e3e4a27df302482cd93.tar.bz2
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>
-rw-r--r--cpu/mpc86xx/cpu_init.c4
-rw-r--r--cpu/mpc86xx/start.S5
2 files changed, 4 insertions, 5 deletions
diff --git a/cpu/mpc86xx/cpu_init.c b/cpu/mpc86xx/cpu_init.c
index 06f179c..a7e6036 100644
--- a/cpu/mpc86xx/cpu_init.c
+++ b/cpu/mpc86xx/cpu_init.c
@@ -33,6 +33,8 @@
#include <asm/fsl_law.h>
#include "mp.h"
+void setup_bats(void);
+
DECLARE_GLOBAL_DATA_PTR;
/*
@@ -57,6 +59,8 @@ void cpu_init_f(void)
init_laws();
#endif
+ setup_bats();
+
/* Map banks 0 and 1 to the FLASH banks 0 and 1 at preliminary
* addresses - these have to be modified later when FLASH size
* has been determined
diff --git a/cpu/mpc86xx/start.S b/cpu/mpc86xx/start.S
index 48f8c5a..0d30e91 100644
--- a/cpu/mpc86xx/start.S
+++ b/cpu/mpc86xx/start.S
@@ -272,11 +272,6 @@ in_flash:
GET_GOT /* initialize GOT access */
- /* setup the rest of the bats */
- bl setup_bats
- sync
-
-
/* run low-level CPU init code (from Flash) */
bl cpu_init_f
sync