Convert CONFIG_BOOTCOUNT_AM33XX to Kconfig

This converts the following to Kconfig:
  CONFIG_BOOTCOUNT_AM33XX

Reviewed-by: Lukasz Majewski <lukma@denx.de>
Reviewed-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com>
Acked-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com>
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>

diff --git a/README b/README
index cce59ad7c05e23c8f95d989a9f3e41b9ea6ef048..b227d8e90746b285558e88fde5681f975a931515 100644 (file)
--- a/README
+++ b/README
@@ -2281,8 +2281,6 @@ The following options need to be configured:
 - bootcount support:
                CONFIG_AT91SAM9XE
                enable special bootcounter support on at91sam9xe based boards.
-               CONFIG_SOC_DA8XX
-               enable special bootcounter support on da850 based boards.
                CONFIG_BOOTCOUNT_RAM
                enable support for the bootcounter in RAM
                CONFIG_BOOTCOUNT_I2C

diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig
index 26fec899bba2dace7ef08a2e8986a8e5a5c443c4..e905295d4537f9a8e7f47088bd911b92698cfe8f 100644 (file)
--- a/drivers/bootcount/Kconfig
+++ b/drivers/bootcount/Kconfig
@@ -12,6 +12,7 @@ if BOOTCOUNT_LIMIT
 
 choice
        prompt "Boot count device"
+       default BOOTCOUNT_AM33XX if AM33XX || SOC_DA8XX
 
 config BOOTCOUNT_EXT
        bool "Boot counter on EXT filesystem"
@@ -19,6 +20,14 @@ config BOOTCOUNT_EXT
          Add support for maintaining boot count in a file on an EXT
          filesystem.
 
+config BOOTCOUNT_AM33XX
+       bool "Boot counter in AM33XX RTC IP block"
+       depends on AM33XX || SOC_DA8XX
+       help
+         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.
+
 endchoice
 
 config SYS_BOOTCOUNT_SINGLEWORD

diff --git a/drivers/bootcount/Makefile b/drivers/bootcount/Makefile
index 45445d24bf3f8a22366cba2bc32d85e344393da3..62bf55e47475dffdd2cc2ebb6d965e129cf980b4 100644 (file)
--- a/drivers/bootcount/Makefile
+++ b/drivers/bootcount/Makefile
@@ -4,7 +4,6 @@
 
 obj-y                          += bootcount.o
 obj-$(CONFIG_AT91SAM9XE)       += bootcount_at91.o
-obj-$(CONFIG_SOC_DA8XX)                += 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/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 2e1dbf6c01d831f0265d65339e35d9f20a1433d3..80a523ddce1f27c4c5bc10c77658645456072e7e 100644 (file)
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -180,7 +180,6 @@
 /* SPL */
 #ifndef CONFIG_NOR_BOOT
 /* Bootcount using the RTC block */
-#define CONFIG_BOOTCOUNT_AM33XX
 #define CONFIG_SYS_BOOTCOUNT_BE
 
 /* USB gadget RNDIS */

diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h
index d44bc4700417537b55a12d71d63495a63aa30a20..569220ea357c8ff365394779d841be0333395372 100644 (file)
--- a/include/configs/am335x_sl50.h
+++ b/include/configs/am335x_sl50.h
@@ -72,7 +72,6 @@
 /* SPL */
 
 /* Bootcount using the RTC block */
-#define CONFIG_BOOTCOUNT_AM33XX
 #define CONFIG_SYS_BOOTCOUNT_BE
 
 #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT)

diff --git a/include/configs/baltos.h b/include/configs/baltos.h
index 440dbf5367343d202f9b96ad976eed494853808e..10979c72ca7fbad98ad85444fb727ee6915eddef 100644 (file)
--- a/include/configs/baltos.h
+++ b/include/configs/baltos.h
@@ -230,8 +230,6 @@
 
 /* SPL */
 #ifndef CONFIG_NOR_BOOT
-/* Bootcount using the RTC block */
-#define CONFIG_BOOTCOUNT_AM33XX
 
 /* USB gadget RNDIS */
 

diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h
index 5ea7658b527ca2afab3c18657b658983b07ce000..48cd285d46863807aedbdb1627ccf0493bf2ac71 100644 (file)
--- a/include/configs/bav335x.h
+++ b/include/configs/bav335x.h
@@ -339,7 +339,6 @@ DEFAULT_LINUX_BOOT_ENV \
 /* SPL */
 #ifndef CONFIG_NOR_BOOT
 /* Bootcount using the RTC block */
-#define CONFIG_BOOTCOUNT_AM33XX
 #define CONFIG_SYS_BOOTCOUNT_BE
 
 /* USB gadget RNDIS */

diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h
index fb2845fb5d0dc4a7b60ff687281ae32e311680f5..30ea2d22e8942cd0f4cf8716de6eace8720b8a2f 100644 (file)
--- a/include/configs/brppt1.h
+++ b/include/configs/brppt1.h
@@ -22,7 +22,6 @@
 
 /* Bootcount using the RTC block */
 #define CONFIG_SYS_BOOTCOUNT_ADDR      0x44E3E000
-#define CONFIG_BOOTCOUNT_AM33XX
 
 /* memory */
 #define CONFIG_SYS_MALLOC_LEN          (5 * 1024 * 1024)

diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h
index 234cd6a4f674dc9405e8a6e7b992d357f7ca5793..92e0479f0a77be33626b7f2e519d01b2a15257a6 100644 (file)
--- a/include/configs/chiliboard.h
+++ b/include/configs/chiliboard.h
@@ -123,7 +123,6 @@
 
 /* SPL */
 /* Bootcount using the RTC block */
-#define CONFIG_BOOTCOUNT_AM33XX
 #define CONFIG_SYS_BOOTCOUNT_BE
 
 /* NAND: device related configs */

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index b24bd7c6cf04b6e78a461ce1605d33f371554539..58a74e0e9d5840731215a04f3384cabdbf14ca95 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -146,7 +146,6 @@ CONFIG_BOARD_TYPES
 CONFIG_BOOGER
 CONFIG_BOOTBLOCK
 CONFIG_BOOTCOUNT_ALEN
-CONFIG_BOOTCOUNT_AM33XX
 CONFIG_BOOTCOUNT_ENV
 CONFIG_BOOTCOUNT_I2C
 CONFIG_BOOTCOUNT_RAM