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 b227d8e90746b285558e88fde5681f975a931515..4478bad6ef15c10006b61ec67aa087b1e4cda82f 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.
 
                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
 
 - Pre-Boot Commands:
                CONFIG_PREBOOT
 

diff --git a/configs/draco_defconfig b/configs/draco_defconfig
index 05b1b9e63c587a39aea94ea64c73a7315e2fe5b4..985e6629294da68ed7a063879e0417f9e21aa3e8 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_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
 CONFIG_DFU_NAND=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y

diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig
index a9234ee8dde98e5d620666161c860b71975d69a0..dd862bb965dab78cb0366b4996beb8ae074e8e16 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_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
 CONFIG_DFU_NAND=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y

diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig
index e689d0f1cc704885de12b6a14bb4541b72056ae2..98edb8828c95ba4e62b338226dbea3c8015744c3 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_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
 CONFIG_DFU_NAND=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y

diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig
index 93e909cd206596bfa54b48df0c67e525f05c4154..e561edccf89a589f622ad18be0e36f7d8d8829b2 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_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
 CONFIG_DFU_NAND=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y

diff --git a/configs/rut_defconfig b/configs/rut_defconfig
index 9c879a96abc064da85bee898808cf19dd15a0ec9..e09f4c54e3ccdc1830834de4615cf0af9fce54df 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_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
 CONFIG_DFU_NAND=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y

diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig
index 197abde03f303b4af027539a374b9fc025c65894..eb7e2850ff10d214bbed6762eff23d58851efb84 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_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
 CONFIG_DFU_NAND=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y

diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig
index e905295d4537f9a8e7f47088bd911b92698cfe8f..40a07555af0b5f2a70cddda114cf1cd24cf99fa1 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.
 
          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
 endchoice
 
 config SYS_BOOTCOUNT_SINGLEWORD

diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 15dfeec98cc94dcf1402af24d2f3d2383224a58f..0e77ccb46644f15044f1fc0e36f8151f23af6858 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_RESET_TO_RETRY
 #define CONFIG_BOOT_RETRY_TIME 60
 

-#define CONFIG_BOOTCOUNT_ENV
-

 #endif /* ! __CONFIG_SIEMENS_AM33X_COMMON_H */
 #endif /* ! __CONFIG_SIEMENS_AM33X_COMMON_H */

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 58a74e0e9d5840731215a04f3384cabdbf14ca95..80a38763faba4de0d3ed1590495405d218ff3ace 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_BOOGER
 CONFIG_BOOTBLOCK
 CONFIG_BOOTCOUNT_ALEN

-CONFIG_BOOTCOUNT_ENV

 CONFIG_BOOTCOUNT_I2C
 CONFIG_BOOTCOUNT_RAM
 CONFIG_BOOTFILE
 CONFIG_BOOTCOUNT_I2C
 CONFIG_BOOTCOUNT_RAM
 CONFIG_BOOTFILE