summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaiying Wang <haiying.wang@freescale.com>2006-08-15 15:12:55 -0400
committerJon Loeliger <jdl@freescale.com>2006-08-17 11:02:12 -0500
commit75c299c38369d01addd5e054b8a16217b70f4a86 (patch)
treea61f954fc3d2835b56f90ec5da2042f44d31a6d7
parent67256678f00c09b0a7f19e862e5c1847553d31bc (diff)
downloadu-boot-imx-75c299c38369d01addd5e054b8a16217b70f4a86.zip
u-boot-imx-75c299c38369d01addd5e054b8a16217b70f4a86.tar.gz
u-boot-imx-75c299c38369d01addd5e054b8a16217b70f4a86.tar.bz2
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 e5d70fa..fdf7180 100644
--- 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 2c29f46..26f5b2f 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