Unlock cache before kernel starts up for MPC86xx

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index e5d70fa202ae35f7a311c8b0c6740bdc0ec03fa6..fdf7180a19a87d4974b3b1a4cc131dba4ba432ba 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) || !defined(CONFIG_MPC86xx))
+#if defined(CFG_INIT_RAM_LOCK) && !defined(CONFIG_E500)
        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)||!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 2c29f467ec5d2122cadf7c12d15158bcea673f32..26f5b2fbb0da1ce30f77cb4e66ed111b48d4c9e6 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