Make 4xx bootup message shorter on 440EPx/GRx platforms

Patch by Stefan Roese, 18 Oct 2006

diff --git a/CHANGELOG b/CHANGELOG
index 2a40ab3561aa6095fa90c9f89b58d3383d40c37d..1092d30e680ce1ac4b19a41a07b04a43dfa9fc02 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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
+
 * PPC405EP: Add support for board configuration of CPC0_PCI register
   This is needed to be able to configure PerWE*/PCI_INT* pin as PerWE*
   Patch by Tolunay Orkun, 07 Apr 2006

diff --git a/cpu/ppc4xx/cpu.c b/cpu/ppc4xx/cpu.c
index 94478dbb109ea3c7e3a86907cc96636bc4159219..6badfb1b24993d4a662b8a9c358f888e0c6dd60d 100644 (file)
--- 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)