summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukasz Majewski <lukma@denx.de>2018-02-09 23:53:29 +0100
committerTom Rini <trini@konsulko.com>2018-02-15 07:20:53 -0500
commit04e2cead60616a09ef5f45feae17c0aca0fa8b5f (patch)
treea1a0dcae2d149d764edd0dab14d24013fccd57b1
parentd1ec9461f2a2b478b3682dfc3f0f72e3fdd104c1 (diff)
Convert CONFIG_SYS_BOOTCOUNT_SINGLEWORD to Kconfig
This converts the following to Kconfig: CONFIG_SYS_BOOTCOUNT_SINGLEWORD Signed-off-by: Lukasz Majewski <lukma@denx.de> Tested-by: Alex Kiernan <alex.kiernan@gmail.com> Reviewed-by: Ian Ray <ian.ray@ge.com>
-rw-r--r--configs/highbank_defconfig1
-rw-r--r--drivers/bootcount/Kconfig6
-rw-r--r--include/configs/highbank.h1
3 files changed, 7 insertions, 1 deletions
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