From patchwork Fri Feb 16 15:50:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 874523 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="H8NkHbr+"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zjdH51nt0z9sDB for ; Sat, 17 Feb 2018 03:03:45 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id D7716C22066; Fri, 16 Feb 2018 15:55:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 38A90C22074; Fri, 16 Feb 2018 15:55:21 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E7B99C22090; Fri, 16 Feb 2018 15:52:21 +0000 (UTC) Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by lists.denx.de (Postfix) with ESMTPS id B85BCC2208A for ; Fri, 16 Feb 2018 15:52:20 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id f3so3939489wmc.1 for ; Fri, 16 Feb 2018 07:52:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=whCwaYyJIRjkQgqq0AdVQi0YYba3LGUtpi5tAg4nG5Q=; b=H8NkHbr+RkJJQPYmRC2YcSjiTrcFE83+/PbmHtYEH4DX6gKtswZS5vCZahELf6KpDP qxmxKZmkfJDYT85C0EAAcJf5LIYd6cdHwOSqFQp7HASRCMTrx/S2G6JeA8Ou9ombXrf/ NcuDku06quE+oAI2n242zGwKzU4Tl5nfy4D6JK9kkI6lm1g9Gel8zjQg0AYiZ4936M48 OA8hE0nOYHzrBNHg6LMH+EQ7viQ6sH+5TXTfH4nHuhPmFv+vksmIBonCWs1wcm/fBWsb mBshe5bT7smzynTS9M2nvVbwsQwD+QZKaAcSfJhO67WXrfJM+dWlO6cSu/rTmJQBOp3d VVDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=whCwaYyJIRjkQgqq0AdVQi0YYba3LGUtpi5tAg4nG5Q=; b=tec4In4Eo4plAw5pvTjuXNFkq9E3DGgQ1CVvw9a5+NpNjPUt2m/WURHPhy+90Tzobz oX+IHsYAc3IE4J44VRS5os9Ekg9oQKYprFxLKIMFhnuxMYg9FIzeLu7s2ea3uMpqtwNl lbuHwgbe5UOgfoI5IzQlh10lnqDuqfxyE0sg099sE4MCidYDS8i6u9sFVgjwaQIw3HlS ko9H4p9JQLga71dpYwn1+S1Ftea+ojDfEg9/8f99AXqvHX+vRwF1/YM4eDfAjbZgmCb9 5jbgZ3s4RbfNzTFI35Z/NMzGUTriVxAaMiHYHe8c28uDvVkaRdf925aW2CvQUdKzeZq+ ALNA== X-Gm-Message-State: APf1xPDGknLWDkAhyFnGtSxGeM3k6WuPX4G4+DMskvaAGpVzySyKjb1J X64ZbZgcT1RoBQXOKwX5ul+4uUHSCHc= X-Google-Smtp-Source: AH8x224v1AgtBf69tGam9+HE5jyA5AU5AayVIdDNt807Zta0T4ifuLLP9/OILOR3HZ35GTIqVWJ4zQ== X-Received: by 10.28.135.208 with SMTP id j199mr5074138wmd.151.1518796340054; Fri, 16 Feb 2018 07:52:20 -0800 (PST) Received: from localhost.localdomain (193.164.125.18.ip.redstone-isp.net. [193.164.125.18]) by smtp.gmail.com with ESMTPSA id 56sm27207912wrt.23.2018.02.16.07.52.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 16 Feb 2018 07:52:19 -0800 (PST) From: Alex Kiernan To: u-boot@lists.denx.de Date: Fri, 16 Feb 2018 15:50:41 +0000 Message-Id: <1518796248-28270-5-git-send-email-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518796248-28270-1-git-send-email-alex.kiernan@gmail.com> References: <1518796248-28270-1-git-send-email-alex.kiernan@gmail.com> Cc: Thomas Petazzoni , Martyn Welch , Joe Hershberger , Roger Meier , Maxime Ripard , Chris Packham , Ian Ray Subject: [U-Boot] [PATCH v3 04/11] Convert CONFIG_BOOTCOUNT_ENV to Kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This converts the following to Kconfig: CONFIG_BOOTCOUNT_ENV Signed-off-by: Alex Kiernan Reviewed-by: Lukasz Majewski --- 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