Convert CONFIG_BOOTCOUNT_RAM to Kconfig

This converts the following to Kconfig:
  CONFIG_BOOTCOUNT_RAM

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

diff --git a/README b/README
index 4478bad6ef15c10006b61ec67aa087b1e4cda82f..5ab683de64fdca9812bbf6ea0d6193cb1b7914c2 100644 (file)
--- a/README
+++ b/README
@@ -2270,8 +2270,6 @@ The following options need to be configured:
 - bootcount support:
                CONFIG_AT91SAM9XE
                enable special bootcounter support on at91sam9xe based boards.
-               CONFIG_BOOTCOUNT_RAM
-               enable support for the bootcounter in RAM
                CONFIG_BOOTCOUNT_I2C
                enable support for the bootcounter on an i2c (like RTC) device.
                        CONFIG_SYS_I2C_RTC_ADDR = i2c chip address

diff --git a/configs/km_kirkwood_128m16_defconfig b/configs/km_kirkwood_128m16_defconfig
index 3c7709dbdc81b864eb332af83e1b5a2682cb5a15..653dc92ca335ef5a154a7f4f4f11ea7dc6157601 100644 (file)
--- a/configs/km_kirkwood_128m16_defconfig
+++ b/configs/km_kirkwood_128m16_defconfig
@@ -30,6 +30,7 @@ CONFIG_BOOTP_BOOTPATH=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_RAM=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y

diff --git a/configs/km_kirkwood_defconfig b/configs/km_kirkwood_defconfig
index 04513a44b6469d9d0ebff3feb572df49c11f4807..0a55ed407a903ef0d5ea4f10b9b6a5e151f031e6 100644 (file)
--- a/configs/km_kirkwood_defconfig
+++ b/configs/km_kirkwood_defconfig
@@ -30,6 +30,7 @@ CONFIG_BOOTP_BOOTPATH=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_RAM=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y

diff --git a/configs/km_kirkwood_pci_defconfig b/configs/km_kirkwood_pci_defconfig
index 1e8f51135c33d90d506955fd81e3675ba509102e..dba9eb7b7d0816f1f360e455b1d25f91863aae8b 100644 (file)
--- a/configs/km_kirkwood_pci_defconfig
+++ b/configs/km_kirkwood_pci_defconfig
@@ -30,6 +30,7 @@ CONFIG_BOOTP_BOOTPATH=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_RAM=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y

diff --git a/configs/kmcoge5un_defconfig b/configs/kmcoge5un_defconfig
index c7c0021131b111443d5c39645822b052e3a3546c..63654c35cdfbc6d4dd15f5602164084dcc57542c 100644 (file)
--- a/configs/kmcoge5un_defconfig
+++ b/configs/kmcoge5un_defconfig
@@ -30,6 +30,7 @@ CONFIG_BOOTP_BOOTPATH=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_RAM=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y

diff --git a/configs/kmnusa_defconfig b/configs/kmnusa_defconfig
index 960ca12cb32050fdf27a88962cada33a25cb52c9..0dd32016a1c8813ae8a980f2397a5bcfb8151fe3 100644 (file)
--- a/configs/kmnusa_defconfig
+++ b/configs/kmnusa_defconfig
@@ -30,6 +30,7 @@ CONFIG_BOOTP_BOOTPATH=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_RAM=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y

diff --git a/configs/kmsugp1_defconfig b/configs/kmsugp1_defconfig
index d5d5cd7b06ca9503e8c22cbacf57acd2a4e0bef8..ed6540fed4587131119f03bc5f9542d19aafb718 100644 (file)
--- a/configs/kmsugp1_defconfig
+++ b/configs/kmsugp1_defconfig
@@ -30,6 +30,7 @@ CONFIG_BOOTP_BOOTPATH=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_RAM=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y

diff --git a/configs/kmsuv31_defconfig b/configs/kmsuv31_defconfig
index 33335cd4080ac0ad2dbe9cfd7036c55c293f4b4f..b662077ef94769680f3309b2b86c291097bab99d 100644 (file)
--- a/configs/kmsuv31_defconfig
+++ b/configs/kmsuv31_defconfig
@@ -30,6 +30,7 @@ CONFIG_BOOTP_BOOTPATH=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_RAM=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y

diff --git a/configs/mgcoge3un_defconfig b/configs/mgcoge3un_defconfig
index 5c0946af7bde72a6bb3ada141904e3c8a3c1abad..6a96b62eb582656c7ef073968a194fec88344c1e 100644 (file)
--- a/configs/mgcoge3un_defconfig
+++ b/configs/mgcoge3un_defconfig
@@ -30,6 +30,7 @@ CONFIG_BOOTP_BOOTPATH=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_RAM=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y

diff --git a/configs/portl2_defconfig b/configs/portl2_defconfig
index e3cf6378b7e7ee980299c5f236ea33458d327ff8..6dc270a03548a6711c7fe83d624cded3e3e9fada 100644 (file)
--- a/configs/portl2_defconfig
+++ b/configs/portl2_defconfig
@@ -30,6 +30,7 @@ CONFIG_BOOTP_BOOTPATH=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_RAM=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y

diff --git a/configs/theadorable_debug_defconfig b/configs/theadorable_debug_defconfig
index aa6e5e11ef9952607a3bc3137379ed28d15fcdde..918447a296b197999232fca7f3f036bb46c04978 100644 (file)
--- a/configs/theadorable_debug_defconfig
+++ b/configs/theadorable_debug_defconfig
@@ -45,6 +45,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_OF_TRANSLATE=y
 CONFIG_SATA_MV=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_RAM=y
 CONFIG_FPGA_ALTERA=y
 CONFIG_DM_GPIO=y
 # CONFIG_MMC is not set

diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig
index 40a07555af0b5f2a70cddda114cf1cd24cf99fa1..eabfd132ad22350f4da799245dec1edbb6a854f5 100644 (file)
--- a/drivers/bootcount/Kconfig
+++ b/drivers/bootcount/Kconfig
@@ -40,6 +40,12 @@ config BOOTCOUNT_ENV
          So the Userspace Application must set the "upgrade_available"
          and "bootcount" variable to 0, if a boot was successfully.
 
+config BOOTCOUNT_RAM
+       bool "Boot counter in RAM"
+       help
+         Store the bootcount in DRAM protected against against bit errors
+         due to short power loss or holding a system in RESET.
+
 endchoice
 
 config SYS_BOOTCOUNT_SINGLEWORD

diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index faa3d94a95030f7f1de0e0281864c1e6ab7a52a7..cc36a68c0b0f156460aa34ba30ecf5bfdca684e7 100644 (file)
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -276,8 +276,6 @@ int get_scl(void);
 #define CONFIG_KM_RESERVED_PRAM 0x801000
 /* address for the bootcount (taken from end of RAM) */
 #define BOOTCOUNT_ADDR          (CONFIG_KM_RESERVED_PRAM)
-/* Use generic bootcount RAM driver */
-#define CONFIG_BOOTCOUNT_RAM
 
 /* enable POST tests */
 #define CONFIG_POST    (CONFIG_SYS_POST_MEM_REGIONS)

diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h
index a213e7e0a2ec5eba0920df4f9915fefd464eccbd..e4ec2c00f86d7dde15cc358f89f62801f3f3dd36 100644 (file)
--- a/include/configs/theadorable.h
+++ b/include/configs/theadorable.h
@@ -82,7 +82,6 @@
 /*
  * Bootcounter
  */
-#define CONFIG_BOOTCOUNT_RAM
 /* Max size of RAM minus BOOTCOUNT_ADDR is the bootcounter address */
 #define BOOTCOUNT_ADDR                 0x1000
 

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