projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arm: mvebu: turris_omnia: add GPIO support to defconfig
[oweals/u-boot.git]
/
drivers
/
bootcount
/
bootcount_at91.c
diff --git
a/drivers/bootcount/bootcount_at91.c
b/drivers/bootcount/bootcount_at91.c
index 9c2bbfaf6946cd4153546d2eb30b94d46b9be997..c4ab5ceafabdf03828ecd53310a13cfd7a5376a7 100644
(file)
--- a/
drivers/bootcount/bootcount_at91.c
+++ b/
drivers/bootcount/bootcount_at91.c
@@
-1,6
+1,4
@@
-/*
- * SPDX-License-Identifier: GPL-2.0+
- */
+// SPDX-License-Identifier: GPL-2.0+
#include <common.h>
#include <asm/io.h>
#include <common.h>
#include <asm/io.h>
@@
-8,15
+6,16
@@
#include <asm/arch/at91_gpbr.h>
/*
#include <asm/arch/at91_gpbr.h>
/*
- * We combine the BOOTCOUNT_MAGIC and bootcount in one 32-bit register.
- * This is done so we need to use only one of the four GPBR registers.
+ * We combine the CONFIG_SYS_BOOTCOUNT_MAGIC and bootcount in one 32-bit
+ * register. This is done so we need to use only one of the four GPBR
+ * registers.
*/
void bootcount_store(ulong a)
{
at91_gpbr_t *gpbr = (at91_gpbr_t *) ATMEL_BASE_GPBR;
*/
void bootcount_store(ulong a)
{
at91_gpbr_t *gpbr = (at91_gpbr_t *) ATMEL_BASE_GPBR;
- writel((BOOTCOUNT_MAGIC & 0xffff0000) | (a & 0x0000ffff),
-
&gpbr->reg[AT91_GPBR_INDEX_BOOTCOUNT]);
+ writel((
CONFIG_SYS_
BOOTCOUNT_MAGIC & 0xffff0000) | (a & 0x0000ffff),
+ &gpbr->reg[AT91_GPBR_INDEX_BOOTCOUNT]);
}
ulong bootcount_load(void)
}
ulong bootcount_load(void)
@@
-24,7
+23,7
@@
ulong bootcount_load(void)
at91_gpbr_t *gpbr = (at91_gpbr_t *) ATMEL_BASE_GPBR;
ulong val = readl(&gpbr->reg[AT91_GPBR_INDEX_BOOTCOUNT]);
at91_gpbr_t *gpbr = (at91_gpbr_t *) ATMEL_BASE_GPBR;
ulong val = readl(&gpbr->reg[AT91_GPBR_INDEX_BOOTCOUNT]);
- if ((val & 0xffff0000) != (BOOTCOUNT_MAGIC & 0xffff0000))
+ if ((val & 0xffff0000) != (
CONFIG_SYS_
BOOTCOUNT_MAGIC & 0xffff0000))
return 0;
else
return val & 0x0000ffff;
return 0;
else
return val & 0x0000ffff;