Merge CONFIG_BOOTCOUNT and CONFIG_BOOTCOUNT_LIMIT

CONFIG_BOOTCOUNT was only used in mx53ppd, merge it with
CONFIG_BOOTCOUNT_LIMIT

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
Reviewed-by: Ian Ray <ian.ray@ge.com>

diff --git a/configs/mx53ppd_defconfig b/configs/mx53ppd_defconfig
index d321a777b00f320653986e346299ff30085201ca..8fb512651f5a3f8a4ef8a8c91eac89ad0eecbddb 100644 (file)
--- a/configs/mx53ppd_defconfig
+++ b/configs/mx53ppd_defconfig
@@ -22,7 +22,6 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
-CONFIG_BOOTCOUNT=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_EXT=y
 CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="0:5"

diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig
index d82289f57b7ae5cf67160ad6e74924d78a212d7e..da2ccabf2860021c9d3180311eb918dc801eb0f9 100644 (file)
--- a/drivers/bootcount/Kconfig
+++ b/drivers/bootcount/Kconfig
@@ -4,13 +4,6 @@
 
 menu "Boot count support"
 
-config BOOTCOUNT
-       bool "Enable Boot count support"
-       help
-         Enable boot count support, which provides the ability to store the
-         number of times the board has booted on a number of different
-         persistent storage mediums.
-
 config BOOTCOUNT_LIMIT
        bool "Enable support for checking boot count limit"
        help
@@ -23,7 +16,7 @@ config SYS_BOOTCOUNT_SINGLEWORD
          This option enables packing boot count magic value and boot count
          into single word (32 bits).
 
-if BOOTCOUNT
+if BOOTCOUNT_LIMIT
 
 config BOOTCOUNT_EXT
        bool "Boot counter on EXT filesystem"

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index e8f7c4c66a483883a89ca61a4e60c1dd037ed409..b24bd7c6cf04b6e78a461ce1605d33f371554539 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -149,7 +149,6 @@ CONFIG_BOOTCOUNT_ALEN
 CONFIG_BOOTCOUNT_AM33XX
 CONFIG_BOOTCOUNT_ENV
 CONFIG_BOOTCOUNT_I2C
-CONFIG_BOOTCOUNT_LIMIT
 CONFIG_BOOTCOUNT_RAM
 CONFIG_BOOTFILE
 CONFIG_BOOTMAPSZ