diff mbox series

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

Message ID 1518796248-28270-11-git-send-email-alex.kiernan@gmail.com
State Accepted
Delegated to: Tom Rini
Headers show
Series Convert bootcount drivers to Kconfig | expand

Commit Message

Alex Kiernan Feb. 16, 2018, 3:50 p.m. UTC 
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(-)

Comments

Tom Rini Feb. 25, 2018, 8:37 p.m. UTC | #1 
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!
diff mbox series

Patch

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