summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-05-17 23:16:08 +0200
committerWolfgang Denk <wd@denx.de>2010-05-17 23:16:08 +0200
commit568278e336a1aad2019b0ee42837a72776d6cd49 (patch)
treeedc2a37b7a23d59c831bbc14d5a7e3d8d841f3de /arch
parent3707f3b0b5a3af4be41c9dcf791b3338732d8c7c (diff)
parentb1e1a42bb1ea2f0ddaaea7f4c9d67c98ab38709e (diff)
downloadu-boot-imx-568278e336a1aad2019b0ee42837a72776d6cd49.zip
u-boot-imx-568278e336a1aad2019b0ee42837a72776d6cd49.tar.gz
u-boot-imx-568278e336a1aad2019b0ee42837a72776d6cd49.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/cpu/mpc83xx/start.S2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/cpu/mpc83xx/start.S b/arch/powerpc/cpu/mpc83xx/start.S
index a7c8079..1b3d618 100644
--- a/arch/powerpc/cpu/mpc83xx/start.S
+++ b/arch/powerpc/cpu/mpc83xx/start.S
@@ -739,6 +739,7 @@ setup_bats:
* Note: requires that all cache bits in
* HID0 are in the low half word.
*/
+#ifndef CONFIG_NAND_SPL
.globl icache_enable
icache_enable:
mfspr r3, HID0
@@ -767,6 +768,7 @@ icache_status:
mfspr r3, HID0
rlwinm r3, r3, (31 - HID0_ICE_SHIFT + 1), 31, 31
blr
+#endif /* !CONFIG_NAND_SPL */
.globl dcache_enable
dcache_enable: