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 d321a77..8fb5126 100644
--- a/configs/mx53ppd_defconfig
+++ b/configs/mx53ppd_defconfig
@@ -22,7 +22,6 @@
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 d82289f..da2ccab 100644
--- 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 @@
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 e8f7c4c..b24bd7c 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -149,7 +149,6 @@
CONFIG_BOOTCOUNT_AM33XX
CONFIG_BOOTCOUNT_ENV
CONFIG_BOOTCOUNT_I2C
-CONFIG_BOOTCOUNT_LIMIT
CONFIG_BOOTCOUNT_RAM
CONFIG_BOOTFILE
CONFIG_BOOTMAPSZ