From patchwork Thu Feb 15 13:55:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 873840 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="MzSlE6Sw"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zhybM5XJ1z9s7f for ; Fri, 16 Feb 2018 01:00:31 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 1D07DC2216D; Thu, 15 Feb 2018 13:59:16 +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_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 67FB9C220DB; Thu, 15 Feb 2018 13:57:27 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9116BC21C29; Thu, 15 Feb 2018 13:56:36 +0000 (UTC) Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by lists.denx.de (Postfix) with ESMTPS id EAA07C22108 for ; Thu, 15 Feb 2018 13:56:32 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id x21so1023948wmh.0 for ; Thu, 15 Feb 2018 05:56:32 -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=SijtQwECIMW2CibwGaPxynEPhIEfIeX1R2Unh46hLcg=; b=MzSlE6SwFU0bD/crwnOf99Qkq0rbXkHqCMF8EtUgJjkrYqwMqDYWLWBVx3hg2xAjaM CMkOQBo4JcpxRC9ZmS4S+w64ltFvWinzcj6vkKYkAdOsOEEfXziC8lSeeRUe7WJFJZ04 lUgjIm6kR0pYT8wZCQOsikkDxZ3sC0R9153Wfgypfj7W5R18KNMocuINXe7uX1dFQNJy fspjZP/lpQSn6xBdroy+doSM7z2Rntne8mVdVH102MkM0pWJAAAaWL1+5WSyNfAn7vry 9ndi0OG13e6CGmByW5XvWY+dX7XF+Krdh+0OU8wG5iUy8UtDcbzxcbySOgcref3R4AyP rBZQ== 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=SijtQwECIMW2CibwGaPxynEPhIEfIeX1R2Unh46hLcg=; b=lpI5RySGN3/lisl9xQIVZCUxcPMx6Hv84OxA7QINwwKwkmyFyxxZIVTG8PRHgvWL14 OX9TEkWdvW1suKPigweLJx9SmP6BMOVzn2egvw6rwmI+YySLOQvdsgciJHz1ExAZPhuX tcwVAv2w9r9aHl/Aq9oT1usalE62J4O+vmzM7Evy9Q/4n7q8f36MxJACgXll1mtzNKM7 UpamVphZTjgHJuLnUj95/c44nU0Zh8oouLmsZv+OtBjr2edz0l3mYhrtQvzC56NMtLto 3y2JoaqlW9KCEoR/R6VnAAWeAigun4f125/G7LDzkkrL6LkbsM5Wi8EOU4fiFHacd9FI mrqw== X-Gm-Message-State: APf1xPA/Uo+C7vY0Gn5DAp+/CtC5NPWMDC3tnIEBO/aVeeQbMZy7I/hh datUnjjqEtHrO8UiEzoB64O1uVRv6Bk= X-Google-Smtp-Source: AH8x227jEbxpyLFPtPS/uduNj9y756EXv3CU9kBgDE2FzzUI/ooKR53fXtIcsg3js0qNjdKEHyJBWw== X-Received: by 10.28.249.18 with SMTP id x18mr2168701wmh.49.1518702992233; Thu, 15 Feb 2018 05:56:32 -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 i33sm15184811wri.70.2018.02.15.05.56.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 15 Feb 2018 05:56:31 -0800 (PST) From: Alex Kiernan To: u-boot@lists.denx.de Date: Thu, 15 Feb 2018 13:55:17 +0000 Message-Id: <1518702926-18874-5-git-send-email-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.7.4 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: Martyn Welch , Ian Ray , Roger Meier , Chris Packham , Maxime Ripard Subject: [U-Boot] [PATCH v2 04/13] 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 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 cc341ac..da77484 100644 --- a/README +++ b/README @@ -714,17 +714,6 @@ The following options need to be configured: 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 When this option is #defined, the existence of the 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 838e8d0..ed4b6cd 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -499,6 +499,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 ccaac48..1559a29 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