Merge branch '2019-12-02-master-imports'

[oweals/u-boot.git] / drivers / bootcount / bootcount_davinci.c

diff --git a/drivers/bootcount/bootcount_davinci.c b/drivers/bootcount/bootcount_davinci.c
index 17829beaa237194d474906989cbb4017dac0f88d..6326957d7b044f8eff93ef69b834d7ee8880fda1 100644 (file)
--- a/drivers/bootcount/bootcount_davinci.c
+++ b/drivers/bootcount/bootcount_davinci.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2011
  * Heiko Schocher, DENX Software Engineering, hs@denx.de.
@@ -5,8 +6,6 @@
  * A bootcount driver for the RTC IP block found on many TI platforms.
  * This requires the RTC clocks, etc, to be enabled prior to use and
  * not all boards with this IP block on it will have the RTC in use.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <bootcount.h>
@@ -25,7 +24,7 @@ void bootcount_store(ulong a)
        writel(RTC_KICK0R_WE, &reg->kick0r);
        writel(RTC_KICK1R_WE, &reg->kick1r);
        raw_bootcount_store(&reg->scratch2,
-                           (BOOTCOUNT_MAGIC & 0xffff0000) | (a & 0x0000ffff));
+               (CONFIG_SYS_BOOTCOUNT_MAGIC & 0xffff0000) | (a & 0x0000ffff));
 }
 
 ulong bootcount_load(void)
@@ -35,7 +34,7 @@ ulong bootcount_load(void)
                (struct davinci_rtc *)CONFIG_SYS_BOOTCOUNT_ADDR;
 
        val = raw_bootcount_load(&reg->scratch2);
-       if ((val & 0xffff0000) != (BOOTCOUNT_MAGIC & 0xffff0000))
+       if ((val & 0xffff0000) != (CONFIG_SYS_BOOTCOUNT_MAGIC & 0xffff0000))
                return 0;
        else
                return val & 0x0000ffff;