diff options
| author | wdenk <wdenk> | 2004-02-09 20:51:26 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2004-02-09 20:51:26 +0000 |
| commit | b98fff1d6acc57cc54f01740028535ac095237cd (patch) | |
| tree | 4d9f375a71582a8938e034dcf9082b8f71761b72 /cpu/mpc5xxx/start.S | |
| parent | 5653fc335a450fa46d89989e1afe5e8bb9a0a52e (diff) | |
| download | talos-obmc-uboot-b98fff1d6acc57cc54f01740028535ac095237cd.tar.gz talos-obmc-uboot-b98fff1d6acc57cc54f01740028535ac095237cd.zip | |
* 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.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cpu/mpc5xxx/start.S b/cpu/mpc5xxx/start.S index a001e1ce40..26811e11ad 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 |
