projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tools: binman: change shebang from python into python2
[oweals/u-boot.git]
/
drivers
/
bootcount
/
bootcount.c
diff --git
a/drivers/bootcount/bootcount.c
b/drivers/bootcount/bootcount.c
index 3ad441393e10f5545573abce64fe058439998916..d5ce450c153132c082b2aa7c991e79a1aa2c7fad 100644
(file)
--- a/
drivers/bootcount/bootcount.c
+++ b/
drivers/bootcount/bootcount.c
@@
-31,16
+31,14
@@
#if defined(CONFIG_MPC8260)
#include <asm/cpm_8260.h>
#if defined(CONFIG_MPC8260)
#include <asm/cpm_8260.h>
-
#define CONFIG_SYS_BOOTCOUNT_ADDR (CONFIG_SYS_IMMR + CPM_BOOTCOUNT_ADDR)
#endif /* defined(CONFIG_MPC8260) */
#if defined(CONFIG_QE)
#define CONFIG_SYS_BOOTCOUNT_ADDR (CONFIG_SYS_IMMR + CPM_BOOTCOUNT_ADDR)
#endif /* defined(CONFIG_MPC8260) */
#if defined(CONFIG_QE)
-#include <asm/immap_qe.h>
-
+#include <linux/immap_qe.h>
#define CONFIG_SYS_BOOTCOUNT_ADDR (CONFIG_SYS_IMMR + 0x110000 + \
QE_MURAM_SIZE - 2 * sizeof(u32))
#define CONFIG_SYS_BOOTCOUNT_ADDR (CONFIG_SYS_IMMR + 0x110000 + \
QE_MURAM_SIZE - 2 * sizeof(u32))
-#endif /* defined(CONFIG_
MPC8360
) */
+#endif /* defined(CONFIG_
QE
) */
#if defined(CONFIG_4xx)
#define CONFIG_SYS_BOOTCOUNT_ADDR (CONFIG_SYS_OCM_DATA_ADDR + \
#if defined(CONFIG_4xx)
#define CONFIG_SYS_BOOTCOUNT_ADDR (CONFIG_SYS_OCM_DATA_ADDR + \
@@
-60,7
+58,7
@@
__weak void bootcount_store(ulong a)
#else
raw_bootcount_store(reg, a);
raw_bootcount_store(reg + 4, BOOTCOUNT_MAGIC);
#else
raw_bootcount_store(reg, a);
raw_bootcount_store(reg + 4, BOOTCOUNT_MAGIC);
-#endif
+#endif
/* defined(CONFIG_SYS_BOOTCOUNT_SINGLEWORD */
}
__weak ulong bootcount_load(void)
}
__weak ulong bootcount_load(void)
@@
-79,6
+77,6
@@
__weak ulong bootcount_load(void)
return 0;
else
return raw_bootcount_load(reg);
return 0;
else
return raw_bootcount_load(reg);
-#endif
+#endif
/* defined(CONFIG_SYS_BOOTCOUNT_SINGLEWORD) */
}
}
-#endif
+#endif
/* defined(CONFIG_SYS_BOOTCOUNT_ADDR) */