bootstage: Replace show_boot_progress/error() with bootstage_...()

[u-boot] / arch / powerpc / lib / bootcount.c

diff --git a/arch/powerpc/lib/bootcount.c b/arch/powerpc/lib/bootcount.c
index 6346527677f5a1f572d924cc9ae23da595642512..f9ce539ecb45f5734621a971784a7e553ac8e0f8 100644 (file)
--- a/arch/powerpc/lib/bootcount.c
+++ b/arch/powerpc/lib/bootcount.c
@@ -35,6 +35,11 @@
 #define CONFIG_SYS_BOOTCOUNT_SINGLEWORD
 #endif /* defined(CONFIG_MPC5xxx) */
 
+#if defined(CONFIG_MPC512X)
+#define CONFIG_SYS_BOOTCOUNT_ADDR      (&((immap_t *)CONFIG_SYS_IMMR)->clk.bcr)
+#define CONFIG_SYS_BOOTCOUNT_SINGLEWORD
+#endif /* defined(CONFIG_MPC512X) */
+
 #if defined(CONFIG_8xx)
 #define CONFIG_SYS_BOOTCOUNT_ADDR (((immap_t *)CONFIG_SYS_IMMR)->im_cpm.cp_dpmem + \
                                CPM_BOOTCOUNT_ADDR)
@@ -46,7 +51,7 @@
 #define CONFIG_SYS_BOOTCOUNT_ADDR      (CONFIG_SYS_IMMR + CPM_BOOTCOUNT_ADDR)
 #endif /* defined(CONFIG_MPC8260) */
 
-#if defined(CONFIG_MPC8360)
+#if defined(CONFIG_QE)
 #include <asm/immap_qe.h>
 
 #define CONFIG_SYS_BOOTCOUNT_ADDR      (CONFIG_SYS_IMMR + 0x110000 + \
@@ -77,10 +82,12 @@ ulong bootcount_load(void)
        void *reg = (void *)CONFIG_SYS_BOOTCOUNT_ADDR;
 
 #if defined(CONFIG_SYS_BOOTCOUNT_SINGLEWORD)
-       if (in_be16(reg + 2) != (BOOTCOUNT_MAGIC & 0xffff))
+       u32 tmp = in_be32(reg);
+
+       if ((tmp & 0xffff0000) != (BOOTCOUNT_MAGIC & 0xffff0000))
                return 0;
        else
-               return in_be16(reg);
+               return (tmp & 0x0000ffff);
 #else
        if (in_be32(reg + 4) != BOOTCOUNT_MAGIC)
                return 0;