am33xx: Make SoC bootcount driver have its own symbol

Some am33xx boards may not use the RTC block for bootcount (as it may
not be wired up for the board) and use some other facility.  So add
another symbol for the bootcount driver for the IP block.

Acked-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Tom Rini <trini@ti.com>

diff --git a/drivers/bootcount/Makefile b/drivers/bootcount/Makefile
index d9c56958536021a6f845ad6f309b25e068b93bc5..bed6971aa55680dbea031f4ed60f3c453523687b 100644 (file)
--- a/drivers/bootcount/Makefile
+++ b/drivers/bootcount/Makefile
@@ -6,6 +6,6 @@ obj-y                           += bootcount.o
 obj-$(CONFIG_AT91SAM9XE)       += bootcount_at91.o
 obj-$(CONFIG_BLACKFIN)         += bootcount_blackfin.o
 obj-$(CONFIG_SOC_DA8XX)                += bootcount_davinci.o
-obj-$(CONFIG_AM33XX)           += bootcount_davinci.o
+obj-$(CONFIG_BOOTCOUNT_AM33XX) += bootcount_davinci.o
 obj-$(CONFIG_BOOTCOUNT_RAM)    += bootcount_ram.o
 obj-$(CONFIG_BOOTCOUNT_ENV)    += bootcount_env.o

diff --git a/drivers/bootcount/bootcount_davinci.c b/drivers/bootcount/bootcount_davinci.c
index f0acfad8056c13fbd765e7003b90f859914902b3..fa87b5e7b948cc398fc413711ffea47be94a4bb4 100644 (file)
--- a/drivers/bootcount/bootcount_davinci.c
+++ b/drivers/bootcount/bootcount_davinci.c
@@ -2,6 +2,10 @@
  * (C) Copyright 2011
  * Heiko Schocher, DENX Software Engineering, hs@denx.de.
  *
+ * 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+
  */
 

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index c2ba7e35d891bcf145885c9f278ba10e45d73c11..90159278fce6fdfc090e9c274bcc32f65d05e3e9 100644 (file)
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -199,6 +199,10 @@
 #define CONFIG_SPL_POWER_SUPPORT
 #define CONFIG_SPL_YMODEM_SUPPORT
 
+/* Bootcount using the RTC block */
+#define CONFIG_BOOTCOUNT_LIMIT
+#define CONFIG_BOOTCOUNT_AM33XX
+
 /* CPSW support */
 #define CONFIG_SPL_ETH_SUPPORT
 

diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h
index 0f6fa6254fbc6e397a861c86b983d016c557891c..4364eef7ba82e00a7b068a036262398a8efefcf1 100644 (file)
--- a/include/configs/ti_am335x_common.h
+++ b/include/configs/ti_am335x_common.h
@@ -43,9 +43,9 @@
 
 /*
  * RTC related defines. To use bootcount you must set bootlimit in the
- * environment to a non-zero value.
+ * environment to a non-zero value and enable CONFIG_BOOTCOUNT_LIMIT
+ * in the board config.
  */
-#define CONFIG_BOOTCOUNT_LIMIT
 #define CONFIG_SYS_BOOTCOUNT_ADDR      0x44E3E000
 
 /* Enable the HW watchdog, since we can use this with bootcount */