diff options
| author | Alex Kiernan <alex.kiernan@gmail.com> | 2018-02-16 18:50:38 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-02-24 16:43:11 +0300 |
| commit | 3dccc10ee1e52d46f495df16d6800e80859ddca1 (patch) | |
| tree | c8030eed49b36a7b7422320500896a30da5b3d46 | |
| parent | 0bb430c8494e26e8d258cf6957cdd39d2ce4f309 (diff) | |
| download | u-boot-3dccc10ee1e52d46f495df16d6800e80859ddca1.tar.xz | |
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>
| -rw-r--r-- | configs/mx53ppd_defconfig | 1 | ||||
| -rw-r--r-- | drivers/bootcount/Kconfig | 9 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
3 files changed, 1 insertions, 10 deletions
diff --git a/configs/mx53ppd_defconfig b/configs/mx53ppd_defconfig index d321a777b0..8fb512651f 100644 --- 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 d82289f57b..da2ccabf28 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 @@ 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 e8f7c4c66a..b24bd7c6cf 100644 --- 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 |