Convert CONFIG_BOOTCOUNT_ENV to Kconfig

This converts the following to Kconfig:
  CONFIG_BOOTCOUNT_ENV

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

diff --git a/README b/README
index b227d8e..4478bad 100644 (file)
--- a/README
+++ b/README
@@ -713,17 +713,6 @@ The following options need to be configured:
                as a convenience, when switching between booting from
                RAM and NFS.
 
-- Bootcount:
-               CONFIG_BOOTCOUNT_ENV
-               If no softreset save registers are found on the hardware
-               "bootcount" is stored in the environment. To prevent a
-               saveenv on all reboots, the environment variable
-               "upgrade_available" is used. If "upgrade_available" is
-               0, "bootcount" is always 0, if "upgrade_available" is
-               1 "bootcount" is incremented in the environment.
-               So the Userspace Applikation must set the "upgrade_available"
-               and "bootcount" variable to 0, if a boot was successfully.
-
 - Pre-Boot Commands:
                CONFIG_PREBOOT
 

diff --git a/configs/draco_defconfig b/configs/draco_defconfig
index 05b1b9e..985e662 100644 (file)
--- a/configs/draco_defconfig
+++ b/configs/draco_defconfig
@@ -56,6 +56,7 @@ CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_SUBNETMASK=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_ENV=y
 CONFIG_DFU_NAND=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y

diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig
index a9234ee..dd862bb 100644 (file)
--- a/configs/etamin_defconfig
+++ b/configs/etamin_defconfig
@@ -56,6 +56,7 @@ CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_SUBNETMASK=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_ENV=y
 CONFIG_DFU_NAND=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y

diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig
index e689d0f..98edb88 100644 (file)
--- a/configs/pxm2_defconfig
+++ b/configs/pxm2_defconfig
@@ -59,6 +59,7 @@ CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_SUBNETMASK=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_ENV=y
 CONFIG_DFU_NAND=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y

diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig
index 93e909c..e561edc 100644 (file)
--- a/configs/rastaban_defconfig
+++ b/configs/rastaban_defconfig
@@ -56,6 +56,7 @@ CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_SUBNETMASK=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_ENV=y
 CONFIG_DFU_NAND=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y

diff --git a/configs/rut_defconfig b/configs/rut_defconfig
index 9c879a9..e09f4c5 100644 (file)
--- a/configs/rut_defconfig
+++ b/configs/rut_defconfig
@@ -60,6 +60,7 @@ CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_SUBNETMASK=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_ENV=y
 CONFIG_DFU_NAND=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y

diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig
index 197abde..eb7e285 100644 (file)
--- a/configs/thuban_defconfig
+++ b/configs/thuban_defconfig
@@ -56,6 +56,7 @@ CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_SUBNETMASK=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_ENV=y
 CONFIG_DFU_NAND=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y

diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig
index e905295..40a0755 100644 (file)
--- a/drivers/bootcount/Kconfig
+++ b/drivers/bootcount/Kconfig
@@ -28,6 +28,18 @@ config BOOTCOUNT_AM33XX
          This requires the RTC clocks, etc, to be enabled prior to use and
          not all boards with this IP block on it will have the RTC in use.
 
+config BOOTCOUNT_ENV
+       bool "Boot counter in environment"
+       help
+         If no softreset save registers are found on the hardware
+         "bootcount" is stored in the environment. To prevent a
+         saveenv on all reboots, the environment variable
+         "upgrade_available" is used. If "upgrade_available" is
+         0, "bootcount" is always 0, if "upgrade_available" is
+         1 "bootcount" is incremented in the environment.
+         So the Userspace Application must set the "upgrade_available"
+         and "bootcount" variable to 0, if a boot was successfully.
+
 endchoice
 
 config SYS_BOOTCOUNT_SINGLEWORD

diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 15dfeec..0e77ccb 100644 (file)
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -490,6 +490,4 @@
 #define CONFIG_RESET_TO_RETRY
 #define CONFIG_BOOT_RETRY_TIME 60
 
-#define CONFIG_BOOTCOUNT_ENV
-
 #endif /* ! __CONFIG_SIEMENS_AM33X_COMMON_H */

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 58a74e0..80a3876 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_ENV
 CONFIG_BOOTCOUNT_I2C
 CONFIG_BOOTCOUNT_RAM
 CONFIG_BOOTFILE