From 04e2cead60616a09ef5f45feae17c0aca0fa8b5f Mon Sep 17 00:00:00 2001 From: Lukasz Majewski Date: Fri, 9 Feb 2018 23:53:29 +0100 Subject: [PATCH] Convert CONFIG_SYS_BOOTCOUNT_SINGLEWORD to Kconfig This converts the following to Kconfig: CONFIG_SYS_BOOTCOUNT_SINGLEWORD Signed-off-by: Lukasz Majewski Tested-by: Alex Kiernan Reviewed-by: Ian Ray --- configs/highbank_defconfig | 1 + drivers/bootcount/Kconfig | 6 ++++++ include/configs/highbank.h | 1 - 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/configs/highbank_defconfig b/configs/highbank_defconfig index ec7bc8eadc..ee34a92c44 100644 --- a/configs/highbank_defconfig +++ b/configs/highbank_defconfig @@ -26,6 +26,7 @@ CONFIG_EFI_PARTITION=y CONFIG_ENV_IS_IN_NVRAM=y CONFIG_SCSI_AHCI=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_SYS_BOOTCOUNT_SINGLEWORD=y # CONFIG_MMC is not set CONFIG_SCSI=y CONFIG_OF_LIBFDT=y diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig index cb6be73d52..d82289f57b 100644 --- a/drivers/bootcount/Kconfig +++ b/drivers/bootcount/Kconfig @@ -17,6 +17,12 @@ config BOOTCOUNT_LIMIT Enable checking for exceeding the boot count limit. More information: http://www.denx.de/wiki/DULG/UBootBootCountLimit +config SYS_BOOTCOUNT_SINGLEWORD + bool "Use single word to pack boot count and magic value" + help + This option enables packing boot count magic value and boot count + into single word (32 bits). + if BOOTCOUNT config BOOTCOUNT_EXT diff --git a/include/configs/highbank.h b/include/configs/highbank.h index b84b277a0d..9dc0c6c264 100644 --- a/include/configs/highbank.h +++ b/include/configs/highbank.h @@ -26,7 +26,6 @@ #define CONFIG_PL01x_PORTS { (void *)(0xFFF36000) } #define CONFIG_CONS_INDEX 0 -#define CONFIG_SYS_BOOTCOUNT_SINGLEWORD #define CONFIG_SYS_BOOTCOUNT_LE /* Use little-endian accessors */ #define CONFIG_SYS_BOOTCOUNT_ADDR 0xfff3cf0c -- 2.39.5