Remove unneeded INIT_RAM_LOCK cache twiddling.

Correctly tracks r29 as global data pointer now.

Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>

diff --git a/board/mpc8641hpcn/mpc8641hpcn.c b/board/mpc8641hpcn/mpc8641hpcn.c
index ace6d47fdeea03291afb0dc462c75ab2c38ee229..d02a7eff3c370659c73971ae7bb608e05b1d92a3 100644 (file)
--- a/board/mpc8641hpcn/mpc8641hpcn.c
+++ b/board/mpc8641hpcn/mpc8641hpcn.c
@@ -291,16 +291,5 @@ ft_board_setup(void *blob, bd_t *bd)
 }
 #endif
 
-void
-after_reloc(ulong dest_addr)
-{
-       DECLARE_GLOBAL_DATA_PTR;
-
-       /* now, jump to the main U-Boot board init code */
-       board_init_r ((gd_t *)gd, dest_addr);
-
-       /* NOTREACHED */
-}
-
 
 

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index fdf7180a19a87d4974b3b1a4cc131dba4ba432ba..e5d70fa202ae35f7a311c8b0c6740bdc0ec03fa6 100644 (file)
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -809,7 +809,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
 
 #ifndef CONFIG_OF_FLAT_TREE
 
-#if defined(CFG_INIT_RAM_LOCK) && !defined(CONFIG_E500)
+#if defined(CFG_INIT_RAM_LOCK) && (!defined(CONFIG_E500) || !defined(CONFIG_MPC86xx))
        unlock_ram_in_cache();
 #endif
 
@@ -827,7 +827,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
        ft_setup(of_flat_tree, OF_FLAT_TREE_MAX_SIZE, kbd, initrd_start, initrd_end);
        /* ft_dump_blob(of_flat_tree); */
 
-#if defined(CFG_INIT_RAM_LOCK) && !defined(CONFIG_E500)
+#if defined(CFG_INIT_RAM_LOCK) && (!defined(CONFIG_E500)||!defined(CONFIG_MPC86xx))
        unlock_ram_in_cache();
 #endif
        /*

diff --git a/cpu/mpc86xx/start.S b/cpu/mpc86xx/start.S
index 0a447a76b75336a3716d6800088fd3baac97857d..b96363151d88d6e581c5121d605697916fad521d 100644 (file)
--- a/cpu/mpc86xx/start.S
+++ b/cpu/mpc86xx/start.S
@@ -955,8 +955,9 @@ in_ram:
        cmplw   0, r3, r4
        bne     5b
 6:
-       mr      r3, r10         /* Destination Address          */
-       bl      after_reloc
+       mr      r3, r9          /* Init Date pointer            */
+       mr      r4, r10         /* Destination Address          */
+       bl      board_init_r
 
        /* not reached - end relocate_code */
 /*-----------------------------------------------------------------------*/

diff --git a/lib_ppc/board.c b/lib_ppc/board.c
index 126102bf96fb202f032228147baef3a9b712deb5..c367b3ef9f246dbe421b269fc8e5f4d1b6aa5010 100644 (file)
--- a/lib_ppc/board.c
+++ b/lib_ppc/board.c
@@ -676,7 +676,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
        icache_enable ();       /* it's time to enable the instruction cache */
 #endif
 
-#if defined(CFG_INIT_RAM_LOCK) && defined(CONFIG_E500)
+#if defined(CFG_INIT_RAM_LOCK) && (defined(CONFIG_E500) || defined(CONFIG_MPC86xx))
        unlock_ram_in_cache();  /* it's time to unlock D-cache in e500 */
 #endif