Commit 07cba351 authored by wdenk's avatar wdenk

Patch by Mark Jonas, 02 Jul 2004:

Fix lowboot (again) on MPC5xxx
parent b8c83181
......@@ -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
......
......@@ -107,12 +107,12 @@ boot_warm:
/*--------------------------------------------------------------*/
#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
......
......@@ -1354,7 +1354,7 @@ static void *lcd_logo (void)
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));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment