Unlock cache before kernel starts up for MPC86xx

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

diff --git a/lib_ppc/board.c b/lib_ppc/board.c
index 039053aabdfb17eecbee84a9b161e68c236f87b3..71dae07d33254c60b2df4a68b9a922726d92d581 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) || defined(CONFIG_MPC86xx))
+#if defined(CFG_INIT_RAM_LOCK) && defined(CONFIG_E500)
        unlock_ram_in_cache();  /* it's time to unlock D-cache in e500 */
 #endif