Patch by Mark Jonas, 02 Jul 2004:
Fix lowboot (again) on MPC5xxx
diff --git a/CHANGELOG b/CHANGELOG
index 03b08ca..244f139 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
Changes since U-Boot 1.1.1:
======================================================================
+* Patch by Mark Jonas, 02 Jul 2004:
+ Fix lowboot (again) on MPC5xxx
+
* Patch by Curt Brune, 07 Jul 2004:
relocate exception vectors on arm720t if needed
diff --git a/cpu/mpc5xxx/start.S b/cpu/mpc5xxx/start.S
index a2ac999..3936b55 100644
--- a/cpu/mpc5xxx/start.S
+++ b/cpu/mpc5xxx/start.S
@@ -107,12 +107,12 @@
/*--------------------------------------------------------------*/
#if defined(CFG_LOWBOOT)
-#if defined(CFG_RAMBOOT)
-#error CFG_LOWBOOT is incompatible with CFG_RAMBOOT
-#endif /* CFG_RAMBOOT */
-#if defined(CFG_LOWBOOT)
-#error CFG_LOWBOOT is incompatible with MGT5100
-#endif /* CFG_LOWBOOT */
+# if defined(CFG_RAMBOOT)
+# error CFG_LOWBOOT is incompatible with CFG_RAMBOOT
+# endif /* CFG_RAMBOOT */
+# if defined(CONFIG_MGT5100)
+# error CFG_LOWBOOT is incompatible with MGT5100
+# endif /* CONFIG_MGT5100 */
lis r4, CFG_DEFAULT_MBAR@h
lis r3, START_REG(CFG_BOOTCS_START)@h
ori r3, r3, START_REG(CFG_BOOTCS_START)@l
diff --git a/cpu/mpc8xx/lcd.c b/cpu/mpc8xx/lcd.c
index 882a146..cce0cc2 100644
--- a/cpu/mpc8xx/lcd.c
+++ b/cpu/mpc8xx/lcd.c
@@ -1354,7 +1354,7 @@
sprintf (info, "%s (%s - %s) ", U_BOOT_VERSION, __DATE__, __TIME__);
lcd_drawchars (LCD_INFO_X, LCD_INFO_Y, info, strlen(info));
- sprintf (info, "(C) 2003 DENX Software Engineering");
+ sprintf (info, "(C) 2004 DENX Software Engineering");
lcd_drawchars (LCD_INFO_X, LCD_INFO_Y + VIDEO_FONT_HEIGHT,
info, strlen(info));