summaryrefslogtreecommitdiff
path: root/cpu/mpc5xxx/start.S
diff options
context:
space:
mode:
authorwdenk <wdenk>2004-02-09 20:51:26 +0000
committerwdenk <wdenk>2004-02-09 20:51:26 +0000
commitb98fff1d6acc57cc54f01740028535ac095237cd (patch)
tree4d9f375a71582a8938e034dcf9082b8f71761b72 /cpu/mpc5xxx/start.S
parent5653fc335a450fa46d89989e1afe5e8bb9a0a52e (diff)
downloadu-boot-imx-b98fff1d6acc57cc54f01740028535ac095237cd.zip
u-boot-imx-b98fff1d6acc57cc54f01740028535ac095237cd.tar.gz
u-boot-imx-b98fff1d6acc57cc54f01740028535ac095237cd.tar.bz2
* Patch by Rahul Shanbhag, 28 Jan 2004:
Fix flash protection/locking handling for OMAP1610 innovator board. * Patch by Rolf Peukert, 28 Jan 2004: fix flash write problems on CSB226 board (write with 32 bit bus width) * Patches by Mark Jonas, 16 Jan 2004: - fix rounding error when calculating baudrates for MPC5200 PSCs - make sure CFG_RAMBOOT and CFG_LOWBOOT are not enabled at the same time which is not supported
Diffstat (limited to 'cpu/mpc5xxx/start.S')
-rw-r--r--cpu/mpc5xxx/start.S3
1 files changed, 3 insertions, 0 deletions
diff --git a/cpu/mpc5xxx/start.S b/cpu/mpc5xxx/start.S
index a001e1c..26811e1 100644
--- a/cpu/mpc5xxx/start.S
+++ b/cpu/mpc5xxx/start.S
@@ -104,6 +104,9 @@ boot_warm:
mfmsr r5 /* save msr contents */
#if defined(CFG_LOWBOOT)
+#if defined(CFG_RAMBOOT)
+#error CFG_LOWBOOT is incompatible with CFG_RAMBOOT
+#endif /* CFG_RAMBOOT */
lis r4, CFG_DEFAULT_MBAR@h
lis r3, 0x0000FF00@h
ori r3, r3, 0x0000FF00@l