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

[PATCH] Fix ppc4xx bootstrap letter displayed on startup

Browse Source 
The attached patch is mainly cosmetic, allowing u-boot to
display the correct bootstrap option letter according to the
datasheets.

The original patch was extended with 405EZ support by Stefan
Roese.

Signed-off-by: Benoit Monin <bmonin@adeneo.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Benoît Monin 2007-06-04 08:36:05 +02:00 committed by Stefan Roese
parent 18d156eb37
commit e3cbe1f93c
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cpu/ppc4xx/cpu.c
View File

@ -139,6 +139,7 @@ static char *bootstrap_str[] = {
"Reserved", "Reserved",
"I2C (Addr 0x50)", "I2C (Addr 0x50)",
}; };
static char bootstrap_char[] = { 'A', 'B', 'C', 'B', 'D', 'E', 'x', 'F' };
#endif #endif
#if defined(CONFIG_440SP) || defined(CONFIG_440SPE) #if defined(CONFIG_440SP) || defined(CONFIG_440SPE)
@ -149,6 +150,7 @@ static char *bootstrap_str[] = {
"I2C (Addr 0x54)", "I2C (Addr 0x54)",
"I2C (Addr 0x50)", "I2C (Addr 0x50)",
}; };
static char bootstrap_char[] = { 'A', 'B', 'C', 'D'};
#endif #endif
#if defined(CONFIG_440EP) || defined(CONFIG_440GR) #if defined(CONFIG_440EP) || defined(CONFIG_440GR)
@ -163,6 +165,7 @@ static char *bootstrap_str[] = {
"PCI", "PCI",
"I2C (Addr 0x52)", "I2C (Addr 0x52)",
}; };
static char bootstrap_char[] = { 'A', 'B', 'C', 'D', 'E', 'G', 'F', 'H' };
#endif #endif
#if defined(CONFIG_440EPX) || defined(CONFIG_440GRX) #if defined(CONFIG_440EPX) || defined(CONFIG_440GRX)
@ -177,6 +180,7 @@ static char *bootstrap_str[] = {
"PCI", "PCI",
"I2C (Addr 0x52)", "I2C (Addr 0x52)",
}; };
static char bootstrap_char[] = { 'A', 'B', 'C', 'D', 'E', 'G', 'F', 'H' };
#endif #endif
#if defined(CONFIG_405EZ) #if defined(CONFIG_405EZ)
@ -199,6 +203,8 @@ static char *bootstrap_str[] = {
"SPI (slow)", "SPI (slow)",
"I2C (Addr 0x50)", "I2C (Addr 0x50)",
}; };
static char bootstrap_char[] = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', \
'I', 'x', 'K', 'L', 'M', 'N', 'O', 'P' };
#endif #endif
#if defined(SDR0_PINSTP_SHIFT) #if defined(SDR0_PINSTP_SHIFT)
@ -427,7 +433,7 @@ int checkcpu (void)
printf (" I2C boot EEPROM %sabled\n", i2c_bootrom_enabled() ? "en" : "dis"); printf (" I2C boot EEPROM %sabled\n", i2c_bootrom_enabled() ? "en" : "dis");
#endif /* I2C_BOOTROM */ #endif /* I2C_BOOTROM */
#if defined(SDR0_PINSTP_SHIFT) #if defined(SDR0_PINSTP_SHIFT)
printf (" Bootstrap Option %c - ", (char)bootstrap_option() + 'A'); printf (" Bootstrap Option %c - ", bootstrap_char[bootstrap_option()]);
printf ("Boot ROM Location %s\n", bootstrap_str[bootstrap_option()]); printf ("Boot ROM Location %s\n", bootstrap_str[bootstrap_option()]);
#endif /* SDR0_PINSTP_SHIFT */ #endif /* SDR0_PINSTP_SHIFT */