diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-10-20 12:02:47 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-10-20 12:02:47 +0200 |
| commit | a0d3518460150b7c07c64e1abbbc71cbc591055f (patch) | |
| tree | 0c5a5da6cac612cea9c42fff0c3d9e09ef9f7c6c | |
| parent | fcfed4f2f234836a0b308fd0a782f4625cd40bad (diff) | |
| parent | edf0b5433872eb9f468d7460667445b0492dc7e0 (diff) | |
| download | u-boot-imx-a0d3518460150b7c07c64e1abbbc71cbc591055f.zip u-boot-imx-a0d3518460150b7c07c64e1abbbc71cbc591055f.tar.gz u-boot-imx-a0d3518460150b7c07c64e1abbbc71cbc591055f.tar.bz2 | |
Merge with /home/sr/git/u-boot/440epx-boot-msg
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | cpu/ppc4xx/cpu.c | 16 |
2 files changed, 15 insertions, 4 deletions
@@ -2,6 +2,9 @@ Changes since U-Boot 1.1.4: ====================================================================== +* Make 4xx bootup message shorter on 440EPx/GRx platforms + Patch by Stefan Roese, 18 Oct 2006 + * Add (preliminary) support for V38B board * PPC405EP: Add support for board configuration of CPC0_PCI register diff --git a/cpu/ppc4xx/cpu.c b/cpu/ppc4xx/cpu.c index 94478db..6badfb1 100644 --- a/cpu/ppc4xx/cpu.c +++ b/cpu/ppc4xx/cpu.c @@ -190,6 +190,7 @@ int checkcpu (void) uint pvr = get_pvr(); ulong clock = gd->cpu_clk; char buf[32]; + char addstr[64] = ""; #if !defined(CONFIG_IOP480) sys_info_t sys_info; @@ -308,19 +309,23 @@ int checkcpu (void) #endif /* CONFIG_440 */ case PVR_440EPX1_RA: - puts("EPx Rev. A - Security/Kasumi support"); + puts("EPx Rev. A"); + strcpy(addstr, "Security/Kasumi support"); break; case PVR_440EPX2_RA: - puts("EPx Rev. A - No Security/Kasumi support"); + puts("EPx Rev. A"); + strcpy(addstr, "No Security/Kasumi support"); break; case PVR_440GRX1_RA: - puts("GRx Rev. A - Security/Kasumi support"); + puts("GRx Rev. A"); + strcpy(addstr, "Security/Kasumi support"); break; case PVR_440GRX2_RA: - puts("GRx Rev. A - No Security/Kasumi support"); + puts("GRx Rev. A"); + strcpy(addstr, "No Security/Kasumi support"); break; case PVR_440SP_RA: @@ -349,6 +354,9 @@ int checkcpu (void) sys_info.freqPLB / sys_info.pllOpbDiv / 1000000, FREQ_EBC / 1000000); + if (addstr[0] != 0) + printf(" %s\n", addstr); + #if defined(I2C_BOOTROM) printf (" I2C boot EEPROM %sabled\n", i2c_bootrom_enabled() ? "en" : "dis"); #if defined(SDR0_PINSTP_SHIFT) |