summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2006-05-10 09:43:21 -0500
committerJon Loeliger <jdl@freescale.com>2006-05-10 09:43:21 -0500
commit846c2d4a0e076083412604ce6f4145ec49ddb99f (patch)
tree8a7d735a99c653607437e58a1012d9ce5fb6d4df /common
parenta67255363ae4c8a7c67a83e05de335cdb54b2045 (diff)
parent6cfea33477b04b63ed47386ed1629529484c33ba (diff)
downloadu-boot-imx-846c2d4a0e076083412604ce6f4145ec49ddb99f.zip
u-boot-imx-846c2d4a0e076083412604ce6f4145ec49ddb99f.tar.gz
u-boot-imx-846c2d4a0e076083412604ce6f4145ec49ddb99f.tar.bz2
Merge branch 'mpc86xx'
Diffstat (limited to 'common')
-rw-r--r--common/cmd_bootm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index fdf7180..e5d70fa 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)
+#if defined(CFG_INIT_RAM_LOCK) && (!defined(CONFIG_E500) || !defined(CONFIG_MPC86xx))
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)
+#if defined(CFG_INIT_RAM_LOCK) && (!defined(CONFIG_E500)||!defined(CONFIG_MPC86xx))
unlock_ram_in_cache();
#endif
/*