Convert CONFIG_BOOTCOUNT_I2C to Kconfig

This converts the following to Kconfig:
  CONFIG_BOOTCOUNT_I2C

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Reviewed-by: Lukasz Majewski <lukma@denx.de>

diff --git a/README b/README
index 5ab683de64fdca9812bbf6ea0d6193cb1b7914c2..a59f0531e4e28d09199472da4799072233376ede 100644 (file)
--- a/README
+++ b/README
@@ -2270,12 +2270,6 @@ The following options need to be configured:
 - bootcount support:
                CONFIG_AT91SAM9XE
                enable special bootcounter support on at91sam9xe based boards.
-               CONFIG_BOOTCOUNT_I2C
-               enable support for the bootcounter on an i2c (like RTC) device.
-                       CONFIG_SYS_I2C_RTC_ADDR = i2c chip address
-                       CONFIG_SYS_BOOTCOUNT_ADDR = i2c addr which is used for
-                                                   the bootcounter.
-                       CONFIG_BOOTCOUNT_ALEN = address len
                CONFIG_BOOTCOUNT_EXT
                enable support for the bootcounter in EXT filesystem
                        CONFIG_SYS_BOOTCOUNT_ADDR = RAM address used for read

diff --git a/configs/ids8313_defconfig b/configs/ids8313_defconfig
index 5557402e6a9f836e759f48eab561a47cdbf81ced..5ca77030104fd07afa9e70c1fcb33b4cd77907e2 100644 (file)
--- a/configs/ids8313_defconfig
+++ b/configs/ids8313_defconfig
@@ -35,6 +35,7 @@ CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_HOSTNAME=y
 CONFIG_BOOTP_SUBNETMASK=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_I2C=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_PHYLIB=y

diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig
index eabfd132ad22350f4da799245dec1edbb6a854f5..8c19ae610bb3493a9da6b49dcc41c7c6cd456e15 100644 (file)
--- a/drivers/bootcount/Kconfig
+++ b/drivers/bootcount/Kconfig
@@ -46,6 +46,15 @@ config BOOTCOUNT_RAM
          Store the bootcount in DRAM protected against against bit errors
          due to short power loss or holding a system in RESET.
 
+config BOOTCOUNT_I2C
+       bool "Boot counter on I2C device"
+       help
+         Enable support for the bootcounter on an i2c (like RTC) device.
+         CONFIG_SYS_I2C_RTC_ADDR = i2c chip address
+         CONFIG_SYS_BOOTCOUNT_ADDR = i2c addr which is used for
+                                     the bootcounter.
+         CONFIG_BOOTCOUNT_ALEN = address len
+
 endchoice
 
 config SYS_BOOTCOUNT_SINGLEWORD

diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index 1769224c57365133d98ef68c3fee2a22686f91c4..08865f8339990cf448b2fbf57b9fa55921538138 100644 (file)
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -509,7 +509,6 @@
 #define CONFIG_MTD_PARTITIONS
 
 /* bootcount support */
-#define CONFIG_BOOTCOUNT_I2C
 #define CONFIG_BOOTCOUNT_ALEN  1
 #define CONFIG_SYS_BOOTCOUNT_ADDR      0x9
 

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index deb3c0c8c348a26ff8e1a7d1e99b3e0b636ddcd6..e1b3fdc0e2f1974a1ddaf57ff55d8852b7e65b40 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -146,7 +146,6 @@ CONFIG_BOARD_TYPES
 CONFIG_BOOGER
 CONFIG_BOOTBLOCK
 CONFIG_BOOTCOUNT_ALEN
-CONFIG_BOOTCOUNT_I2C
 CONFIG_BOOTFILE
 CONFIG_BOOTMAPSZ
 CONFIG_BOOTMODE