Patchwork [U-Boot] am33xx: Make SoC bootcount driver have its own symbol

login
register
mail settings
Submitter Tom Rini
Date Nov. 8, 2013, 6:54 p.m.
Message ID <1383936872-26441-1-git-send-email-trini@ti.com>
Download mbox | patch
Permalink /patch/289908/
State Accepted
Delegated to: Tom Rini
Headers show

Comments

Tom Rini - Nov. 8, 2013, 6:54 p.m.
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.

Cc: Heiko Schocher <hs@denx.de>
Signed-off-by: Tom Rini <trini@ti.com>
---
 drivers/bootcount/Makefile            |    2 +-
 drivers/bootcount/bootcount_davinci.c |    4 ++++
 include/configs/am335x_evm.h          |    4 ++++
 include/configs/ti_am335x_common.h    |    4 ++--
 4 files changed, 11 insertions(+), 3 deletions(-)
Heiko Schocher - Nov. 11, 2013, 6:38 a.m.
Hello Tom,

Am 08.11.2013 19:54, schrieb Tom Rini:
> 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.
>
> Cc: Heiko Schocher<hs@denx.de>
> Signed-off-by: Tom Rini<trini@ti.com>
> ---
>   drivers/bootcount/Makefile            |    2 +-
>   drivers/bootcount/bootcount_davinci.c |    4 ++++
>   include/configs/am335x_evm.h          |    4 ++++
>   include/configs/ti_am335x_common.h    |    4 ++--
>   4 files changed, 11 insertions(+), 3 deletions(-)

Thanks!

Acked-by: Heiko Schocher <hs@denx.de>

bye,
Heiko
Tom Rini - Nov. 12, 2013, 2:53 p.m.
On Fri, Nov 08, 2013 at 01:54:32PM -0500, Tom Rini wrote:

> 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.
> 
> Cc: Heiko Schocher <hs@denx.de>
> Signed-off-by: Tom Rini <trini@ti.com>

Applied to u-boot/master, thanks!

Patch

diff --git a/drivers/bootcount/Makefile b/drivers/bootcount/Makefile
index d0b8a79..4154352 100644
--- a/drivers/bootcount/Makefile
+++ b/drivers/bootcount/Makefile
@@ -10,7 +10,7 @@  COBJS-y				+= bootcount.o
 COBJS-$(CONFIG_AT91SAM9XE)	+= bootcount_at91.o
 COBJS-$(CONFIG_BLACKFIN)	+= bootcount_blackfin.o
 COBJS-$(CONFIG_SOC_DA8XX)	+= bootcount_davinci.o
-COBJS-$(CONFIG_AM33XX)		+= bootcount_davinci.o
+COBJS-$(CONFIG_BOOTCOUNT_AM33XX) += bootcount_davinci.o
 COBJS-$(CONFIG_BOOTCOUNT_RAM)	+= bootcount_ram.o
 COBJS-$(CONFIG_BOOTCOUNT_ENV)	+= bootcount_env.o
 
diff --git a/drivers/bootcount/bootcount_davinci.c b/drivers/bootcount/bootcount_davinci.c
index f0acfad..fa87b5e 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 c2ba7e3..9015927 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 0f6fa62..4364eef 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 */