summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2013-11-08 13:53:14 -0500
committerTom Rini <trini@ti.com>2013-11-11 12:17:35 -0500
commitabcaa6ee2a7f2648d967ad29fbc6a27acd13658c (patch)
treebd93e9631741294ccea8dfd0eb65000fb621724e
parentebc18afd0a150b0285c643a4d3c898e19323683b (diff)
downloadtalos-obmc-uboot-abcaa6ee2a7f2648d967ad29fbc6a27acd13658c.tar.gz
talos-obmc-uboot-abcaa6ee2a7f2648d967ad29fbc6a27acd13658c.zip
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>
-rw-r--r--drivers/bootcount/Makefile2
-rw-r--r--drivers/bootcount/bootcount_davinci.c4
-rw-r--r--include/configs/am335x_evm.h4
-rw-r--r--include/configs/ti_am335x_common.h4
4 files changed, 11 insertions, 3 deletions
diff --git a/drivers/bootcount/Makefile b/drivers/bootcount/Makefile
index d9c5695853..bed6971aa5 100644
--- 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 f0acfad805..fa87b5e7b9 100644
--- 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 c2ba7e35d8..90159278fc 100644
--- 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 0f6fa6254f..4364eef7ba 100644
--- 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 */
OpenPOWER on IntegriCloud