Merge branch 'master' of git://git.denx.de/u-boot-arm

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

diff --git a/cpu/mpc5xxx/cpu.c b/cpu/mpc5xxx/cpu.c
index 7f16b92a6cac06af26f00a9a267f7bd6c371323a..d87f42ca29e454af1c819fc7e5cf7e9bf268a52c 100644 (file)
--- a/cpu/mpc5xxx/cpu.c
+++ b/cpu/mpc5xxx/cpu.c
@@ -35,6 +35,7 @@
 #if defined(CONFIG_OF_LIBFDT)
 #include <libfdt.h>
 #include <libfdt_env.h>
+#include <fdt_support.h>
 #endif
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -113,43 +114,44 @@ unsigned long get_tbclk (void)
 
 /* ------------------------------------------------------------------------- */
 
-#ifdef CONFIG_OF_LIBFDT
-static void do_fixup(void *fdt, const char *node, const char *prop,
-                    const void *val, int len, int create)
+#if defined(CONFIG_OF_LIBFDT) && defined (CONFIG_OF_BOARD_SETUP)
+void ft_cpu_setup(void *blob, bd_t *bd)
 {
-#if defined(DEBUG)
-       int i;
-       debug("Updating property '%s/%s' = ", node, prop);
-       for (i = 0; i < len; i++)
-               debug(" %.2x", *(u8*)(val+i));
-       debug("\n");
+       int div = in_8((void*)CFG_MBAR + 0x204) & 0x0020 ? 8 : 4;
+       char * cpu_path = "/cpus/" OF_CPU;
+#ifdef CONFIG_MPC5xxx_FEC
+       char * eth_path = "/" OF_SOC "/ethernet@3000";
+#endif
+
+       do_fixup_by_path_u32(blob, cpu_path, "timebase-frequency", OF_TBCLK, 1);
+       do_fixup_by_path_u32(blob, cpu_path, "bus-frequency", bd->bi_busfreq, 1);
+       do_fixup_by_path_u32(blob, cpu_path, "clock-frequency", bd->bi_intfreq, 1);
+       do_fixup_by_path_u32(blob, "/" OF_SOC, "bus-frequency", bd->bi_ipbfreq, 1);
+       do_fixup_by_path_u32(blob, "/" OF_SOC, "system-frequency",
+                               bd->bi_busfreq*div, 1);
+#ifdef CONFIG_MPC5xxx_FEC
+       do_fixup_by_path(blob, eth_path, "mac-address", bd->bi_enetaddr, 6, 0);
+       do_fixup_by_path(blob, eth_path, "local-mac-address", bd->bi_enetaddr, 6, 0);
 #endif
-       int rc = fdt_find_and_setprop(fdt, node, prop, val, len, create);
-       if (rc)
-               printf("Unable to update property %s:%s, err=%s\n",
-                      node, prop, fdt_strerror(rc));
 }
+#endif
 
-static void do_fixup_u32(void *fdt, const char *node, const char *prop,
-                        u32 val, int create)
+#ifdef CONFIG_BOOTCOUNT_LIMIT
+
+void bootcount_store (ulong a)
 {
-       val = cpu_to_fdt32(val);
-       do_fixup(fdt, node, prop, &val, sizeof(val), create);
+     volatile ulong *save_addr = (volatile ulong *)(MPC5XXX_CDM_BRDCRMB);
+
+     *save_addr = (BOOTCOUNT_MAGIC & 0xffff0000) | a;
 }
 
-void ft_cpu_setup(void *blob, bd_t *bd)
+ulong bootcount_load (void)
 {
-       int div = in_8((void*)CFG_MBAR + 0x204) & 0x0020 ? 8 : 4;
-       char * cpu_path = "/cpus/" OF_CPU;
-       char * eth_path = "/" OF_SOC "/ethernet@3000";
+     volatile ulong *save_addr = (volatile ulong *)(MPC5XXX_CDM_BRDCRMB);
 
-       do_fixup_u32(blob, cpu_path, "timebase-frequency", OF_TBCLK, 1);
-       do_fixup_u32(blob, cpu_path, "bus-frequency", bd->bi_busfreq, 1);
-       do_fixup_u32(blob, cpu_path, "clock-frequency", bd->bi_intfreq, 1);
-       do_fixup_u32(blob, "/" OF_SOC, "bus-frequency", bd->bi_ipbfreq, 1);
-       do_fixup_u32(blob, "/" OF_SOC, "system-frequency",
-                       bd->bi_busfreq*div, 1);
-       do_fixup(blob, eth_path, "mac-address", bd->bi_enetaddr, 6, 0);
-       do_fixup(blob, eth_path, "local-mac-address", bd->bi_enetaddr, 6, 0);
+     if ((*save_addr & 0xffff0000) != (BOOTCOUNT_MAGIC & 0xffff0000))
+             return 0;
+     else
+             return (*save_addr & 0x0000ffff);
 }
-#endif
+#endif /* CONFIG_BOOTCOUNT_LIMIT */