From: Alex Kiernan <alex.kiernan@gmail.com>
Date: Fri, 16 Feb 2018 15:50:47 +0000 (+0000)
Subject: Migrate CONFIG_BOOTCOUNT_ALEN to Kconfig
X-Git-Tag: v2018.03-rc4~31
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4bc4f8a67a17ba339f3e1bf75147f68e66c4a104;p=oweals%2Fu-boot.git

Migrate CONFIG_BOOTCOUNT_ALEN to Kconfig

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

diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig
index 9fde2f2a66..c41b1316cd 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 08865f8339..12c3aff416 100644
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -509,7 +509,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 e1b3fdc0e2..d2e89b36db 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -145,7 +145,6 @@ CONFIG_BOARD_TAURUS
 CONFIG_BOARD_TYPES
 CONFIG_BOOGER
 CONFIG_BOOTBLOCK
-CONFIG_BOOTCOUNT_ALEN
 CONFIG_BOOTFILE
 CONFIG_BOOTMAPSZ
 CONFIG_BOOTMODE