leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch by Mark Jonas, 02 Jul 2004:

Browse Source 
Fix lowboot (again) on MPC5xxx
This commit is contained in:
wdenk 2004-07-12 14:37:59 +00:00
parent b8c8318160
commit 07cba3514b
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -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

12
cpu/mpc5xxx/start.S
View File

@ -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

2
cpu/mpc8xx/lcd.c
View File

@ -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));