Merge branch 'master' of ../work into next

[platform/kernel/u-boot.git] / cpu / ppc4xx / cpu.c

diff --git a/cpu/ppc4xx/cpu.c b/cpu/ppc4xx/cpu.c
index 2287904..73d4d06 100644 (file)
--- a/cpu/ppc4xx/cpu.c
+++ b/cpu/ppc4xx/cpu.c
@@ -81,7 +81,7 @@ static int pci_async_enabled(void)
 
 #if defined(CONFIG_PCI) && !defined(CONFIG_IOP480) && \
     !defined(CONFIG_405) && !defined(CONFIG_405EX)
-static int pci_arbiter_enabled(void)
+int pci_arbiter_enabled(void)
 {
 #if defined(CONFIG_405GP)
        return (mfdcr(CPC0_PSR) & PSR_PCI_ARBIT_EN);
@@ -371,16 +371,6 @@ int checkcpu (void)
                strcpy(addstr, "Security support");
                break;
 
-       case PVR_405EX2_RA:
-               puts("EX Rev. A");
-               strcpy(addstr, "No Security support");
-               break;
-
-       case PVR_405EXR1_RA:
-               puts("EXr Rev. A");
-               strcpy(addstr, "Security support");
-               break;
-
        case PVR_405EXR2_RA:
                puts("EXr Rev. A");
                strcpy(addstr, "No Security support");
@@ -406,6 +396,26 @@ int checkcpu (void)
                strcpy(addstr, "No Security support");
                break;
 
+       case PVR_405EX1_RD:
+               puts("EX Rev. D");
+               strcpy(addstr, "Security support");
+               break;
+
+       case PVR_405EX2_RD:
+               puts("EX Rev. D");
+               strcpy(addstr, "No Security support");
+               break;
+
+       case PVR_405EXR1_RD:
+               puts("EXr Rev. D");
+               strcpy(addstr, "Security support");
+               break;
+
+       case PVR_405EXR2_RD:
+               puts("EXr Rev. D");
+               strcpy(addstr, "No Security support");
+               break;
+
 #if defined(CONFIG_440)
        case PVR_440GP_RB:
                puts("GP Rev. B");
@@ -598,10 +608,17 @@ int checkcpu (void)
                break;
        }
 
-       printf (" at %s MHz (PLB=%lu, OPB=%lu, EBC=%lu MHz)\n", strmhz(buf, clock),
+       printf (" at %s MHz (PLB=%lu OPB=%lu EBC=%lu",
+               strmhz(buf, clock),
                sys_info.freqPLB / 1000000,
                get_OPB_freq() / 1000000,
                sys_info.freqEBC / 1000000);
+#if defined(CONFIG_PCI) && \
+       (defined(CONFIG_440EP) || defined(CONFIG_440EPX) || \
+        defined(CONFIG_440GR) || defined(CONFIG_440GRX))
+       printf(" PCI=%lu MHz", sys_info.freqPCI / 1000000);
+#endif
+       printf(")\n");
 
        if (addstr[0] != 0)
                printf("       %s\n", addstr);