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>

diff --git a/configs/highbank_defconfig b/configs/highbank_defconfig
index ec7bc8eadc4af634d8bfe49b3c84cab9390e0639..ee34a92c442d7a52fde6c91a4d89d313b7425273 100644 (file)
--- 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_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
 # CONFIG_MMC is not set
 CONFIG_SCSI=y
 CONFIG_OF_LIBFDT=y

diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig
index cb6be73d522114ec1e0a8959e08be64efa7e5501..d82289f57b7ae5cf67160ad6e74924d78a212d7e 100644 (file)
--- 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
 
          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
 if BOOTCOUNT
 
 config BOOTCOUNT_EXT

diff --git a/include/configs/highbank.h b/include/configs/highbank.h
index b84b277a0dc7e4e4939829d9df5dedcff923b379..9dc0c6c264af40a5ef5b9baac842d88098480fcf 100644 (file)
--- 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_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
 
 #define CONFIG_SYS_BOOTCOUNT_LE                /* Use little-endian accessors */
 #define CONFIG_SYS_BOOTCOUNT_ADDR      0xfff3cf0c