powerpc/bootcount: Fix endianness problem
authorMichael Weiss <michael.weiss@ifm.com>
Thu, 20 May 2010 14:09:35 +0000 (16:09 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 26 May 2010 20:26:32 +0000 (22:26 +0200)
For CONFIG_SYS_BOOTCOUNT_SINGLEWORD the code had an endianness problem.

Signed-off-by: Michael Weiss <michael.weiss@ifm.com>
Signed-off-by: Detlev Zundel <dzu@denx.de>
arch/powerpc/lib/bootcount.c

index 6346527..338c848 100644 (file)
@@ -77,10 +77,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;