From patchwork Sun Feb 11 12:06:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 871753 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="n9VB4wSF"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zfSGk2LCwz9ryT for ; Sun, 11 Feb 2018 23:07:26 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id C6B55C21F16; Sun, 11 Feb 2018 12:07:22 +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 F277BC21DA3; Sun, 11 Feb 2018 12:07:19 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 92867C21DA3; Sun, 11 Feb 2018 12:07:18 +0000 (UTC) Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by lists.denx.de (Postfix) with ESMTPS id 3F8F2C21C51 for ; Sun, 11 Feb 2018 12:07:18 +0000 (UTC) Received: by mail-wm0-f67.google.com with SMTP id x4so4923365wmc.0 for ; Sun, 11 Feb 2018 04:07:18 -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=E3+AJIXnDDlDRKD0H9dMJzR7nWXWBjytzOQlCaIDMs0=; b=n9VB4wSFb/NLESAYgB2bV0uRuvuypCY3KPg5DPpu6caiaa6NSPM6S3mjGI5vHG/Gjq Jj3RImq7hqXeLxYNFMA2HuV9+BCHUvfXPMmxaX8b10vbJ/ItHKXtYx1LfD1KzmKMa0ze jqlHG5kLShvYjCRiGgPV//xCWXY9h9UGH1mFxAUVeJ7wB9q7VuWt+/uXP6HNk9OfJ60s Ibz+FYnytL/P9Qbn42+wrej7vcID4pMANDC90dFhjJJ1fhtPJt2Loczs8/Dtw73UsCW3 P8hfYsXd4y+CDfO2R5zo1kTBj1MF7E/c4RTqWzUB4YjwfjATRfptOaSHuMfIE8ymYT8y mYKw== 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=E3+AJIXnDDlDRKD0H9dMJzR7nWXWBjytzOQlCaIDMs0=; b=nzbujhBS/z8R2+Z3QkAHMik/Tk/NNQkpXXTyg5MmMIEDcBJPHFBcVB10iXo6bf72Hc tnJGVYbX8vF2JYqfPO4pXCTIeWV0UUrTH28jYCKKUsMwhZQtoYridgCkySm/RdnwFiKJ qb04Hc69uTe69Ldb2LoIdDU5YSQ4AZfYs2fp1OC2+2JGrIxuuPYoOnevUQgSRtLfVkBB MpnEibqPWlpudkOVOgHxqYVAqt1h0NQ6wffDsVnC4M74sPKuhAiJobzMvrKxcqfkbznM dLLeyOJ/WYqaYTO9aHcg7Aip0PANEAqs3h9faLd5NGzlS26OqQsXZTGqRfjdTZVE4JGV AitA== X-Gm-Message-State: APf1xPCyvrXNWNHdBU0MVWpqQi1KF9fLfibZzTP+C9Bizvnau2pWwdvv FKjGRMvKCcRa4Z39DpMldc0r4phZSxA= X-Google-Smtp-Source: AH8x227TEXevOclNCIlaNF19b7ZDN2U7jiVFXPKOdqhVzsZWPP84kL9MgYMfeQaKNX1a/xGTbmEwSA== X-Received: by 10.28.138.85 with SMTP id m82mr1219992wmd.56.1518350837556; Sun, 11 Feb 2018 04:07:17 -0800 (PST) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id k7sm8062459wrg.68.2018.02.11.04.07.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 11 Feb 2018 04:07:17 -0800 (PST) From: Alex Kiernan To: u-boot@lists.denx.de Date: Sun, 11 Feb 2018 12:06:46 +0000 Message-Id: <1518350813-3418-2-git-send-email-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518350813-3418-1-git-send-email-alex.kiernan@gmail.com> References: <1518350813-3418-1-git-send-email-alex.kiernan@gmail.com> Cc: Ian Ray , =?utf-8?q?Antti_M=C3=A4entausta?= , Martyn Welch Subject: [U-Boot] [PATCH 1/8] Merge CONFIG_BOOTCOUNT and CONFIG_BOOTCOUNT_LIMIT 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" CONFIG_BOOTCOUNT was only used in mx53ppd, merge it with CONFIG_BOOTCOUNT_LIMIT Signed-off-by: Alex Kiernan Reviewed-by: Lukasz Majewski Reviewed-by: Ian Ray --- configs/mx53ppd_defconfig | 1 - drivers/bootcount/Kconfig | 9 +-------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/configs/mx53ppd_defconfig b/configs/mx53ppd_defconfig index b83cf72..d6a1c6a 100644 --- a/configs/mx53ppd_defconfig +++ b/configs/mx53ppd_defconfig @@ -20,7 +20,6 @@ CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y -CONFIG_BOOTCOUNT=y CONFIG_BOOTCOUNT_LIMIT=y CONFIG_BOOTCOUNT_EXT=y CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="0:5" diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig index d82289f..da2ccab 100644 --- a/drivers/bootcount/Kconfig +++ b/drivers/bootcount/Kconfig @@ -4,13 +4,6 @@ menu "Boot count support" -config BOOTCOUNT - bool "Enable Boot count support" - help - Enable boot count support, which provides the ability to store the - number of times the board has booted on a number of different - persistent storage mediums. - config BOOTCOUNT_LIMIT bool "Enable support for checking boot count limit" help @@ -23,7 +16,7 @@ config SYS_BOOTCOUNT_SINGLEWORD This option enables packing boot count magic value and boot count into single word (32 bits). -if BOOTCOUNT +if BOOTCOUNT_LIMIT config BOOTCOUNT_EXT bool "Boot counter on EXT filesystem" From patchwork Sun Feb 11 12:06:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 871754 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="gIKq135z"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zfSHw5RDyz9ryT for ; Sun, 11 Feb 2018 23:08:28 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 6BE24C21E65; Sun, 11 Feb 2018 12:07:41 +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 99BDEC21F04; Sun, 11 Feb 2018 12:07:20 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 91FB3C21DA3; Sun, 11 Feb 2018 12:07:19 +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 3DF9BC21C51 for ; Sun, 11 Feb 2018 12:07:19 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id g1so4932242wmg.2 for ; Sun, 11 Feb 2018 04:07:19 -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=0BNeUz7PKW0FdvUTpFZhPVP6jC8TEYE42UniSA0PftM=; b=gIKq135zWHNFWhUZp3wQF+f1SL2dk2R0t/EsdnuIICbbESYw5p0bANO0ubbWeHYgqc 9D3vh+oxzInAOCYgw480PIhZGm9hU17V1dU2z732zRPevWq/lGkhytLR7XhxpR/D6yU9 SnzwdYHG2OviBJXEly1f199+32K0QNj0mdKWz0bq5X9hp5QhNQSvOnfKwoaP7HSj3Ysu jYGX8evs+GOQbDNP2yZxxn2+PuXGU4fQBcUcJj/OFroJV0DLF+bNc8xkDPK+ps9a0cdN LxLBW31eTcUUVeQTbVq9qwzpouRNa1aGenIjM9n9z9hcHDH44zxDB042Adu0QjxeRSL6 BqGA== 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=0BNeUz7PKW0FdvUTpFZhPVP6jC8TEYE42UniSA0PftM=; b=K9uopI4xCNLrBw1qoVGvPPDsyI6UK5vo6w1vk5LGmqztFJjk83dsHXA/KjwGkyo3E0 2hEg82PFAebeFgxp+HHO3Pfspl0IbuEmc+gwG2xYbgWaDlBnWwk+EW6zrKG1tiOYzXEh BrXChHyNXVU/hM4XogDk0mzsuxvv4L9I3EtDDhsHZHPem4iGcGh/dhJW7ldEnOjM/nR/ MtYZMDZSaaT9kJxgD051X76e3+tz8c0mrdsqtMhI3Vy6fkZQ3t5mUR/sMxJQrETxVneF 9Yf1An/ukysDM8nsZqZs28Q9IzcyrKCbdgW9/jrulMwyu34qmoJsRmY5/kubycCAPolb FQGA== X-Gm-Message-State: APf1xPAtDdftYYIe99hl4e5vhPtdmiluvnPbVWewOpMwCcw8X837Kh3W Job1PuiMkalzSBX6B08jNHLok0L1zqo= X-Google-Smtp-Source: AH8x224/RU6HVm+nfIff1zn/nf5k0yqX6iWsWNZbUnSkpvmwSxs9FVaz5UIbHlnjZN+rsF7AzPjhSg== X-Received: by 10.28.135.142 with SMTP id j136mr1280948wmd.33.1518350838636; Sun, 11 Feb 2018 04:07:18 -0800 (PST) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id k7sm8062459wrg.68.2018.02.11.04.07.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 11 Feb 2018 04:07:18 -0800 (PST) From: Alex Kiernan To: u-boot@lists.denx.de Date: Sun, 11 Feb 2018 12:06:47 +0000 Message-Id: <1518350813-3418-3-git-send-email-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518350813-3418-1-git-send-email-alex.kiernan@gmail.com> References: <1518350813-3418-1-git-send-email-alex.kiernan@gmail.com> Cc: Martyn Welch , Ian Ray Subject: [U-Boot] [PATCH 2/8] Prepare for multiple bootcount drivers 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" Signed-off-by: Alex Kiernan Reviewed-by: Lukasz Majewski --- drivers/bootcount/Kconfig | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig index da2ccab..26fec89 100644 --- a/drivers/bootcount/Kconfig +++ b/drivers/bootcount/Kconfig @@ -2,29 +2,30 @@ # Boot count configuration # -menu "Boot count support" - -config BOOTCOUNT_LIMIT +menuconfig BOOTCOUNT_LIMIT bool "Enable support for checking boot count limit" help Enable checking for exceeding the boot count limit. More information: http://www.denx.de/wiki/DULG/UBootBootCountLimit -config SYS_BOOTCOUNT_SINGLEWORD - bool "Use single word to pack boot count and magic value" - help - This option enables packing boot count magic value and boot count - into single word (32 bits). - if BOOTCOUNT_LIMIT +choice + prompt "Boot count device" + config BOOTCOUNT_EXT bool "Boot counter on EXT filesystem" help Add support for maintaining boot count in a file on an EXT filesystem. -if BOOTCOUNT_EXT +endchoice + +config SYS_BOOTCOUNT_SINGLEWORD + bool "Use single word to pack boot count and magic value" + help + This option enables packing boot count magic value and boot count + into single word (32 bits). config SYS_BOOTCOUNT_EXT_INTERFACE string "Interface on which to find boot counter EXT filesystem" @@ -57,7 +58,3 @@ config SYS_BOOTCOUNT_ADDR Set the address used for reading and writing the boot counter. endif - -endif - -endmenu From patchwork Sun Feb 11 12:06:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 871760 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="i8KlzaJt"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zfSLx1HClz9sRW for ; Sun, 11 Feb 2018 23:11:05 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id B96C5C21F47; Sun, 11 Feb 2018 12:08:38 +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 53174C21F29; Sun, 11 Feb 2018 12:07:38 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 79659C21DE8; Sun, 11 Feb 2018 12:07:24 +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 97FB5C21C51 for ; Sun, 11 Feb 2018 12:07:20 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id 143so4920401wma.5 for ; Sun, 11 Feb 2018 04:07: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=JDa9uvcObzo7KOOwZhx/PdVC3k1qhrbk20ENOl/Fpto=; b=i8KlzaJtltnwCuTparv2x0PMkqiYjZJIzgkpRw7pabq/9lHhHZDcx5OatOL+2xyFw8 csDHONdNfr0j5rxisjavHI2ypAp3vNEzsZHKOmwYMqG+9mWOVKPQtqecHCHL9ZAaF0EK jvg/TQcaCT5phBBA2MU5knR+GlRm3fd9z0bTzL0KB1Xo9goAEBEDIsIAgdJcoLizwMR2 p/KLHgZPpwJslLdWcxBkfFVQePCul0wXHuxg0Z6jSfBuQxJgy9hYbA4w+LzTWFGbOXS5 SG4mPfaDeLBF0Hvfx26oAw8305eYCus8RpaDthiXzU19CDPT9y/tNujiYhKQ1clM38en Q4PA== 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=JDa9uvcObzo7KOOwZhx/PdVC3k1qhrbk20ENOl/Fpto=; b=I4ygwlV7wyGvzV5CNfePFoCLvqrrP/abd0BssKYn8NuYsp0r3sVeAEn+6jujkqBjzK ujWgV/ykE5Fy55NCN4KShNy/JpHxMM6PjeE8CcY0UgO8ZaFXc1mT4oBXP8iHmxjLXTbn TXa5YR+V5Vkd2nqTfz07R1v/ZIkCJy8f/CVllBJrhOVSRXSWDtsC0opczbUTvSY3FuXs AV5uwtBBtvhGYgqjV2MrSXcnmx8OV9Dowp2v5B7lobObBc4Noa5mB7Os/WZPd+WctUcx iXWioqmsxDTRT/H+zWyd858vCMaBk5r53uizb2hVSVgWoZzDmUuM3y1v9FYTPeMCQLq/ hSEQ== X-Gm-Message-State: APf1xPDthXnv9xnzNOQYzyRkpu3n9NEZ23j09n6hohwwhC7JtvH7NEkT ZbOFKLTdzI/eDY/+TEIejZ0B2oE1e/s= X-Google-Smtp-Source: AH8x226rXxPwUKj5GrW71lrDi98nHtF3wbKJwXzqnC8fPEC83XWMqwh0vGdSZE5qYw8cUJ95QLqy7g== X-Received: by 10.28.202.5 with SMTP id a5mr1036637wmg.103.1518350839960; Sun, 11 Feb 2018 04:07:19 -0800 (PST) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id k7sm8062459wrg.68.2018.02.11.04.07.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 11 Feb 2018 04:07:19 -0800 (PST) From: Alex Kiernan To: u-boot@lists.denx.de Date: Sun, 11 Feb 2018 12:06:48 +0000 Message-Id: <1518350813-3418-4-git-send-email-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518350813-3418-1-git-send-email-alex.kiernan@gmail.com> References: <1518350813-3418-1-git-send-email-alex.kiernan@gmail.com> Cc: Martyn Welch , Gilles Gameiro , Ian Ray , Chris Packham , Marek Vasut Subject: [U-Boot] [PATCH 3/8] Convert CONFIG_BOOTCOUNT_AM33XX 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_AM33XX Signed-off-by: Alex Kiernan Reviewed-by: Lukasz Majewski Reviewed-by: Hannes Schmelzer Acked-by: Hannes Schmelzer --- drivers/bootcount/Kconfig | 9 +++++++++ drivers/bootcount/Makefile | 1 - include/configs/am335x_evm.h | 1 - include/configs/am335x_sl50.h | 1 - include/configs/baltos.h | 2 -- include/configs/bav335x.h | 1 - include/configs/brppt1.h | 1 - include/configs/chiliboard.h | 1 - scripts/config_whitelist.txt | 1 - 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig index 26fec89..e905295 100644 --- a/drivers/bootcount/Kconfig +++ b/drivers/bootcount/Kconfig @@ -12,6 +12,7 @@ if BOOTCOUNT_LIMIT choice prompt "Boot count device" + default BOOTCOUNT_AM33XX if AM33XX || SOC_DA8XX config BOOTCOUNT_EXT bool "Boot counter on EXT filesystem" @@ -19,6 +20,14 @@ config BOOTCOUNT_EXT Add support for maintaining boot count in a file on an EXT filesystem. +config BOOTCOUNT_AM33XX + bool "Boot counter in AM33XX RTC IP block" + depends on AM33XX || SOC_DA8XX + help + A bootcount driver for the RTC IP block found on many TI platforms. + 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. + endchoice config SYS_BOOTCOUNT_SINGLEWORD diff --git a/drivers/bootcount/Makefile b/drivers/bootcount/Makefile index 45445d2..62bf55e 100644 --- a/drivers/bootcount/Makefile +++ b/drivers/bootcount/Makefile @@ -4,7 +4,6 @@ obj-y += bootcount.o obj-$(CONFIG_AT91SAM9XE) += bootcount_at91.o -obj-$(CONFIG_SOC_DA8XX) += bootcount_davinci.o obj-$(CONFIG_BOOTCOUNT_AM33XX) += bootcount_davinci.o obj-$(CONFIG_BOOTCOUNT_RAM) += bootcount_ram.o obj-$(CONFIG_BOOTCOUNT_ENV) += bootcount_env.o diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 03791de..fff463e 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -177,7 +177,6 @@ /* SPL */ #ifndef CONFIG_NOR_BOOT /* Bootcount using the RTC block */ -#define CONFIG_BOOTCOUNT_AM33XX #define CONFIG_SYS_BOOTCOUNT_BE /* USB gadget RNDIS */ diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h index 1cb3578..4bcbaee 100644 --- a/include/configs/am335x_sl50.h +++ b/include/configs/am335x_sl50.h @@ -74,7 +74,6 @@ /* SPL */ /* Bootcount using the RTC block */ -#define CONFIG_BOOTCOUNT_AM33XX #define CONFIG_SYS_BOOTCOUNT_BE #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 440dbf5..10979c7 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -230,8 +230,6 @@ /* SPL */ #ifndef CONFIG_NOR_BOOT -/* Bootcount using the RTC block */ -#define CONFIG_BOOTCOUNT_AM33XX /* USB gadget RNDIS */ diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index 7bbb7d1..27cb8f6 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -339,7 +339,6 @@ DEFAULT_LINUX_BOOT_ENV \ /* SPL */ #ifndef CONFIG_NOR_BOOT /* Bootcount using the RTC block */ -#define CONFIG_BOOTCOUNT_AM33XX #define CONFIG_SYS_BOOTCOUNT_BE /* USB gadget RNDIS */ diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index fb2845f..30ea2d2 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -22,7 +22,6 @@ /* Bootcount using the RTC block */ #define CONFIG_SYS_BOOTCOUNT_ADDR 0x44E3E000 -#define CONFIG_BOOTCOUNT_AM33XX /* memory */ #define CONFIG_SYS_MALLOC_LEN (5 * 1024 * 1024) diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h index 234cd6a..92e0479 100644 --- a/include/configs/chiliboard.h +++ b/include/configs/chiliboard.h @@ -123,7 +123,6 @@ /* SPL */ /* Bootcount using the RTC block */ -#define CONFIG_BOOTCOUNT_AM33XX #define CONFIG_SYS_BOOTCOUNT_BE /* NAND: device related configs */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 1be3f23..46d9d5c 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_AM33XX CONFIG_BOOTCOUNT_ENV CONFIG_BOOTCOUNT_I2C CONFIG_BOOTCOUNT_LIMIT From patchwork Sun Feb 11 12:06:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 871758 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="nOtQ/d1J"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zfSLX0Kbmz9ryT for ; Sun, 11 Feb 2018 23:10:43 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 2B3DDC21EE5; Sun, 11 Feb 2018 12:08:54 +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 09030C21F2B; Sun, 11 Feb 2018 12:07:40 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9F651C21F44; Sun, 11 Feb 2018 12:07:26 +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 10089C21F1D for ; Sun, 11 Feb 2018 12:07:22 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id b21so5065937wme.4 for ; Sun, 11 Feb 2018 04:07:22 -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=1j4VdpzIc0iK4e61BGqsQx3m4kSOsVz4nCDJXX9mkSU=; b=nOtQ/d1JTkbxdLaWUiImn1k3JEUNeuZwzKscDEZ7NBlb80SD02JYeR4+0X6/ljHIQJ lQ8cLGSPaN//IKU4vmmiezPicCgFyiKUO0rWfKg0q3G8HWRzz+uxjzVNl0+nuJD1zF61 H4AU80kJQMLgNkL8i4zNLaKh1lfBwgWhJe2lcl7FISZyrGH/SuxwXe0TXGwL4cquud8B vJfqTUW2r/spfF3H9MyivGd6RLMxLFIjqjhDbi2hCqhynrqfR2VtRaLElfm2y+aE1Hcx RCOxj8s1e/dpOI3I0Z0fkmEBBzMWpsz/sK1nHb5teCTkx/CCkum0zmYBFDOLa5I1OsUi IIXg== 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=1j4VdpzIc0iK4e61BGqsQx3m4kSOsVz4nCDJXX9mkSU=; b=JncOyzy0kOPjkWMFKlBhsYvkxsafXOg413C6rNBuea0q2W4EmfOkRifO/M7xm+Fivq b/81E6B3XTZOOJDK2BeWrhwNUYvwRrYGNkASthzObr6OZbb6KRjJLfGheUipEBl/6cYD rmbdNTMpUNf+kB3/HvOMFJTNB2YV5dCD1loVs2qLFXnj3GMr4S0cJmnD3i3b2J02Kh/6 xigCRxkSGk/wjl4qpDNeS3QZ/yNuHrAbgJ+LCUp3YM7WbRP7QuWPMeMUkIFOXm3qFYqI 7CmHn1qZuOdvMw4K9qE07BdzfGJKewWaDhlxP3k4QeyPvrkyJDr/Pu/YwPAbiQMG4Vxn hUSw== X-Gm-Message-State: APf1xPBunWs8VMgbmiGMoBk/GFZdPR+x1p82vCQFysC0nZOXpuYvuGIw pp7tBJ64JbT0l1qFtBHBDNJbnQ0InH0= X-Google-Smtp-Source: AH8x227T5DeUiKT2NV/VPIXQgFhyzg8f23D4uYnxoQDR24ckx2bxOqhf+SDgmHz/z4gDqCq1B3tH1w== X-Received: by 10.28.111.28 with SMTP id k28mr1052879wmc.54.1518350841394; Sun, 11 Feb 2018 04:07:21 -0800 (PST) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id k7sm8062459wrg.68.2018.02.11.04.07.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 11 Feb 2018 04:07:20 -0800 (PST) From: Alex Kiernan To: u-boot@lists.denx.de Date: Sun, 11 Feb 2018 12:06:49 +0000 Message-Id: <1518350813-3418-5-git-send-email-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518350813-3418-1-git-send-email-alex.kiernan@gmail.com> References: <1518350813-3418-1-git-send-email-alex.kiernan@gmail.com> Cc: Thomas Petazzoni , Martyn Welch , Joe Hershberger , Chris Packham , Roger Meier , Maxime Ripard , Ian Ray , Marek Vasut Subject: [U-Boot] [PATCH 4/8] 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 --- 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 f51f670..0581b58 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 eb4b1f6..a7b427f 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -500,6 +500,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 46d9d5c..0fd4ad6 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_LIMIT CONFIG_BOOTCOUNT_RAM From patchwork Sun Feb 11 12:06:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 871762 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="F2woJLVd"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zfSNS115lz9ryT for ; Sun, 11 Feb 2018 23:12:20 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 43235C21F64; Sun, 11 Feb 2018 12:08:18 +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 4F390C21F47; Sun, 11 Feb 2018 12:07:33 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id BA376C21F2B; Sun, 11 Feb 2018 12:07:27 +0000 (UTC) Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by lists.denx.de (Postfix) with ESMTPS id 73C4BC21F3C for ; Sun, 11 Feb 2018 12:07:23 +0000 (UTC) Received: by mail-wm0-f67.google.com with SMTP id i186so4920150wmi.4 for ; Sun, 11 Feb 2018 04:07:23 -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=wuhrXSTiD/ERSxIH1E0OaAAY/xKh7R85a2sGi8e4ozw=; b=F2woJLVdiSChfIQ1vRAWiSTXGSlafEXvKeqMnpQrPreduEthLi44aYP6xMccI7xpf6 EoUMihMhjTL5ArobG0X+3kK0eIbdAZsGpTI6C3c0GidAoqAgos/sNYZbe0MaNV5CPXe6 pM3wRbdCJom6uiH92WyeZNE8patcAyxWk4uYX3Lb4x1sURV6K2CJ4yWMyhJDelAmaQI5 CJlVx6Whl5vKTomcisDawgUtlSoc460vrTB/fxCdy/BpU9+dTDNytWsvStopK1U6hVZE UsjTOIoi7C9dtvENXyZXS9Yyy8QOqvzCNEmjtgJz/BpHzwn5idy8tWx+3bPNjmZs0wOj FgTw== 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=wuhrXSTiD/ERSxIH1E0OaAAY/xKh7R85a2sGi8e4ozw=; b=EOZfKzqAjU2GJBFOYFPKumfQ0fwpg5kRXUnP4c/bHuC38oAP00PLsMuFcOSWXy24MF UX9UX45GL6UIbBFdXhv6X9pvel+z0bDyRNZRXg8b9hIg8ZGCQQkg1VvMQkRsugY8a/di klRhUQMY6d55Haq9Mwx/ohoa9u4sWN2Jqp+/+3vz/ikkhg6eYqLtbZMPIx6VAjfkVbi3 tYxZvpXWtZs7HoKpUN+Jf5ciXdMUVwH9KO8AxhwYHKqUWYV1whYsZRwH4ix+72fLtrt8 wvXZVrcdeJGRnaE9iHlBjl7t6jA7JHUkpFTIwLQ3EoxJ4zIm8NKtFZSz3ORzEzQJmdG5 zF4w== X-Gm-Message-State: APf1xPD17dMab1jhkNmEZ6LL1p3P2e96Qiv7G6orGMf3NsYH6O1aPwEE apXWuT7Np+mqPDArTQMn13Suv/sQCGE= X-Google-Smtp-Source: AH8x224rSKgsORCw/KfxF0bFH2MThBU+ZHezBh7LDXlFllZ6W/efv3WWgpQRfDMP65Nc/ll3AGv48w== X-Received: by 10.28.213.129 with SMTP id m123mr1039493wmg.91.1518350842760; Sun, 11 Feb 2018 04:07:22 -0800 (PST) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id k7sm8062459wrg.68.2018.02.11.04.07.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 11 Feb 2018 04:07:22 -0800 (PST) From: Alex Kiernan To: u-boot@lists.denx.de Date: Sun, 11 Feb 2018 12:06:50 +0000 Message-Id: <1518350813-3418-6-git-send-email-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518350813-3418-1-git-send-email-alex.kiernan@gmail.com> References: <1518350813-3418-1-git-send-email-alex.kiernan@gmail.com> Cc: Valentin Longchamp , Martyn Welch , Chris Packham , Stefan Roese , Ian Ray , Marek Vasut Subject: [U-Boot] [PATCH 5/8] Convert CONFIG_BOOTCOUNT_RAM 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_RAM Signed-off-by: Alex Kiernan Reviewed-by: Lukasz Majewski --- README | 2 -- configs/km_kirkwood_128m16_defconfig | 1 + configs/km_kirkwood_defconfig | 1 + configs/km_kirkwood_pci_defconfig | 1 + configs/kmcoge5un_defconfig | 1 + configs/kmnusa_defconfig | 1 + configs/kmsugp1_defconfig | 1 + configs/kmsuv31_defconfig | 1 + configs/mgcoge3un_defconfig | 1 + configs/portl2_defconfig | 1 + configs/theadorable_debug_defconfig | 1 + drivers/bootcount/Kconfig | 6 ++++++ include/configs/km/km_arm.h | 2 -- include/configs/theadorable.h | 1 - scripts/config_whitelist.txt | 1 - 15 files changed, 16 insertions(+), 6 deletions(-) diff --git a/README b/README index 0581b58..20637e0 100644 --- a/README +++ b/README @@ -2321,8 +2321,6 @@ The following options need to be configured: enable special bootcounter support on at91sam9xe based boards. CONFIG_SOC_DA8XX enable special bootcounter support on da850 based boards. - CONFIG_BOOTCOUNT_RAM - enable support for the bootcounter in RAM CONFIG_BOOTCOUNT_I2C enable support for the bootcounter on an i2c (like RTC) device. CONFIG_SYS_I2C_RTC_ADDR = i2c chip address diff --git a/configs/km_kirkwood_128m16_defconfig b/configs/km_kirkwood_128m16_defconfig index 075b4b3..a257275 100644 --- a/configs/km_kirkwood_128m16_defconfig +++ b/configs/km_kirkwood_128m16_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_ENV_IS_IN_EEPROM=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_RAM=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/km_kirkwood_defconfig b/configs/km_kirkwood_defconfig index 4ed097d..0d8c642 100644 --- a/configs/km_kirkwood_defconfig +++ b/configs/km_kirkwood_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_ENV_IS_IN_EEPROM=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_RAM=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/km_kirkwood_pci_defconfig b/configs/km_kirkwood_pci_defconfig index b47c1ad..112344d 100644 --- a/configs/km_kirkwood_pci_defconfig +++ b/configs/km_kirkwood_pci_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_ENV_IS_IN_EEPROM=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_RAM=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/kmcoge5un_defconfig b/configs/kmcoge5un_defconfig index 96c4ad0..3db48bc 100644 --- a/configs/kmcoge5un_defconfig +++ b/configs/kmcoge5un_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_RAM=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/kmnusa_defconfig b/configs/kmnusa_defconfig index fec4017..b602932 100644 --- a/configs/kmnusa_defconfig +++ b/configs/kmnusa_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_RAM=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/kmsugp1_defconfig b/configs/kmsugp1_defconfig index d1f1900..91bed21 100644 --- a/configs/kmsugp1_defconfig +++ b/configs/kmsugp1_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_RAM=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/kmsuv31_defconfig b/configs/kmsuv31_defconfig index 9d4fbfe..a920664 100644 --- a/configs/kmsuv31_defconfig +++ b/configs/kmsuv31_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_RAM=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/mgcoge3un_defconfig b/configs/mgcoge3un_defconfig index 250513d..6dff78b 100644 --- a/configs/mgcoge3un_defconfig +++ b/configs/mgcoge3un_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_ENV_IS_IN_EEPROM=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_RAM=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/portl2_defconfig b/configs/portl2_defconfig index 857dec1..4ca0094 100644 --- a/configs/portl2_defconfig +++ b/configs/portl2_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_ENV_IS_IN_EEPROM=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_RAM=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/theadorable_debug_defconfig b/configs/theadorable_debug_defconfig index b62645e..43c6e2c 100644 --- a/configs/theadorable_debug_defconfig +++ b/configs/theadorable_debug_defconfig @@ -44,6 +44,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_OF_TRANSLATE=y CONFIG_SATA_MV=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_RAM=y CONFIG_FPGA_ALTERA=y CONFIG_DM_GPIO=y # CONFIG_MMC is not set diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig index 40a0755..eabfd13 100644 --- a/drivers/bootcount/Kconfig +++ b/drivers/bootcount/Kconfig @@ -40,6 +40,12 @@ config BOOTCOUNT_ENV So the Userspace Application must set the "upgrade_available" and "bootcount" variable to 0, if a boot was successfully. +config BOOTCOUNT_RAM + bool "Boot counter in RAM" + help + Store the bootcount in DRAM protected against against bit errors + due to short power loss or holding a system in RESET. + endchoice config SYS_BOOTCOUNT_SINGLEWORD diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index ed58d1e..ca23952 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -277,8 +277,6 @@ int get_scl(void); #define CONFIG_KM_RESERVED_PRAM 0x801000 /* address for the bootcount (taken from end of RAM) */ #define BOOTCOUNT_ADDR (CONFIG_KM_RESERVED_PRAM) -/* Use generic bootcount RAM driver */ -#define CONFIG_BOOTCOUNT_RAM /* enable POST tests */ #define CONFIG_POST (CONFIG_SYS_POST_MEM_REGIONS) diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index ec9dc2e..a3b5c87 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -83,7 +83,6 @@ /* * Bootcounter */ -#define CONFIG_BOOTCOUNT_RAM /* Max size of RAM minus BOOTCOUNT_ADDR is the bootcounter address */ #define BOOTCOUNT_ADDR 0x1000 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 0fd4ad6..487c790 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -150,7 +150,6 @@ CONFIG_BOOTBLOCK CONFIG_BOOTCOUNT_ALEN CONFIG_BOOTCOUNT_I2C CONFIG_BOOTCOUNT_LIMIT -CONFIG_BOOTCOUNT_RAM CONFIG_BOOTFILE CONFIG_BOOTMAPSZ CONFIG_BOOTMODE From patchwork Sun Feb 11 12:06:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 871756 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="G1ujcT+t"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zfSKX4116z9sDB for ; Sun, 11 Feb 2018 23:09:51 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 67092C21F42; Sun, 11 Feb 2018 12:07:58 +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 19D4BC21F16; Sun, 11 Feb 2018 12:07:30 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D74F6C21EE9; Sun, 11 Feb 2018 12:07:28 +0000 (UTC) Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by lists.denx.de (Postfix) with ESMTPS id A57AEC21E1D for ; Sun, 11 Feb 2018 12:07:24 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id f71so4950219wmf.0 for ; Sun, 11 Feb 2018 04:07:24 -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=GwwepuCv/3BQPxxdIZTQIcwWfSVw7cVeuK/uEeSFPMo=; b=G1ujcT+t2VYA0MZnq9/q4Zo+pwsHp5DbzRVi+Kb/8Mks3GaNciPh9JERY9PQXEJeo/ 7U3+yOdUPgZnNsFcJRO+JlCmwQb8eicRPPRm5MCux8z/OBpPCwUdguu+pE4bLsANeXDE eQviTvZhqA5nVE94iVszrvpeYDmxv+kkSL2aw1Ob+QWkCJ/CxXlZ5p/VkN1xOuULc4Ky gwiMRJ756w2ixf2luhbsOCjulNzM8Vd0b+7TQ53d5cvEd5XYQJ0WXjeDJkketnZWSd/v oUjLpxqvHISgEAnyY58lFF20VHWyD09ajDpcWyn5/hZCQGtaOvqyAYqfTSMUbvXh8qHY 4sZA== 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=GwwepuCv/3BQPxxdIZTQIcwWfSVw7cVeuK/uEeSFPMo=; b=CQY9sRIG1GfMAxCT3BdJCLh9Pbad5BUW6eu0EvHfjLPVfN/DWH/c/MeILMxK4b/FcK 7Pr+/f+WAwUA3UTJMlCRALAD9vHn5zWJJbGfqRU63V2+EUpa0R3v7Z0PZTB7pc/6NKjw sanPge025DZTvCFEjVb0/0F5nnZwl1jl4uJ/A1bKr4GMfRs1fsKMUNPJ/rCH05sz2ZsX ak6w+2s8X1hXCONS7pZEN3Q+lLOaxGw77Hc+VDTFoa2CzwxleagTG6kGOTc9gjkNDszC JGqpWqeKoXj0NF2UnnDurXYViC3zBkGgrmN8u9Wj+nxB80OuR3w9h7Q/A4Wp6Z8jbl7k OYzg== X-Gm-Message-State: APf1xPB+J1unOwzrMzMl6yPlCXlERHZCYvLms6YxIzd1yJJZJDG90LKN sj+6mzmIRJTbyCwcIyxFKU8bpnaskMQ= X-Google-Smtp-Source: AH8x224Z5JJIv+1Zph/1ko6zRnW0QCef0MI1g30pKZqDPKPUjgfN0jixE1hXdw4t6fRH6IIQKrw3GA== X-Received: by 10.28.166.20 with SMTP id p20mr1085911wme.85.1518350844041; Sun, 11 Feb 2018 04:07:24 -0800 (PST) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id k7sm8062459wrg.68.2018.02.11.04.07.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 11 Feb 2018 04:07:23 -0800 (PST) From: Alex Kiernan To: u-boot@lists.denx.de Date: Sun, 11 Feb 2018 12:06:51 +0000 Message-Id: <1518350813-3418-7-git-send-email-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518350813-3418-1-git-send-email-alex.kiernan@gmail.com> References: <1518350813-3418-1-git-send-email-alex.kiernan@gmail.com> Cc: Martyn Welch , Ian Ray , Chris Packham , Marek Vasut Subject: [U-Boot] [PATCH 6/8] Convert CONFIG_BOOTCOUNT_I2C 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_I2C Signed-off-by: Alex Kiernan Reviewed-by: Lukasz Majewski --- README | 6 ------ configs/ids8313_defconfig | 1 + drivers/bootcount/Kconfig | 9 +++++++++ include/configs/ids8313.h | 1 - scripts/config_whitelist.txt | 1 - 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/README b/README index 20637e0..a7b0890 100644 --- a/README +++ b/README @@ -2321,12 +2321,6 @@ The following options need to be configured: enable special bootcounter support on at91sam9xe based boards. CONFIG_SOC_DA8XX enable special bootcounter support on da850 based boards. - CONFIG_BOOTCOUNT_I2C - enable support for the bootcounter on an i2c (like RTC) device. - 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_EXT enable support for the bootcounter in EXT filesystem CONFIG_SYS_BOOTCOUNT_ADDR = RAM address used for read diff --git a/configs/ids8313_defconfig b/configs/ids8313_defconfig index 3e67c55..eb931ce 100644 --- a/configs/ids8313_defconfig +++ b/configs/ids8313_defconfig @@ -30,6 +30,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=ff800000.flash,nand0=e1000000.flash" CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:7m(dum),768k(BOOT-BIN),128k(BOOT-ENV),128k(BOOT-REDENV);e1000000.flash:-(ubi)" CONFIG_CMD_UBI=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_I2C=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_PHYLIB=y diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig index eabfd13..8c19ae6 100644 --- a/drivers/bootcount/Kconfig +++ b/drivers/bootcount/Kconfig @@ -46,6 +46,15 @@ config BOOTCOUNT_RAM Store the bootcount in DRAM protected against against bit errors due to short power loss or holding a system in RESET. +config BOOTCOUNT_I2C + bool "Boot counter on I2C device" + help + Enable support for the bootcounter on an i2c (like RTC) device. + 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 + endchoice config SYS_BOOTCOUNT_SINGLEWORD diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index 529cbf1..fe39221 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -516,7 +516,6 @@ #define CONFIG_MTD_PARTITIONS /* bootcount support */ -#define CONFIG_BOOTCOUNT_I2C #define CONFIG_BOOTCOUNT_ALEN 1 #define CONFIG_SYS_BOOTCOUNT_ADDR 0x9 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 487c790..aa1d51f 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_I2C CONFIG_BOOTCOUNT_LIMIT CONFIG_BOOTFILE CONFIG_BOOTMAPSZ From patchwork Sun Feb 11 12:06:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 871757 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="Y29z9p03"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zfSL050glz9sDB for ; Sun, 11 Feb 2018 23:10:16 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id B9382C21F10; Sun, 11 Feb 2018 12:09:11 +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 30A23C21E1D; Sun, 11 Feb 2018 12:07:50 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 973ECC21F32; Sun, 11 Feb 2018 12:07:29 +0000 (UTC) Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by lists.denx.de (Postfix) with ESMTPS id 8B173C21F31 for ; Sun, 11 Feb 2018 12:07:25 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id r71so4964682wmd.1 for ; Sun, 11 Feb 2018 04:07:25 -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=VTTP3xr3iyckfh5ffwJHppEcyi6ORRcjur7m3gZZ2Hk=; b=Y29z9p03Z1dznoogehCl4DJzlD/d+j+r0p+tpHfLA44Bzs02robBtOhccEsZesuwST trl1f37U1lgpcx73QrfpE1lpYNJCDpFZ2+q4z5MEY3CQvgK9g8/WYHF4vCkuLHJhuS64 8Lec4Aqv6yYZgL8kyM/dcptY67lqEL4W2SfaYJENtNno85/eCA7cDPTcRlqQljq5luYB KlNUmkKbX5co//0NF0eUOYMZNTElsx7Z9PYHT1AkFxUbQIeeey6/7MSKCsP0Zpk/6xvr pkrNuYCYZWdhEgeUTga9Lh8jZkjTrAUJ60QKBIxbgfkv2GO0GGdeE2a9h1qSleLPcGG1 yZiA== 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=VTTP3xr3iyckfh5ffwJHppEcyi6ORRcjur7m3gZZ2Hk=; b=MtizWTQz/PNqbQvDgzZlbVC8K6bbx5DZemMTNhgUCeGxJX00vtKtQPQya4QSpCejtI AFacG3uirH6fvIGujlpqDjWGxKldD/vfetTAHKg4Db0DTRyCVDTXgrDotHBUvSAJ68Jd v57z+G1tZ+0JzMoCCl91PeMo5EJSFyRuGVTRpfi+qggC3ntC92O2yjBDqbqv0iBYJt66 cbUhlIh3uQcUM424AAGFHeRjcXOWnb4h/fz8qC4qBvL9OVSN9IT0BBWixopb43bvkjXk rsGlTMVLTp5EmD0DlarpmyQIUzQL/yzPMO4K1pIZhM3cLH7deHtw4CopMI+W+AkI8UCU gW4g== X-Gm-Message-State: APf1xPB68PuYS4/4JlXPRCA4oJMrk+81GnhufFQffh1gZezpqdI/BluA vrjk71tMjDdQEZrU1r7+1y8WaHBx2RM= X-Google-Smtp-Source: AH8x225mWwMFugxoo2lcHY9zcGJAd+ThLLvu/TLwh7JGiwvsbPnCfIRZeAim3MaypCkopkKazeMfOg== X-Received: by 10.28.28.139 with SMTP id c133mr1094348wmc.144.1518350844969; Sun, 11 Feb 2018 04:07:24 -0800 (PST) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id k7sm8062459wrg.68.2018.02.11.04.07.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 11 Feb 2018 04:07:24 -0800 (PST) From: Alex Kiernan To: u-boot@lists.denx.de Date: Sun, 11 Feb 2018 12:06:52 +0000 Message-Id: <1518350813-3418-8-git-send-email-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518350813-3418-1-git-send-email-alex.kiernan@gmail.com> References: <1518350813-3418-1-git-send-email-alex.kiernan@gmail.com> Cc: Martyn Welch , Ian Ray Subject: [U-Boot] [PATCH 7/8] Integrate AT91 bootcount driver 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" Integrate Boot counter for Atmel AT91SAM9XE into Kconfig Signed-off-by: Alex Kiernan Reviewed-by: Lukasz Majewski --- drivers/bootcount/Kconfig | 5 +++++ drivers/bootcount/Makefile | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig index 8c19ae6..e0d1fc2 100644 --- a/drivers/bootcount/Kconfig +++ b/drivers/bootcount/Kconfig @@ -13,6 +13,7 @@ if BOOTCOUNT_LIMIT choice prompt "Boot count device" default BOOTCOUNT_AM33XX if AM33XX || SOC_DA8XX + default BOOTCOUNT_AT91 if AT91SAM9XE config BOOTCOUNT_EXT bool "Boot counter on EXT filesystem" @@ -55,6 +56,10 @@ config BOOTCOUNT_I2C the bootcounter. CONFIG_BOOTCOUNT_ALEN = address len +config BOOTCOUNT_AT91 + bool "Boot counter for Atmel AT91SAM9XE" + depends on AT91SAM9XE + endchoice config SYS_BOOTCOUNT_SINGLEWORD diff --git a/drivers/bootcount/Makefile b/drivers/bootcount/Makefile index 62bf55e..a3658c1 100644 --- a/drivers/bootcount/Makefile +++ b/drivers/bootcount/Makefile @@ -3,7 +3,7 @@ # obj-y += bootcount.o -obj-$(CONFIG_AT91SAM9XE) += bootcount_at91.o +obj-$(CONFIG_BOOTCOUNT_AT91) += bootcount_at91.o obj-$(CONFIG_BOOTCOUNT_AM33XX) += bootcount_davinci.o obj-$(CONFIG_BOOTCOUNT_RAM) += bootcount_ram.o obj-$(CONFIG_BOOTCOUNT_ENV) += bootcount_env.o From patchwork Sun Feb 11 12:06:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 871759 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="H+KRMLh9"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zfSLj138Hz9ryT for ; Sun, 11 Feb 2018 23:10:52 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 989E2C21F51; Sun, 11 Feb 2018 12:09:28 +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 91F38C21F35; Sun, 11 Feb 2018 12:08:00 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C9AB4C21F32; Sun, 11 Feb 2018 12:07:30 +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 8A192C21EB4 for ; Sun, 11 Feb 2018 12:07:26 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id t74so4943093wme.3 for ; Sun, 11 Feb 2018 04:07:26 -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=7SZ6lhvdylMFutA40HCNajRYor36pcLBazIvmhORxRQ=; b=H+KRMLh9sRPr6WSHqJJIqs9m9ekHjLEgTExvoIZuaAwuIWCrhkjgpk+H2hg/asHQIs nk0GH87GZ7vUvUaOl6FcTPhvMYWeaheItbA63NzMKFgPztxrLwkf/6nv/rpaOCklwNz9 X9K/2Id1BAV8UVXlrdO121q23qSaOvybj1DpbOW4+T0xGAS5YqryiOIYLYryeTR5SXnA QSK7M8HSV5mDy+FPRa2MEU1eVCssO8zHQevcArZm7rOwi9weEmIreUNJqjRERgw2ljJu bNVIRc57qHn1+A0XtbeJ8chmsOTY+zGALtETdSdlH2PWiZrCpoQnu9qCZX0u0AJPLOkH SDkQ== 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=7SZ6lhvdylMFutA40HCNajRYor36pcLBazIvmhORxRQ=; b=CmWtaOqO6oMw2mlZ36yDtXFmLn5DNVf6aXuM93Wea7hCwJQ53GRkBhwPUQ1QMLwA95 KmG2YiIGJmyWb46AY0WuyCQNzjkDuvWJpu3cUsrSBy/AtIgCvCFgYuR4uVgtMel5mdf8 Bd8vUCIwx/3tD/KSC3qdHr1DjE8FmIhWE859NfgrqYoX0B3Xco6eZpz0ahO9C9bx9PK2 VNhNNkUMxkqRP8l2y/uHLctAeg5dcM1ogZWkujCjH9xwgiwxRQdKmQYdAfFaNDLhwqjQ uJK9p1I9jqQN9/XX8P6lxg9f6GVP7FjR81G5KwdlW7YBR523QWLzyLDeDQoJ2FNgFat8 4ePg== X-Gm-Message-State: APf1xPCy2RTxn6UXVkTFu2/AnCN/08LuQ2McUxQ92mwVn9pLkepuNSYO /xROBwxn8iaMIivUWQkYIdv+Phpi+5A= X-Google-Smtp-Source: AH8x226r5hUS2Ql8+S5R25YEqgfJnxwViuapXkwD1eymjpBJ/0iMZOHw0z5LQmOfX0BLO2oM2QD1og== X-Received: by 10.28.138.85 with SMTP id m82mr1220256wmd.56.1518350845964; Sun, 11 Feb 2018 04:07:25 -0800 (PST) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id k7sm8062459wrg.68.2018.02.11.04.07.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 11 Feb 2018 04:07:25 -0800 (PST) From: Alex Kiernan To: u-boot@lists.denx.de Date: Sun, 11 Feb 2018 12:06:53 +0000 Message-Id: <1518350813-3418-9-git-send-email-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518350813-3418-1-git-send-email-alex.kiernan@gmail.com> References: <1518350813-3418-1-git-send-email-alex.kiernan@gmail.com> Cc: Martyn Welch , Ian Ray Subject: [U-Boot] [PATCH 8/8] Migrate generic bootcount 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" Make generate boot counter selected in the same way as other boot count drivers Signed-off-by: Alex Kiernan Reviewed-by: Lukasz Majewski Signed-off-by: Lukasz Majewski --- 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