[U-Boot,v2,09/13] Migrate generic bootcount to Kconfig

Message ID	1518702926-18874-10-git-send-email-alex.kiernan@gmail.com
State	Superseded
Delegated to:	Tom Rini
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> From: Alex Kiernan <alex.kiernan@gmail.com> To: u-boot@lists.denx.de Date: Thu, 15 Feb 2018 13:55:22 +0000 Message-Id: <1518702926-18874-10-git-send-email-alex.kiernan@gmail.com> In-Reply-To: <1518702926-18874-1-git-send-email-alex.kiernan@gmail.com> References: <1518702926-18874-1-git-send-email-alex.kiernan@gmail.com> Cc: Ian Ray <ian.ray@ge.com>, Martyn Welch <martyn.welch@collabora.co.uk> Subject: [U-Boot] [PATCH v2 09/13] Migrate generic bootcount to Kconfig Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	Convert bootcount drivers to Kconfig \| expand [U-Boot,v2,00/13] Convert bootcount drivers to Kconfig [U-Boot,v2,01/13] Merge CONFIG_BOOTCOUNT and CONFIG_BOOTCOUNT_LIMIT [U-Boot,v2,02/13] Prepare for multiple bootcount drivers [U-Boot,v2,03/13] Convert CONFIG_BOOTCOUNT_AM33XX to Kconfig [U-Boot,v2,04/13] Convert CONFIG_BOOTCOUNT_ENV to Kconfig [U-Boot,v2,05/13] Convert CONFIG_BOOTCOUNT_RAM to Kconfig [U-Boot,v2,06/13] Convert CONFIG_BOOTCOUNT_I2C to Kconfig [U-Boot,v2,07/13] Convert CONFIG_BOOTCOUNT_EXT to Kconfig [U-Boot,v2,08/13] Integrate AT91 bootcount driver [U-Boot,v2,09/13] Migrate generic bootcount to Kconfig [U-Boot,v2,10/13] Remove SYS_BOOTCOUNT_ADDR from Kconfig [U-Boot,v2,11/13] Rename CONFIG_SYS_BOOTCOUNT_ADDR to BOOTCOUNT_ADDR [U-Boot,v2,12/13] Migrate CONFIG_BOOTCOUNT_ALEN to Kconfig [U-Boot,v2,13/13] Remove CONFIG_SYS_BOOTCOUNT_SINGLEWORD

Message ID

1518702926-18874-10-git-send-email-alex.kiernan@gmail.com

State

Superseded

Delegated to:

Tom Rini

Headers

From: Alex Kiernan <alex.kiernan@gmail.com>
To: u-boot@lists.denx.de
Date: Thu, 15 Feb 2018 13:55:22 +0000
Message-Id: <1518702926-18874-10-git-send-email-alex.kiernan@gmail.com>
In-Reply-To: <1518702926-18874-1-git-send-email-alex.kiernan@gmail.com>
References: <1518702926-18874-1-git-send-email-alex.kiernan@gmail.com>
Cc: Ian Ray <ian.ray@ge.com>, Martyn Welch <martyn.welch@collabora.co.uk>
Subject: [U-Boot] [PATCH v2 09/13] Migrate generic bootcount to Kconfig
Precedence: list
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Errors-To: u-boot-bounces@lists.denx.de
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>

Series

Convert bootcount drivers to Kconfig | expand

Commit Message

Alex Kiernan Feb. 15, 2018, 1:55 p.m. UTC

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

[U-Boot,v2,09/13] Migrate generic bootcount to Kconfig

Commit Message

Patch