aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaiying Wang2006-08-15 15:12:55 -0400
committerJon Loeliger2006-08-17 11:00:27 -0500
commit1c8f6d8fb028f156094d05f2d14298e6479364ac (patch)
treed749b471a21ae791759507bcbf25baae72d52596
parent0d9ccc55edf9a7f3c5b2b6263580a6ea8d702a04 (diff)
Unlock cache before kernel starts up for MPC86xx
-rw-r--r--common/cmd_bootm.c4
-rw-r--r--lib_ppc/board.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 0225cb7f273..f1c0eb4d183 100644
--- 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 039053aabdf..71dae07d332 100644
--- 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