From: Haiying Wang <haiying.wang@freescale.com>
Date: Tue, 15 Aug 2006 19:12:55 +0000 (-0400)
Subject: Unlock cache before kernel starts up for MPC86xx
X-Git-Tag: U-Boot-1_1_6~20^2~1^2~40
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1c8f6d8fb028f156094d05f2d14298e6479364ac;p=oweals%2Fu-boot.git

Unlock cache before kernel starts up for MPC86xx
---

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 0225cb7f27..f1c0eb4d18 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 039053aabd..71dae07d33 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