summaryrefslogtreecommitdiff
path: root/cpu/mpc8260
diff options
context:
space:
mode:
authorwdenk <wdenk>2005-04-03 23:22:21 +0000
committerwdenk <wdenk>2005-04-03 23:22:21 +0000
commit901787d6e83b6a5beba5905fbc5441673dcd63e1 (patch)
treeb239cf15367690c237211ba99068d3969035cf3c /cpu/mpc8260
parent8b0bfc6804ad140a3bd31bfb2c15fc7d69c15f5c (diff)
downloadu-boot-imx-901787d6e83b6a5beba5905fbc5441673dcd63e1.zip
u-boot-imx-901787d6e83b6a5beba5905fbc5441673dcd63e1.tar.gz
u-boot-imx-901787d6e83b6a5beba5905fbc5441673dcd63e1.tar.bz2
Patch by Jerry Van Baren, 08 Nov 2004:
- Add low-boot option for MPC8260ADS board (if lowboot is selected, the jumper for the HRCW source should select flash. If lowboot is not selected, the jumper for the HRCW source should select the BCSR. - change default load base address to 0x00400000
Diffstat (limited to 'cpu/mpc8260')
-rw-r--r--cpu/mpc8260/start.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpu/mpc8260/start.S b/cpu/mpc8260/start.S
index a499bc1..2e93bbb 100644
--- a/cpu/mpc8260/start.S
+++ b/cpu/mpc8260/start.S
@@ -172,7 +172,7 @@ _start_warm:
b boot_warm
boot_cold:
-#if defined(CONFIG_MPC8260ADS)
+#if defined(CONFIG_MPC8260ADS) && defined(CFG_DEFAULT_IMMR)
lis r3, CFG_DEFAULT_IMMR@h
nop
lwz r4, 0(r3)
@@ -183,7 +183,7 @@ boot_cold:
nop
stw r4, 0(r3)
nop
-#endif /* CONFIG_MPC8260ADS */
+#endif /* CONFIG_MPC8260ADS && CFG_DEFAULT_IMMR */
boot_warm:
mfmsr r5 /* save msr contents */