Merge: Add support for AMCC 440SPe CPU based eval board (Yucca).

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

diff --git a/cpu/ppc4xx/cpu.c b/cpu/ppc4xx/cpu.c
index 3e85a88..6a84b09 100644 (file)
--- a/cpu/ppc4xx/cpu.c
+++ b/cpu/ppc4xx/cpu.c
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2000-2003
+ * (C) Copyright 2000-2006
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * See file CREDITS for list of people who contributed to this
@@ -37,6 +37,10 @@
 #include <asm/cache.h>
 #include <ppc4xx.h>
 
+#if !defined(CONFIG_405)
+DECLARE_GLOBAL_DATA_PTR;
+#endif
+
 
 #if defined(CONFIG_440)
 #define FREQ_EBC               (sys_info.freqEPB)
@@ -120,7 +124,6 @@ static int do_chip_reset(unsigned long sys0, unsigned long sys1);
 int checkcpu (void)
 {
 #if !defined(CONFIG_405)       /* not used on Xilinx 405 FPGA implementations */
-       DECLARE_GLOBAL_DATA_PTR;
        uint pvr = get_pvr();
        ulong clock = gd->cpu_clk;
        char buf[32];
@@ -224,12 +227,20 @@ int checkcpu (void)
        case PVR_440EP_RB: /* 440EP rev B and 440GR rev A have same PVR */
                puts("EP Rev. B");
                break;
+
+       case PVR_440EP_RC: /* 440EP rev C and 440GR rev B have same PVR */
+               puts("EP Rev. C");
+               break;
 #endif /*  CONFIG_440EP */
 
 #ifdef CONFIG_440GR
        case PVR_440GR_RA: /* 440EP rev B and 440GR rev A have same PVR */
                puts("GR Rev. A");
                break;
+
+       case PVR_440GR_RB: /* 440EP rev C and 440GR rev B have same PVR */
+               puts("GR Rev. B");
+               break;
 #endif /* CONFIG_440GR */
 #endif /* CONFIG_440 */