[U-Boot] [PATCH v3 00/11] Convert bootcount drivers to Kconfig

[U-Boot] [PATCH v3 00/11] Convert bootcount drivers to Kconfig

[Alex Kiernan]

This patch set converts bootcount drivers to Kconfig, it also merges
CONFIG_BOOTCOUNT and CONFIG_BOOTCOUNT_LIMIT.

Green Travis build:

https://travis-ci.org/akiernan/u-boot/builds/342294699

This patch has been applied on top of u-boot/master:
SHA1: f116634cd17952a18efb7c8cc6f6a7ef42dd4b8b


Changes in v3:
- Improve commit messages
- Split rename of CONFIG_SYS_BOOTCOUNT_ADDR out to a separate series

Changes in v2:
- Fix erroneously removed line in README
- Convert CONFIG_BOOTCOUNT_EXT too - it had only been partially done
- Reword CONFIG_BOOTCOUNT_DRAM
- Update README for AT91 driver
- Remove CONFIG_BOOTCOUNT_LIMIT and CONFIG_SYS_BOOTCOUNT_SINGLEWORD
  from whitelist
- Rename CONFIG_SYS_BOOTCOUNT_ADDR to BOOTCOUNT_ADDR and remove from
  Kconfig
- Migrate CONFIG_BOOTCOUNT_ALEN to Kconfig

Alex Kiernan (11):
  Merge CONFIG_BOOTCOUNT and CONFIG_BOOTCOUNT_LIMIT
  Prepare for multiple bootcount drivers
  Convert CONFIG_BOOTCOUNT_AM33XX to Kconfig
  Convert CONFIG_BOOTCOUNT_ENV to Kconfig
  Convert CONFIG_BOOTCOUNT_RAM to Kconfig
  Convert CONFIG_BOOTCOUNT_I2C to Kconfig
  Convert CONFIG_BOOTCOUNT_EXT to Kconfig
  Integrate AT91 bootcount driver
  Migrate generic bootcount to Kconfig
  Migrate CONFIG_BOOTCOUNT_ALEN to Kconfig
  Remove CONFIG_SYS_BOOTCOUNT_SINGLEWORD

 README                                 | 32 ------------
 configs/draco_defconfig                |  1 +
 configs/etamin_defconfig               |  1 +
 configs/ge_b450v3_defconfig            |  2 +
 configs/ge_b650v3_defconfig            |  2 +
 configs/ge_b850v3_defconfig            |  2 +
 configs/ids8313_defconfig              |  1 +
 configs/km_kirkwood_128m16_defconfig   |  1 +
 configs/km_kirkwood_defconfig          |  1 +
 configs/km_kirkwood_pci_defconfig      |  1 +
 configs/kmcoge5un_defconfig            |  1 +
 configs/kmnusa_defconfig               |  1 +
 configs/kmsugp1_defconfig              |  1 +
 configs/kmsuv31_defconfig              |  1 +
 configs/mgcoge3un_defconfig            |  1 +
 configs/mx53ppd_defconfig              |  1 -
 configs/portl2_defconfig               |  1 +
 configs/pxm2_defconfig                 |  1 +
 configs/rastaban_defconfig             |  1 +
 configs/rut_defconfig                  |  1 +
 configs/theadorable_debug_defconfig    |  1 +
 configs/thuban_defconfig               |  1 +
 drivers/bootcount/Kconfig              | 89 ++++++++++++++++++++++++++--------
 drivers/bootcount/Makefile             |  5 +-
 include/configs/am335x_evm.h           |  1 -
 include/configs/am335x_sl50.h          |  1 -
 include/configs/baltos.h               |  2 -
 include/configs/bav335x.h              |  1 -
 include/configs/brppt1.h               |  1 -
 include/configs/chiliboard.h           |  1 -
 include/configs/ge_bx50v3.h            |  4 --
 include/configs/ids8313.h              |  2 -
 include/configs/km/km_arm.h            |  2 -
 include/configs/siemens-am33x-common.h |  2 -
 include/configs/theadorable.h          |  1 -
 scripts/config_whitelist.txt           |  7 ---
 36 files changed, 94 insertions(+), 81 deletions(-)

-- 
2.7.4

[U-Boot] [PATCH v3 01/11] Merge CONFIG_BOOTCOUNT and CONFIG_BOOTCOUNT_LIMIT

[Alex Kiernan]

CONFIG_BOOTCOUNT was only used in mx53ppd, merge it with
CONFIG_BOOTCOUNT_LIMIT

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

Changes in v3:
- Improve commit messages
- Split rename of CONFIG_SYS_BOOTCOUNT_ADDR out to a separate series

Changes in v2:
- Fix erroneously removed line in README
- Convert CONFIG_BOOTCOUNT_EXT too - it had only been partially done
- Reword CONFIG_BOOTCOUNT_DRAM
- Update README for AT91 driver
- Remove CONFIG_BOOTCOUNT_LIMIT and CONFIG_SYS_BOOTCOUNT_SINGLEWORD
  from whitelist
- Rename CONFIG_SYS_BOOTCOUNT_ADDR to BOOTCOUNT_ADDR and remove from
  Kconfig
- Migrate CONFIG_BOOTCOUNT_ALEN to Kconfig

 configs/mx53ppd_defconfig    | 1 -
 drivers/bootcount/Kconfig    | 9 +--------
 scripts/config_whitelist.txt | 1 -
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/configs/mx53ppd_defconfig b/configs/mx53ppd_defconfig
index 90df425..7e3dd6d 100644
--- a/configs/mx53ppd_defconfig
+++ b/configs/mx53ppd_defconfig
@@ -21,7 +21,6 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
-CONFIG_BOOTCOUNT=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_EXT=y
 CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="0:5"
diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig
index d82289f..da2ccab 100644
--- a/drivers/bootcount/Kconfig
+++ b/drivers/bootcount/Kconfig
@@ -4,13 +4,6 @@
 
 menu "Boot count support"
 
-config BOOTCOUNT
-	bool "Enable Boot count support"
-	help
-	  Enable boot count support, which provides the ability to store the
-	  number of times the board has booted on a number of different
-	  persistent storage mediums.
-
 config BOOTCOUNT_LIMIT
 	bool "Enable support for checking boot count limit"
 	help
@@ -23,7 +16,7 @@ config SYS_BOOTCOUNT_SINGLEWORD
 	  This option enables packing boot count magic value and boot count
 	  into single word (32 bits).
 
-if BOOTCOUNT
+if BOOTCOUNT_LIMIT
 
 config BOOTCOUNT_EXT
 	bool "Boot counter on EXT filesystem"
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 4ac89cd..cda7d4f 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -151,7 +151,6 @@ CONFIG_BOOTCOUNT_ALEN
 CONFIG_BOOTCOUNT_AM33XX
 CONFIG_BOOTCOUNT_ENV
 CONFIG_BOOTCOUNT_I2C
-CONFIG_BOOTCOUNT_LIMIT
 CONFIG_BOOTCOUNT_RAM
 CONFIG_BOOTFILE
 CONFIG_BOOTMAPSZ
-- 
2.7.4

[U-Boot] [PATCH v3 02/11] Prepare for multiple bootcount drivers

[Alex Kiernan]

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

Changes in v3: None
Changes in v2: None

 drivers/bootcount/Kconfig | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig
index da2ccab..26fec89 100644
--- a/drivers/bootcount/Kconfig
+++ b/drivers/bootcount/Kconfig
@@ -2,29 +2,30 @@
 # Boot count configuration
 #
 
-menu "Boot count support"
-
-config BOOTCOUNT_LIMIT
+menuconfig BOOTCOUNT_LIMIT
 	bool "Enable support for checking boot count limit"
 	help
 	  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_LIMIT
 
+choice
+	prompt "Boot count device"
+
 config BOOTCOUNT_EXT
 	bool "Boot counter on EXT filesystem"
 	help
 	  Add support for maintaining boot count in a file on an EXT
 	  filesystem.
 
-if BOOTCOUNT_EXT
+endchoice
+
+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).
 
 config SYS_BOOTCOUNT_EXT_INTERFACE
 	string "Interface on which to find boot counter EXT filesystem"
@@ -57,7 +58,3 @@ config SYS_BOOTCOUNT_ADDR
 	  Set the address used for reading and writing the boot counter.
 
 endif
-
-endif
-
-endmenu
-- 
2.7.4

[U-Boot] [PATCH v3 03/11] Convert CONFIG_BOOTCOUNT_AM33XX to Kconfig

[Alex Kiernan]

This converts the following to Kconfig:
  CONFIG_BOOTCOUNT_AM33XX

Reviewed-by: Lukasz Majewski <lukma@denx.de>
Reviewed-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com>
Acked-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com>
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
---

Changes in v3: None
Changes in v2: None

 README                        | 2 --
 drivers/bootcount/Kconfig     | 9 +++++++++
 drivers/bootcount/Makefile    | 1 -
 include/configs/am335x_evm.h  | 1 -
 include/configs/am335x_sl50.h | 1 -
 include/configs/baltos.h      | 2 --
 include/configs/bav335x.h     | 1 -
 include/configs/brppt1.h      | 1 -
 include/configs/chiliboard.h  | 1 -
 scripts/config_whitelist.txt  | 1 -
 10 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/README b/README
index fabd532..1a9c2b2 100644
--- a/README
+++ b/README
@@ -2320,8 +2320,6 @@ The following options need to be configured:
 - bootcount support:
 		CONFIG_AT91SAM9XE
 		enable special bootcounter support on at91sam9xe based boards.
-		CONFIG_SOC_DA8XX
-		enable special bootcounter support on da850 based boards.
 		CONFIG_BOOTCOUNT_RAM
 		enable support for the bootcounter in RAM
 		CONFIG_BOOTCOUNT_I2C
diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig
index 26fec89..e905295 100644
--- a/drivers/bootcount/Kconfig
+++ b/drivers/bootcount/Kconfig
@@ -12,6 +12,7 @@ if BOOTCOUNT_LIMIT
 
 choice
 	prompt "Boot count device"
+	default BOOTCOUNT_AM33XX if AM33XX || SOC_DA8XX
 
 config BOOTCOUNT_EXT
 	bool "Boot counter on EXT filesystem"
@@ -19,6 +20,14 @@ config BOOTCOUNT_EXT
 	  Add support for maintaining boot count in a file on an EXT
 	  filesystem.
 
+config BOOTCOUNT_AM33XX
+	bool "Boot counter in AM33XX RTC IP block"
+	depends on AM33XX || SOC_DA8XX
+	help
+	  A bootcount driver for the RTC IP block found on many TI platforms.
+	  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.
+
 endchoice
 
 config SYS_BOOTCOUNT_SINGLEWORD
diff --git a/drivers/bootcount/Makefile b/drivers/bootcount/Makefile
index 45445d2..62bf55e 100644
--- a/drivers/bootcount/Makefile
+++ b/drivers/bootcount/Makefile
@@ -4,7 +4,6 @@
 
 obj-y				+= bootcount.o
 obj-$(CONFIG_AT91SAM9XE)	+= bootcount_at91.o
-obj-$(CONFIG_SOC_DA8XX)		+= bootcount_davinci.o
 obj-$(CONFIG_BOOTCOUNT_AM33XX)	+= bootcount_davinci.o
 obj-$(CONFIG_BOOTCOUNT_RAM)	+= bootcount_ram.o
 obj-$(CONFIG_BOOTCOUNT_ENV)	+= bootcount_env.o
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 2e1dbf6..80a523d 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -180,7 +180,6 @@
 /* SPL */
 #ifndef CONFIG_NOR_BOOT
 /* Bootcount using the RTC block */
-#define CONFIG_BOOTCOUNT_AM33XX
 #define CONFIG_SYS_BOOTCOUNT_BE
 
 /* USB gadget RNDIS */
diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h
index 1cb3578..4bcbaee 100644
--- a/include/configs/am335x_sl50.h
+++ b/include/configs/am335x_sl50.h
@@ -74,7 +74,6 @@
 /* SPL */
 
 /* Bootcount using the RTC block */
-#define CONFIG_BOOTCOUNT_AM33XX
 #define CONFIG_SYS_BOOTCOUNT_BE
 
 #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT)
diff --git a/include/configs/baltos.h b/include/configs/baltos.h
index 440dbf5..10979c7 100644
--- a/include/configs/baltos.h
+++ b/include/configs/baltos.h
@@ -230,8 +230,6 @@
 
 /* SPL */
 #ifndef CONFIG_NOR_BOOT
-/* Bootcount using the RTC block */
-#define CONFIG_BOOTCOUNT_AM33XX
 
 /* USB gadget RNDIS */
 
diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h
index 5ea7658..48cd285 100644
--- a/include/configs/bav335x.h
+++ b/include/configs/bav335x.h
@@ -339,7 +339,6 @@ DEFAULT_LINUX_BOOT_ENV \
 /* SPL */
 #ifndef CONFIG_NOR_BOOT
 /* Bootcount using the RTC block */
-#define CONFIG_BOOTCOUNT_AM33XX
 #define CONFIG_SYS_BOOTCOUNT_BE
 
 /* USB gadget RNDIS */
diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h
index fb2845f..30ea2d2 100644
--- a/include/configs/brppt1.h
+++ b/include/configs/brppt1.h
@@ -22,7 +22,6 @@
 
 /* Bootcount using the RTC block */
 #define CONFIG_SYS_BOOTCOUNT_ADDR	0x44E3E000
-#define CONFIG_BOOTCOUNT_AM33XX
 
 /* memory */
 #define CONFIG_SYS_MALLOC_LEN		(5 * 1024 * 1024)
diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h
index 234cd6a..92e0479 100644
--- a/include/configs/chiliboard.h
+++ b/include/configs/chiliboard.h
@@ -123,7 +123,6 @@
 
 /* SPL */
 /* Bootcount using the RTC block */
-#define CONFIG_BOOTCOUNT_AM33XX
 #define CONFIG_SYS_BOOTCOUNT_BE
 
 /* NAND: device related configs */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index cda7d4f..f96f12a 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -148,7 +148,6 @@ CONFIG_BOOGER
 CONFIG_BOOM
 CONFIG_BOOTBLOCK
 CONFIG_BOOTCOUNT_ALEN
-CONFIG_BOOTCOUNT_AM33XX
 CONFIG_BOOTCOUNT_ENV
 CONFIG_BOOTCOUNT_I2C
 CONFIG_BOOTCOUNT_RAM
-- 
2.7.4

[U-Boot] [PATCH v3 04/11] Convert CONFIG_BOOTCOUNT_ENV to Kconfig

[Alex Kiernan]

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>
---

Changes in v3: None
Changes in v2: None

 README                                 | 11 -----------
 configs/draco_defconfig                |  1 +
 configs/etamin_defconfig               |  1 +
 configs/pxm2_defconfig                 |  1 +
 configs/rastaban_defconfig             |  1 +
 configs/rut_defconfig                  |  1 +
 configs/thuban_defconfig               |  1 +
 drivers/bootcount/Kconfig              | 12 ++++++++++++
 include/configs/siemens-am33x-common.h |  2 --
 scripts/config_whitelist.txt           |  1 -
 10 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/README b/README
index 1a9c2b2..6f2fd0e 100644
--- 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 693d91c..0416daa 100644
--- a/configs/draco_defconfig
+++ b/configs/draco_defconfig
@@ -52,6 +52,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_ENV_IS_IN_NAND=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 e7a3d22..7d639ea 100644
--- a/configs/etamin_defconfig
+++ b/configs/etamin_defconfig
@@ -52,6 +52,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_ENV_IS_IN_NAND=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 6063259..90783b4 100644
--- a/configs/pxm2_defconfig
+++ b/configs/pxm2_defconfig
@@ -55,6 +55,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_ENV_IS_IN_NAND=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 ce6981e..c0947e9 100644
--- a/configs/rastaban_defconfig
+++ b/configs/rastaban_defconfig
@@ -52,6 +52,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_ENV_IS_IN_NAND=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 b31eb97..685b4c8 100644
--- a/configs/rut_defconfig
+++ b/configs/rut_defconfig
@@ -56,6 +56,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_ENV_IS_IN_NAND=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 4a3c0cd..f5d1077 100644
--- a/configs/thuban_defconfig
+++ b/configs/thuban_defconfig
@@ -52,6 +52,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_ENV_IS_IN_NAND=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
--- 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 d308b0e..5cb82e0 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -498,6 +498,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 f96f12a..dd09663 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -148,7 +148,6 @@ CONFIG_BOOGER
 CONFIG_BOOM
 CONFIG_BOOTBLOCK
 CONFIG_BOOTCOUNT_ALEN
-CONFIG_BOOTCOUNT_ENV
 CONFIG_BOOTCOUNT_I2C
 CONFIG_BOOTCOUNT_RAM
 CONFIG_BOOTFILE
-- 
2.7.4

[U-Boot] [PATCH v3 05/11] Convert CONFIG_BOOTCOUNT_RAM to Kconfig

[Alex Kiernan]

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>
---

Changes in v3: None
Changes in v2: None

 README                               | 2 --
 configs/km_kirkwood_128m16_defconfig | 1 +
 configs/km_kirkwood_defconfig        | 1 +
 configs/km_kirkwood_pci_defconfig    | 1 +
 configs/kmcoge5un_defconfig          | 1 +
 configs/kmnusa_defconfig             | 1 +
 configs/kmsugp1_defconfig            | 1 +
 configs/kmsuv31_defconfig            | 1 +
 configs/mgcoge3un_defconfig          | 1 +
 configs/portl2_defconfig             | 1 +
 configs/theadorable_debug_defconfig  | 1 +
 drivers/bootcount/Kconfig            | 6 ++++++
 include/configs/km/km_arm.h          | 2 --
 include/configs/theadorable.h        | 1 -
 scripts/config_whitelist.txt         | 1 -
 15 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/README b/README
index 6f2fd0e..474632c 100644
--- a/README
+++ b/README
@@ -2309,8 +2309,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 54c22a7..5f378f7 100644
--- a/configs/km_kirkwood_128m16_defconfig
+++ b/configs/km_kirkwood_128m16_defconfig
@@ -27,6 +27,7 @@ CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_ENV_IS_IN_EEPROM=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 20ea24b..ae20d24 100644
--- a/configs/km_kirkwood_defconfig
+++ b/configs/km_kirkwood_defconfig
@@ -27,6 +27,7 @@ CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_ENV_IS_IN_EEPROM=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 402610c..22bc6cd 100644
--- a/configs/km_kirkwood_pci_defconfig
+++ b/configs/km_kirkwood_pci_defconfig
@@ -27,6 +27,7 @@ CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_ENV_IS_IN_EEPROM=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 72aee04..5c123a4 100644
--- a/configs/kmcoge5un_defconfig
+++ b/configs/kmcoge5un_defconfig
@@ -27,6 +27,7 @@ CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_ENV_IS_IN_SPI_FLASH=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 ac82780..4749ead 100644
--- a/configs/kmnusa_defconfig
+++ b/configs/kmnusa_defconfig
@@ -27,6 +27,7 @@ CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_ENV_IS_IN_SPI_FLASH=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 af2c93e3..de68d41 100644
--- a/configs/kmsugp1_defconfig
+++ b/configs/kmsugp1_defconfig
@@ -27,6 +27,7 @@ CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_ENV_IS_IN_SPI_FLASH=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 09d75ab..892f212 100644
--- a/configs/kmsuv31_defconfig
+++ b/configs/kmsuv31_defconfig
@@ -27,6 +27,7 @@ CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_ENV_IS_IN_SPI_FLASH=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 3e90e70..89a83fd 100644
--- a/configs/mgcoge3un_defconfig
+++ b/configs/mgcoge3un_defconfig
@@ -27,6 +27,7 @@ CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_ENV_IS_IN_EEPROM=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 1c6dad9..8a6d996 100644
--- a/configs/portl2_defconfig
+++ b/configs/portl2_defconfig
@@ -27,6 +27,7 @@ CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
 CONFIG_ENV_IS_IN_EEPROM=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 aa6e5e1..918447a 100644
--- 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 40a0755..eabfd13 100644
--- 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 faa3d94..cc36a68 100644
--- 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 a213e7e..e4ec2c0 100644
--- 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 dd09663..07951f2 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -149,7 +149,6 @@ CONFIG_BOOM
 CONFIG_BOOTBLOCK
 CONFIG_BOOTCOUNT_ALEN
 CONFIG_BOOTCOUNT_I2C
-CONFIG_BOOTCOUNT_RAM
 CONFIG_BOOTFILE
 CONFIG_BOOTMAPSZ
 CONFIG_BOOTMODE
-- 
2.7.4

[U-Boot] [PATCH v3 06/11] Convert CONFIG_BOOTCOUNT_I2C to Kconfig

[Alex Kiernan]

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>
---

Changes in v3: None
Changes in v2: None

 README                       | 6 ------
 configs/ids8313_defconfig    | 1 +
 drivers/bootcount/Kconfig    | 9 +++++++++
 include/configs/ids8313.h    | 1 -
 scripts/config_whitelist.txt | 1 -
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/README b/README
index 474632c..2008483 100644
--- a/README
+++ b/README
@@ -2309,12 +2309,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 b754758..ca14815 100644
--- a/configs/ids8313_defconfig
+++ b/configs/ids8313_defconfig
@@ -30,6 +30,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=ff800000.flash,nand0=e1000000.flash"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:7m(dum),768k(BOOT-BIN),128k(BOOT-ENV),128k(BOOT-REDENV);e1000000.flash:-(ubi)"
 CONFIG_CMD_UBI=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 eabfd13..8c19ae6 100644
--- 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 628e0a2..099d7bd 100644
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -515,7 +515,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 07951f2..c47156b 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -148,7 +148,6 @@ CONFIG_BOOGER
 CONFIG_BOOM
 CONFIG_BOOTBLOCK
 CONFIG_BOOTCOUNT_ALEN
-CONFIG_BOOTCOUNT_I2C
 CONFIG_BOOTFILE
 CONFIG_BOOTMAPSZ
 CONFIG_BOOTMODE
-- 
2.7.4

[U-Boot] [PATCH v3 07/11] Convert CONFIG_BOOTCOUNT_EXT to Kconfig

[Alex Kiernan]

This converts the following to Kconfig:
  CONFIG_BOOTCOUNT_EXT

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
---

Changes in v3: None
Changes in v2: None

 README                      | 7 -------
 configs/ge_b450v3_defconfig | 2 ++
 configs/ge_b650v3_defconfig | 2 ++
 configs/ge_b850v3_defconfig | 2 ++
 include/configs/ge_bx50v3.h | 4 ----
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/README b/README
index 2008483..21de2e4 100644
--- a/README
+++ b/README
@@ -2309,13 +2309,6 @@ The following options need to be configured:
 - bootcount support:
 		CONFIG_AT91SAM9XE
 		enable special bootcounter support on at91sam9xe based boards.
-		CONFIG_BOOTCOUNT_EXT
-		enable support for the bootcounter in EXT filesystem
-			CONFIG_SYS_BOOTCOUNT_ADDR = RAM address used for read
-                                                    and write.
-			CONFIG_SYS_BOOTCOUNT_EXT_INTERFACE = interface
-			CONFIG_SYS_BOOTCOUNT_EXT_DEVPART = device and part
-			CONFIG_SYS_BOOTCOUNT_EXT_NAME = filename
 
 - Show boot progress:
 		CONFIG_SHOW_BOOT_PROGRESS
diff --git a/configs/ge_b450v3_defconfig b/configs/ge_b450v3_defconfig
index a5beefe..32f07ab 100644
--- a/configs/ge_b450v3_defconfig
+++ b/configs/ge_b450v3_defconfig
@@ -26,6 +26,8 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_EXT=y
+CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="1:5"
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_NETDEVICES=y
diff --git a/configs/ge_b650v3_defconfig b/configs/ge_b650v3_defconfig
index cbf83b1..188238e 100644
--- a/configs/ge_b650v3_defconfig
+++ b/configs/ge_b650v3_defconfig
@@ -26,6 +26,8 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_EXT=y
+CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="1:5"
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_NETDEVICES=y
diff --git a/configs/ge_b850v3_defconfig b/configs/ge_b850v3_defconfig
index 953681f..96ac173 100644
--- a/configs/ge_b850v3_defconfig
+++ b/configs/ge_b850v3_defconfig
@@ -26,6 +26,8 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_BOOTCOUNT_EXT=y
+CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="1:5"
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_NETDEVICES=y
diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index 8dc0a7f..0a72b58 100644
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -267,10 +267,6 @@
 
 #define CONFIG_BCH
 
-#define CONFIG_BOOTCOUNT_EXT
-#define CONFIG_SYS_BOOTCOUNT_EXT_INTERFACE	"mmc"
-#define CONFIG_SYS_BOOTCOUNT_EXT_DEVPART	"1:5"
-#define CONFIG_SYS_BOOTCOUNT_EXT_NAME		"/boot/failures"
 #define CONFIG_SYS_BOOTCOUNT_ADDR		0x7000A000
 
 #endif	/* __GE_BX50V3_CONFIG_H */
-- 
2.7.4

[U-Boot] [PATCH v3 08/11] Integrate AT91 bootcount driver

[Alex Kiernan]

Integrate Boot counter for Atmel AT91SAM9XE into Kconfig

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

Changes in v3: None
Changes in v2: None

 README                     | 4 ----
 drivers/bootcount/Kconfig  | 5 +++++
 drivers/bootcount/Makefile | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/README b/README
index 21de2e4..a28030a 100644
--- a/README
+++ b/README
@@ -2306,10 +2306,6 @@ The following options need to be configured:
 		A better solution is to properly configure the firewall,
 		but sometimes that is not allowed.
 
-- bootcount support:
-		CONFIG_AT91SAM9XE
-		enable special bootcounter support on at91sam9xe based boards.
-
 - Show boot progress:
 		CONFIG_SHOW_BOOT_PROGRESS
 
diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig
index 8c19ae6..e0d1fc2 100644
--- a/drivers/bootcount/Kconfig
+++ b/drivers/bootcount/Kconfig
@@ -13,6 +13,7 @@ if BOOTCOUNT_LIMIT
 choice
 	prompt "Boot count device"
 	default BOOTCOUNT_AM33XX if AM33XX || SOC_DA8XX
+	default BOOTCOUNT_AT91 if AT91SAM9XE
 
 config BOOTCOUNT_EXT
 	bool "Boot counter on EXT filesystem"
@@ -55,6 +56,10 @@ config BOOTCOUNT_I2C
 	                              the bootcounter.
 	  CONFIG_BOOTCOUNT_ALEN = address len
 
+config BOOTCOUNT_AT91
+	bool "Boot counter for Atmel AT91SAM9XE"
+	depends on AT91SAM9XE
+
 endchoice
 
 config SYS_BOOTCOUNT_SINGLEWORD
diff --git a/drivers/bootcount/Makefile b/drivers/bootcount/Makefile
index 62bf55e..a3658c1 100644
--- a/drivers/bootcount/Makefile
+++ b/drivers/bootcount/Makefile
@@ -3,7 +3,7 @@
 #
 
 obj-y				+= bootcount.o
-obj-$(CONFIG_AT91SAM9XE)	+= bootcount_at91.o
+obj-$(CONFIG_BOOTCOUNT_AT91)	+= bootcount_at91.o
 obj-$(CONFIG_BOOTCOUNT_AM33XX)	+= bootcount_davinci.o
 obj-$(CONFIG_BOOTCOUNT_RAM)	+= bootcount_ram.o
 obj-$(CONFIG_BOOTCOUNT_ENV)	+= bootcount_env.o
-- 
2.7.4

[U-Boot] [PATCH v3 09/11] Migrate generic bootcount to Kconfig

[Alex Kiernan]

Make generate boot counter selected in the same way as other boot count
drivers

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

Changes in v3: None
Changes in v2: None

 drivers/bootcount/Kconfig  | 11 +++++++++++
 drivers/bootcount/Makefile |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig
index e0d1fc2..9fde2f2 100644
--- a/drivers/bootcount/Kconfig
+++ b/drivers/bootcount/Kconfig
@@ -14,6 +14,16 @@ choice
 	prompt "Boot count device"
 	default BOOTCOUNT_AM33XX if AM33XX || SOC_DA8XX
 	default BOOTCOUNT_AT91 if AT91SAM9XE
+	default BOOTCOUNT_GENERIC
+
+config BOOTCOUNT_GENERIC
+	bool "Generic default boot counter"
+	help
+	  Generic bootcount stored at SYS_BOOTCOUNT_ADDR.
+
+	  SYS_BOOTCOUNT_ADDR:
+	    Set to the address where the bootcount and bootcount magic
+	    will be stored.
 
 config BOOTCOUNT_EXT
 	bool "Boot counter on EXT filesystem"
@@ -64,6 +74,7 @@ endchoice
 
 config SYS_BOOTCOUNT_SINGLEWORD
 	bool "Use single word to pack boot count and magic value"
+	depends on BOOTCOUNT_GENERIC
 	help
 	  This option enables packing boot count magic value and boot count
 	  into single word (32 bits).
diff --git a/drivers/bootcount/Makefile b/drivers/bootcount/Makefile
index a3658c1..3e1ae8c 100644
--- a/drivers/bootcount/Makefile
+++ b/drivers/bootcount/Makefile
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-obj-y				+= bootcount.o
+obj-$(CONFIG_BOOTCOUNT_GENERIC)	+= bootcount.o
 obj-$(CONFIG_BOOTCOUNT_AT91)	+= bootcount_at91.o
 obj-$(CONFIG_BOOTCOUNT_AM33XX)	+= bootcount_davinci.o
 obj-$(CONFIG_BOOTCOUNT_RAM)	+= bootcount_ram.o
-- 
2.7.4

[U-Boot] [PATCH v3 10/11] Migrate CONFIG_BOOTCOUNT_ALEN to Kconfig

[Alex Kiernan]

Convert CONFIG_BOOTCOUNT_ALEN to Kconfig
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>

---

Changes in v3: None
Changes in v2: None

 drivers/bootcount/Kconfig    | 9 ++++++++-
 include/configs/ids8313.h    | 1 -
 scripts/config_whitelist.txt | 1 -
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig
index 9fde2f2..c41b131 100644
--- a/drivers/bootcount/Kconfig
+++ b/drivers/bootcount/Kconfig
@@ -64,7 +64,6 @@ config BOOTCOUNT_I2C
 	  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_AT91
 	bool "Boot counter for Atmel AT91SAM9XE"
@@ -72,6 +71,14 @@ config BOOTCOUNT_AT91
 
 endchoice
 
+config BOOTCOUNT_ALEN
+	int "I2C address length"
+	default 1
+	depends on BOOTCOUNT_I2C
+	help
+	  Length of the the I2C address at SYS_BOOTCOUNT_ADDR for storing
+	  the boot counter.
+
 config SYS_BOOTCOUNT_SINGLEWORD
 	bool "Use single word to pack boot count and magic value"
 	depends on BOOTCOUNT_GENERIC
diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index 099d7bd..388685d 100644
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -515,7 +515,6 @@
 #define CONFIG_MTD_PARTITIONS
 
 /* bootcount support */
-#define CONFIG_BOOTCOUNT_ALEN	1
 #define CONFIG_SYS_BOOTCOUNT_ADDR	0x9
 
 #define CONFIG_IMAGE_FORMAT_LEGACY
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index c47156b..4caa94f 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -147,7 +147,6 @@ CONFIG_BOARD_TYPES
 CONFIG_BOOGER
 CONFIG_BOOM
 CONFIG_BOOTBLOCK
-CONFIG_BOOTCOUNT_ALEN
 CONFIG_BOOTFILE
 CONFIG_BOOTMAPSZ
 CONFIG_BOOTMODE
-- 
2.7.4

[U-Boot] [PATCH v3 11/11] Remove CONFIG_SYS_BOOTCOUNT_SINGLEWORD

[Alex Kiernan]

Tidy up CONFIG_SYS_BOOTCOUNT_SINGLEWORD from the whitelist as there's
no remaining uses of it left.

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
---

Changes in v3: None
Changes in v2: None

 scripts/config_whitelist.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 4caa94f..4112e40 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -2213,7 +2213,6 @@ CONFIG_SYS_BOARD_VERSION
 CONFIG_SYS_BOOK3E_HV
 CONFIG_SYS_BOOTCOUNT_BE
 CONFIG_SYS_BOOTCOUNT_LE
-CONFIG_SYS_BOOTCOUNT_SINGLEWORD
 CONFIG_SYS_BOOTFILE_PREFIX
 CONFIG_SYS_BOOTMAPSZ
 CONFIG_SYS_BOOTM_LEN
-- 
2.7.4

[U-Boot] [U-Boot, v3, 01/11] Merge CONFIG_BOOTCOUNT and CONFIG_BOOTCOUNT_LIMIT

[Tom Rini]

On Fri, Feb 16, 2018 at 03:50:38PM +0000, Alex Kiernan wrote:

> CONFIG_BOOTCOUNT was only used in mx53ppd, merge it with
> CONFIG_BOOTCOUNT_LIMIT
> 
> Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
> Reviewed-by: Lukasz Majewski <lukma@denx.de>
> Reviewed-by: Ian Ray <ian.ray@ge.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180225/d628533e/attachment.sig>

[U-Boot] [U-Boot, v3, 02/11] Prepare for multiple bootcount drivers

[Tom Rini]

On Fri, Feb 16, 2018 at 03:50:39PM +0000, Alex Kiernan wrote:

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

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180225/3c311c75/attachment.sig>

[U-Boot] [U-Boot, v3, 03/11] Convert CONFIG_BOOTCOUNT_AM33XX to Kconfig

[Tom Rini]

On Fri, Feb 16, 2018 at 03:50:40PM +0000, Alex Kiernan wrote:

> This converts the following to Kconfig:
>   CONFIG_BOOTCOUNT_AM33XX
> 
> Reviewed-by: Lukasz Majewski <lukma@denx.de>
> Reviewed-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com>
> Acked-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com>
> Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180225/516914a2/attachment.sig>

[U-Boot] [U-Boot, v3, 04/11] Convert CONFIG_BOOTCOUNT_ENV to Kconfig

[Tom Rini]

On Fri, Feb 16, 2018 at 03:50:41PM +0000, Alex Kiernan wrote:

> 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>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180225/6f118cfe/attachment.sig>

[U-Boot] [U-Boot, v3, 05/11] Convert CONFIG_BOOTCOUNT_RAM to Kconfig

[Tom Rini]

On Fri, Feb 16, 2018 at 03:50:42PM +0000, Alex Kiernan wrote:

> 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>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180225/80a54ebc/attachment.sig>

[U-Boot] [U-Boot, v3, 06/11] Convert CONFIG_BOOTCOUNT_I2C to Kconfig

[Tom Rini]

On Fri, Feb 16, 2018 at 03:50:43PM +0000, Alex Kiernan wrote:

> 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>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180225/36c7e671/attachment.sig>

[U-Boot] [U-Boot, v3, 07/11] Convert CONFIG_BOOTCOUNT_EXT to Kconfig

[Tom Rini]

On Fri, Feb 16, 2018 at 03:50:44PM +0000, Alex Kiernan wrote:

> This converts the following to Kconfig:
>   CONFIG_BOOTCOUNT_EXT
> 
> Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180225/6ee0d271/attachment.sig>

[U-Boot] [U-Boot,v3,08/11] Integrate AT91 bootcount driver

[Tom Rini]

On Fri, Feb 16, 2018 at 03:50:45PM +0000, Alex Kiernan wrote:

> Integrate Boot counter for Atmel AT91SAM9XE into Kconfig
> 
> Reviewed-by: Lukasz Majewski <lukma@denx.de>
> Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180225/2e35b0cb/attachment.sig>

[U-Boot] [U-Boot, v3, 09/11] Migrate generic bootcount to Kconfig

[Tom Rini]

On Fri, Feb 16, 2018 at 03:50:46PM +0000, Alex Kiernan wrote:

> Make generate boot counter selected in the same way as other boot count
> drivers
> 
> Reviewed-by: Lukasz Majewski <lukma@denx.de>
> Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180225/1a5f4c70/attachment.sig>

[U-Boot] [U-Boot, v3, 10/11] Migrate CONFIG_BOOTCOUNT_ALEN to Kconfig

[Tom Rini]

On Fri, Feb 16, 2018 at 03:50:47PM +0000, Alex Kiernan wrote:

> Convert CONFIG_BOOTCOUNT_ALEN to Kconfig
> Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180225/a5a9a25c/attachment.sig>

[U-Boot] [U-Boot, v3, 11/11] Remove CONFIG_SYS_BOOTCOUNT_SINGLEWORD

[Tom Rini]

On Fri, Feb 16, 2018 at 03:50:48PM +0000, Alex Kiernan wrote:

> Tidy up CONFIG_SYS_BOOTCOUNT_SINGLEWORD from the whitelist as there's
> no remaining uses of it left.
> 
> Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180225/fa911a90/attachment.sig>