ppc/8xxx: relocate cpu pointer in global data

[oweals/u-boot.git] / cpu / mpc86xx / cpu.c

diff --git a/cpu/mpc86xx/cpu.c b/cpu/mpc86xx/cpu.c
index bc6428680e571baeac3c7c0ae086452b9ef47742..04409cec68f446c528c58bf24e9ff132fbd8c054 100644 (file)
--- a/cpu/mpc86xx/cpu.c
+++ b/cpu/mpc86xx/cpu.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Freescale Semiconductor
+ * Copyright 2006,2009 Freescale Semiconductor, Inc.
  * Jeff Brown
  * Srikanth Srinivasan (srikanth.srinivasan@freescale.com)
  *
@@ -28,24 +28,9 @@
 #include <asm/cache.h>
 #include <asm/mmu.h>
 #include <mpc86xx.h>
-#include <tsec.h>
 #include <asm/fsl_law.h>
 
-struct cpu_type cpu_type_list [] = {
-       CPU_TYPE_ENTRY(8610, 8610),
-       CPU_TYPE_ENTRY(8641, 8641),
-       CPU_TYPE_ENTRY(8641D, 8641D),
-};
-
-struct cpu_type *identify_cpu(u32 ver)
-{
-       int i;
-       for (i = 0; i < ARRAY_SIZE(cpu_type_list); i++)
-               if (cpu_type_list[i].soc_ver == ver)
-                       return &cpu_type_list[i];
-
-       return NULL;
-}
+DECLARE_GLOBAL_DATA_PTR;
 
 /*
  * Default board reset function
@@ -78,12 +63,12 @@ checkcpu(void)
 
        puts("CPU:   ");
 
-       cpu = identify_cpu(ver);
-       if (cpu) {
+       cpu = gd->cpu;
+
+       if (cpu->name)
                puts(cpu->name);
-       } else {
+       else
                puts("Unknown");
-       }
 
        printf(", Version: %d.%d, (0x%08x)\n", major, minor, svr);
        puts("Core:  ");
@@ -209,16 +194,3 @@ void mpc86xx_reginfo(void)
        printf("\tBR7\t0x%08X\tOR7\t0x%08X \n", in_be32(&lbc->br7), in_be32(&lbc->or7));
 
 }
-
-/*
- * Initializes on-chip ethernet controllers.
- * to override, implement board_eth_init()
- */
-int cpu_eth_init(bd_t *bis)
-{
-#if defined(CONFIG_TSEC_ENET)
-       tsec_standard_init(bis);
-#endif
-
-       return 0;
-}