rename CFG_ macros to CONFIG_SYS

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

diff --git a/cpu/mpc512x/cpu.c b/cpu/mpc512x/cpu.c
index 81bae41b9cfa3d0432b33d525d4621d56f3a7def..9b5973803dbe47bd802f6afdd71f3606e7a83f3c 100644 (file)
--- a/cpu/mpc512x/cpu.c
+++ b/cpu/mpc512x/cpu.c
@@ -30,6 +30,7 @@
 #include <common.h>
 #include <command.h>
 #include <mpc512x.h>
+#include <netdev.h>
 #include <asm/processor.h>
 
 #if defined(CONFIG_OF_LIBFDT)
@@ -40,7 +41,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 int checkcpu (void)
 {
-       volatile immap_t *immr = (immap_t *) CFG_IMMR;
+       volatile immap_t *immr = (immap_t *) CONFIG_SYS_IMMR;
        ulong clock = gd->cpu_clk;
        u32 pvr = get_pvr ();
        u32 spridr = immr->sysconf.spridr;
@@ -74,7 +75,7 @@ int
 do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 {
        ulong msr;
-       volatile immap_t *immap = (immap_t *) CFG_IMMR;
+       volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
 
        /* Interrupts and MMU off */
        __asm__ __volatile__ ("mfmsr    %0":"=r" (msr):);
@@ -121,7 +122,7 @@ void watchdog_reset (void)
        int re_enable = disable_interrupts ();
 
        /* Reset watchdog */
-       volatile immap_t *immr = (immap_t *) CFG_IMMR;
+       volatile immap_t *immr = (immap_t *) CONFIG_SYS_IMMR;
        immr->wdt.swsrr = 0x556c;
        immr->wdt.swsrr = 0xaa39;
 
@@ -166,9 +167,7 @@ static void old_ft_cpu_setup(void *blob, bd_t *bd)
 
 static void ft_clock_setup(void *blob, bd_t *bd)
 {
-       int node;
        char *cpu_path = "/cpus/" OF_CPU;
-       const char *path = NULL;
 
        /*
         * fixup cpu clocks using path
@@ -193,7 +192,19 @@ void ft_cpu_setup(void *blob, bd_t *bd)
 #endif
        ft_clock_setup(blob, bd);
 #ifdef CONFIG_HAS_ETH0
-       fdt_fixup_ethernet(blob, bd);
+       fdt_fixup_ethernet(blob);
 #endif
 }
 #endif
+
+#ifdef CONFIG_MPC512x_FEC
+/* Default initializations for FEC controllers.  To override,
+ * create a board-specific function called:
+ *     int board_eth_init(bd_t *bis)
+ */
+
+int cpu_eth_init(bd_t *bis)
+{
+       return mpc512x_fec_initialize(bis);
+}
+#endif