From patchwork Fri Feb 16 15:50:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 874524 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="KvfkLGyc"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zjdHd5qLWz9t20 for ; Sat, 17 Feb 2018 03:04:13 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 7F40EC220C6; Fri, 16 Feb 2018 15:58:33 +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_H2, 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 E948FC220BA; Fri, 16 Feb 2018 15:58:30 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 93C78C2203F; Fri, 16 Feb 2018 15:52:17 +0000 (UTC) Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by lists.denx.de (Postfix) with ESMTPS id 0575EC21C3F for ; Fri, 16 Feb 2018 15:52:17 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id f8so3346442wrh.8 for ; Fri, 16 Feb 2018 07:52:16 -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=SgIDmai6F6hTFzaDtAkxklz4nOy0qB0wwAzgG0H3V5w=; b=KvfkLGycT2ISJ07G5vbqhAYP/9yQeUW3zkBgB070sbAsVYH9MghSIOra758EeSKPzx yj9aBFN1p+GZ4cS93WhDaRZKizFqAjl+NdIRz83ISauWLtvjrQnT7/Gxwfk1+MWskwgP Bl9IjuRz7W5JMF7lNk2NaAHsE3HCmBaFIFI4Dx6mo6i6SksggBTWRBuqk48Fsuo4+f6q 0Ohvs0xKc6evi+NAX9NZ3EKn+uFvo6Yhk+QK6B53gWWRcTCCIqEtjThfJt1EkAkFscAB 46LFEanC2XGZ07cZgZocMDLYER1c+n3uYQdxwS4oT7AyPHz5Bkz4Nlj0rk9+mVIAYmMN Nx+w== 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=SgIDmai6F6hTFzaDtAkxklz4nOy0qB0wwAzgG0H3V5w=; b=hZbIn/e3Pd88Ta1jp+jXZ2WV00jL73JlOCV8wJBYbVuujUMx+K+yamUUi7VWnHQfAf ovBMTGu6URJZ713reJ8KXIkjBXuG6Nub2wtA+kd5xFwMO3wdSPOQ1OQwgfqme3mDGGxW x+kfhiz403uFyM9Aba0COBsQ6Q2IuDaSYC8vMvTo5bYv3z7oUzx6UzIRG2yIwFS8MEfj AnPKHG2ejI5xe0tSi4k6S6fHzCfPFKh/ThAFURk/sJNye3x1Ut+M5N+MENuZH8B16WUp ZJ3jA54JUJE/2c3g36XDXZIZahlI9R+CzlA5iXheaOeZ09OG71udMXk6QJENV8K3aLW+ rhuQ== X-Gm-Message-State: APf1xPBpcefitHoZY0bW+szbtTieTIUGIFGDqaWbaZHpNiUQOGBYXxWP hTQ30C8dkkMltDrZ8OAtfLSf951Bg/Y= X-Google-Smtp-Source: AH8x224rpVBmBKSUTyT4JB+B7itAgLuQRc6vezZDsDIzmwg2xMEBaCZgzl5bDc46bBpnPb/SSDaNrA== X-Received: by 10.223.157.22 with SMTP id k22mr5715985wre.208.1518796336363; Fri, 16 Feb 2018 07:52:16 -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.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 16 Feb 2018 07:52:15 -0800 (PST) From: Alex Kiernan To: u-boot@lists.denx.de Date: Fri, 16 Feb 2018 15:50:38 +0000 Message-Id: <1518796248-28270-2-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: Martyn Welch , Ian Ray , Chris Packham , =?utf-8?q?Antti_M=C3=A4entau?= =?utf-8?q?sta?= Subject: [U-Boot] [PATCH v3 01/11] 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 --- Changes in v3: - Improve commit messages - Split rename of CONFIG_SYS_BOOTCOUNT_ADDR out to a separate series Changes in v2: - Fix erroneously removed line in README - Convert CONFIG_BOOTCOUNT_EXT too - it had only been partially done - Reword CONFIG_BOOTCOUNT_DRAM - Update README for AT91 driver - Remove CONFIG_BOOTCOUNT_LIMIT and CONFIG_SYS_BOOTCOUNT_SINGLEWORD from whitelist - Rename CONFIG_SYS_BOOTCOUNT_ADDR to BOOTCOUNT_ADDR and remove from Kconfig - Migrate CONFIG_BOOTCOUNT_ALEN to Kconfig configs/mx53ppd_defconfig | 1 - drivers/bootcount/Kconfig | 9 +-------- scripts/config_whitelist.txt | 1 - 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/configs/mx53ppd_defconfig b/configs/mx53ppd_defconfig index 90df425..7e3dd6d 100644 --- a/configs/mx53ppd_defconfig +++ b/configs/mx53ppd_defconfig @@ -21,7 +21,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" diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 4ac89cd..cda7d4f 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -151,7 +151,6 @@ CONFIG_BOOTCOUNT_ALEN CONFIG_BOOTCOUNT_AM33XX CONFIG_BOOTCOUNT_ENV CONFIG_BOOTCOUNT_I2C -CONFIG_BOOTCOUNT_LIMIT CONFIG_BOOTCOUNT_RAM CONFIG_BOOTFILE CONFIG_BOOTMAPSZ From patchwork Fri Feb 16 15:50:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 874519 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="kVyUkrSW"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zjdFw0BSsz9sDB for ; Sat, 17 Feb 2018 03:02:43 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id A1FD1C21FB9; Fri, 16 Feb 2018 15:55:00 +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 F0025C22066; Fri, 16 Feb 2018 15:54:57 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 08AD3C2209C; Fri, 16 Feb 2018 15:52:18 +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 00AC8C2208E for ; Fri, 16 Feb 2018 15:52:18 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id h74so3950526wme.5 for ; Fri, 16 Feb 2018 07:52:17 -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=+21zS0Ne4ZfIlXt0eoJ2Ey61p8twl0p2Gi5Ql5WFLDU=; b=kVyUkrSWZTAwwE7vqfX9hzPNtR3DiCDmX735uJYp9IHzcSkGwLAfwvEij3vP2hmdrs fMy2jUYaKPlCuk70lHkB+GMmiTzZ6QtnVeNn5/Vb2lo/HUHQ4+KY+HkZxmAL86dvW3I0 0RPuzjLu0Lqg9JI/lSDm1iq2RZmpOAAdsepwQHTyPtCN/pe3JJqkTB72N6sgyTKVaqWY GnnXX0qofjw8xO0Ke2Zx36SOgOk9nHsBQa1qDKfD5D3fTISER1L3P1A4FWK/qT0ozwan cNFSXC9iansEO4dQafyJgo87WFXPz3m3jqJfX7eKd6T2+PrTnPjIYmfOGfgzoqaXbm7Z dgTg== 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=+21zS0Ne4ZfIlXt0eoJ2Ey61p8twl0p2Gi5Ql5WFLDU=; b=I8Ut+6IX8XMWll/1/RW02WuRSCXx3+6R6fLOYnjiv0KZkhKQV9y4d2xeG10yScjgV9 wpBUQFSTizeXzR9psD4HijW2NGzwRf6x05RfsIrYSPi5YDjZyWm5a5qVWzdWjOZJ/Hnv iuR10Omyq4pU5fBZq/+lt8BX8VE/thydGnSoqPJEuGUqjPQTUOP0M75D5QUdaItA9oeA W4cmUeteKRBNFvAG9kqHXSz1o/Vwa3DtoCSTjCtbIuxDkjSdlyJQtQHCTzGjArq+CRKm sssp5qYCRmra586Uxu5z7ufKEYFuIZp74RN0Ka4HBcDwxBOU+xwfAy7H4m0GV+M35B6z 7ZTw== X-Gm-Message-State: APf1xPCEdiKS8h4TROrLrNDvXEhpS5I0PjWDpOk19+L9NRBME+SzAaWb HsfiUxsIERtgAZtbdTPLdyoFjlZpjDE= X-Google-Smtp-Source: AH8x225KPLkZmeRXvSz2Tz5TscDnuLyJtT++JuBCeTKpWuobjIXrhIChYhM10Tb87Qot2G9ZU6BT0A== X-Received: by 10.28.71.198 with SMTP id m67mr5567902wmi.40.1518796337357; Fri, 16 Feb 2018 07:52:17 -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.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 16 Feb 2018 07:52:16 -0800 (PST) From: Alex Kiernan To: u-boot@lists.denx.de Date: Fri, 16 Feb 2018 15:50:39 +0000 Message-Id: <1518796248-28270-3-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: Ian Ray , Martyn Welch Subject: [U-Boot] [PATCH v3 02/11] 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" Reviewed-by: Lukasz Majewski Signed-off-by: Alex Kiernan --- Changes in v3: None Changes in v2: None 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 Fri Feb 16 15:50:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 874521 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="eVRi77W5"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zjdGS0JPlz9t20 for ; Sat, 17 Feb 2018 03:03:11 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 9EBA1C2208D; Fri, 16 Feb 2018 15:56: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_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 65A2BC22043; Fri, 16 Feb 2018 15:56:09 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D79EDC22066; Fri, 16 Feb 2018 15:52:20 +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 AE639C22092 for ; Fri, 16 Feb 2018 15:52:19 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id z81so3932691wmb.4 for ; Fri, 16 Feb 2018 07:52: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=BZltD4bOHE8Lr1u7S84KVI96cl6OjYnKJmUcHYtZ8Ew=; b=eVRi77W5JmrH1MsMkqD49+fTWqiUi2kxzlOtE96MV/Gm5Mr+lFaCFBnusAEIEPALSZ GCEjahiIooW47WYSbS7BhqBSd9qJUpundy6nNmGHx7P65dD2ooGSu+kPmAACUABbJsgR wfh88pbMMF6PqaTZSMYcZD5RN5ig+NwAB7XGrDG9qhcsTSEChyMojbREm5VbC1Iq2649 YRAEitoyHu1sisvfpf+PtRcUj74dl35dZAtXaWCseH/alsaQkW5/6kG/9VIdeSZ2y1HX i8iRQXNb21UFGIT3pJK/ouH8JIic9g6cM1YjsGc/05q40DHyJ+feRNcwbmD/1x5FY0B5 lrQA== 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=BZltD4bOHE8Lr1u7S84KVI96cl6OjYnKJmUcHYtZ8Ew=; b=n5aIFTN3cVqeXQsKR8CWl0PAtZaJcj/mgti1dzHWeNsqUpABsCBlgc5+QPzzR3gp73 PQm0oVO2XTDNcPnRHOnNQJpDZv7IqHz6i1J1p+wxK2rfWFKONDLbvgZs/tJPJIixYJC+ giRmAZW4cM5TH6Ew1xDBpymOCk+aAzms3TbdGwb2W0azHTS0f5uigiCKZDcCkv8j05Xm q3daslGN6pRCRgAcX2A/62SMhKoFlmsXvSdIG5RdoEh4ZV5PDEwcuC3Lw5Wgc9x16mPh +vL/2TSqy3WBOzWCid3AHkMB92OLHGMj0Ks1yq1OA443xf9fVsD72+mX/q1kll3mxOTc pBqw== X-Gm-Message-State: APf1xPCpPj70LoX1cbcc/CyR7h56zkWZyNHuI1D3GJyRzVHnes0ophHX 6ujTXFPmj756G/vTlls9isjEGbiaMrE= X-Google-Smtp-Source: AH8x227DGfcZ/NGT0yCpSseemi8EiRf5gh06YvmXz9eU1fBjiNJUa5hupSJLpwC8tzhH8teXFEcRDw== X-Received: by 10.28.144.197 with SMTP id s188mr5568262wmd.51.1518796338858; Fri, 16 Feb 2018 07:52:18 -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.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 16 Feb 2018 07:52:18 -0800 (PST) From: Alex Kiernan To: u-boot@lists.denx.de Date: Fri, 16 Feb 2018 15:50:40 +0000 Message-Id: <1518796248-28270-4-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: Martyn Welch , Ian Ray , Gilles Gameiro , Chris Packham Subject: [U-Boot] [PATCH v3 03/11] 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 Reviewed-by: Lukasz Majewski Reviewed-by: Hannes Schmelzer Acked-by: Hannes Schmelzer Signed-off-by: Alex Kiernan --- Changes in v3: None Changes in v2: None README | 2 -- 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 - 10 files changed, 9 insertions(+), 11 deletions(-) diff --git a/README b/README index fabd532..1a9c2b2 100644 --- a/README +++ b/README @@ -2320,8 +2320,6 @@ The following options need to be configured: - bootcount support: CONFIG_AT91SAM9XE 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 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 2e1dbf6..80a523d 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -180,7 +180,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 5ea7658..48cd285 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 cda7d4f..f96f12a 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_RAM 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 From patchwork Fri Feb 16 15:50:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 874507 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="Jfrxy5/R"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zjd7l0xbfz9t3v for ; Sat, 17 Feb 2018 02:57:22 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 87397C2209C; Fri, 16 Feb 2018 15:57:19 +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 E40CCC2209C; Fri, 16 Feb 2018 15:57:16 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 50A45C22066; Fri, 16 Feb 2018 15:52:22 +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 E3211C2208B for ; Fri, 16 Feb 2018 15:52:21 +0000 (UTC) Received: by mail-wm0-f67.google.com with SMTP id x4so6065381wmc.0 for ; Fri, 16 Feb 2018 07:52:21 -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=nsETNeSamxYrlKLxLdUhBRtxQR0hcGSWm4LFJa8U3V8=; b=Jfrxy5/Rkw7iiKJgwjHqT3Xpis+etz93LKieJX+2Mfgx3xloAPDUSv4pNv8WxwkHbC x5azwR4L9V8Nyw6w518E5kxYhOzwqPkiG2ARH8L1jATuP9kVR42BVd3pneFeJN8NQlk2 iD52VnZ5EUfmyj9vF8SN0qPuy1wPuFxLzg7cWoMKz+pxahCYV241aqmxxWO02RamIZRb WsU8Gy7IvHv5nLSfH7UwsopGbP3l81PQ4ltpJXNSReMAJAVWeNrYZ8NrlcVl495oGym+ B/iWpr5CQre3XOhcc+PlnKMkcQ1O29M7G0xkD1LhNE0vuH1V6RLpdfyLEr0AoW/1DQ79 tSdw== 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=nsETNeSamxYrlKLxLdUhBRtxQR0hcGSWm4LFJa8U3V8=; b=OxhGIYb3Nuv8nlQ1zH18cs71pFKmuCooQD3eliFDCnSoOrEJmwZ27w3hrl4mWYBSsN /G7vpPmDfjeru29LCt9ZSf9qm80AXUpmrCr7w8/oMBmMqUnyWdBDQmNY2GFJck4s+F8F kUJPPdw3sx5mAyuEB4/o6a8PdDZ2RXzhJ9ul48iBRtEAr3IwMB8B6ncK8v+b0/E9bD/2 Jx7SEvWPuBTBtw0D8w9I1zu8lZJX4MZn/FNAbLofs1j1GVGWSA0LFwgPNlT0BPQFkx9Y 4nJPZJY2wgOIK6LEonPjznykjwPTFRv6vaJexMSr5WJHoh4bZv9XfmCL8Neup/3tgYHj Ue1A== X-Gm-Message-State: APf1xPCBuYyDh6fFZ6YPPl2rNVrGetYpe/PNOrzgBgcYGEBpLUH31mZk XKHv3EyxviL/nuSgTtbDMCNcPQ4gTno= X-Google-Smtp-Source: AH8x227kgS+SJXFEzY96TKAI1GeX5OF/haM1EUt70UR28tHrnaum6P1Mg7Dlx0BIi43pKWxr6i3cpA== X-Received: by 10.28.103.9 with SMTP id b9mr2720055wmc.44.1518796341086; Fri, 16 Feb 2018 07:52:21 -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.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 16 Feb 2018 07:52:20 -0800 (PST) From: Alex Kiernan To: u-boot@lists.denx.de Date: Fri, 16 Feb 2018 15:50:42 +0000 Message-Id: <1518796248-28270-6-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: Valentin Longchamp , Martyn Welch , Ian Ray , Chris Packham , Stefan Roese Subject: [U-Boot] [PATCH v3 05/11] 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 --- Changes in v3: None Changes in v2: None 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 6f2fd0e..474632c 100644 --- a/README +++ b/README @@ -2309,8 +2309,6 @@ The following options need to be configured: - bootcount support: CONFIG_AT91SAM9XE enable special bootcounter support on at91sam9xe 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 54c22a7..5f378f7 100644 --- a/configs/km_kirkwood_128m16_defconfig +++ b/configs/km_kirkwood_128m16_defconfig @@ -27,6 +27,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 20ea24b..ae20d24 100644 --- a/configs/km_kirkwood_defconfig +++ b/configs/km_kirkwood_defconfig @@ -27,6 +27,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 402610c..22bc6cd 100644 --- a/configs/km_kirkwood_pci_defconfig +++ b/configs/km_kirkwood_pci_defconfig @@ -27,6 +27,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 72aee04..5c123a4 100644 --- a/configs/kmcoge5un_defconfig +++ b/configs/kmcoge5un_defconfig @@ -27,6 +27,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 ac82780..4749ead 100644 --- a/configs/kmnusa_defconfig +++ b/configs/kmnusa_defconfig @@ -27,6 +27,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 af2c93e3..de68d41 100644 --- a/configs/kmsugp1_defconfig +++ b/configs/kmsugp1_defconfig @@ -27,6 +27,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 09d75ab..892f212 100644 --- a/configs/kmsuv31_defconfig +++ b/configs/kmsuv31_defconfig @@ -27,6 +27,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 3e90e70..89a83fd 100644 --- a/configs/mgcoge3un_defconfig +++ b/configs/mgcoge3un_defconfig @@ -27,6 +27,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 1c6dad9..8a6d996 100644 --- a/configs/portl2_defconfig +++ b/configs/portl2_defconfig @@ -27,6 +27,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 aa6e5e1..918447a 100644 --- a/configs/theadorable_debug_defconfig +++ b/configs/theadorable_debug_defconfig @@ -45,6 +45,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 faa3d94..cc36a68 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -276,8 +276,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 a213e7e..e4ec2c0 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -82,7 +82,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 dd09663..07951f2 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -149,7 +149,6 @@ CONFIG_BOOM CONFIG_BOOTBLOCK CONFIG_BOOTCOUNT_ALEN CONFIG_BOOTCOUNT_I2C -CONFIG_BOOTCOUNT_RAM CONFIG_BOOTFILE CONFIG_BOOTMAPSZ CONFIG_BOOTMODE From patchwork Fri Feb 16 15:50:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 874528 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="FjrURlPy"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zjdKk4Gcsz9t20 for ; Sat, 17 Feb 2018 03:06:02 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 289DBC22066; Fri, 16 Feb 2018 15:59:42 +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 AAC75C2202B; Fri, 16 Feb 2018 15:59:40 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id BF6FFC220C0; Fri, 16 Feb 2018 15:52:23 +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 D1FC4C22009 for ; Fri, 16 Feb 2018 15:52:22 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id t3so3946454wmc.2 for ; Fri, 16 Feb 2018 07:52: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=V9hb3b97EzIQYg8LfDtsKoBile2+vb/Nhsu37xOne8k=; b=FjrURlPyjlxsfD+V6C/XjyYp3/rWq2//O08CcxgUaZn6VOm+QNgF6N5OmycwqVLNAE S6CmZa5VI/eA0X0d7wwJZSZWHH0Ebj0u7zsTn+se2ykcephS286RzyYhYk4lNKfqYvOV z3k1gzAk8cwVz90TUHCl76WZ3/aQxNAGFjykgFxo34hFJHexPnn47o+GyAdqRl8X0azO yp1O/NgAROzcLReg87rK46Pc/dD93gsYmAaBykUUhAOLPAqRHRdB9LCLpnAFQ/VEWZN5 Ebu1S9DtqBigILPH0yOyrlYjfjmCqevQkRsFNUqSQjEEGV5qa/rOCoFUnz07R4LYNiC7 +hXg== 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=V9hb3b97EzIQYg8LfDtsKoBile2+vb/Nhsu37xOne8k=; b=VW8Fh9UmAd38u45DQ9Dds/9JswnRU3ECa96mkJKMPvhy+ifg3LwulnyA4RqsQ5S6cF Wa3ZIGVKMBTkJ4VpFwbJMTnfIO8QOsy9VteF3g0n59T9h2feQb42s8y1DsXgegcrT+R5 BV3xA2NT8qYiEeFwHaSQRBDG2uqdDeUdQc2lZ8ZXvCbX0nQLKdc+A1SUM1Zu5lcxJuGp mxObLk+ck/HfIPeh9SUJ/WDwTMP5OvO0UcjJ+nqHLBI019eKWLZl3pDljhivvv6q44wV ZwL5sabkQ0BkzhxbL4Cptn+8WcLLpqYiWlEi7/Oj2uhyQoSqZndjfsDXginTRveb2Gb/ LUYA== X-Gm-Message-State: APf1xPBOByaqFTKJJULvXD/KA7cFTD0MB5kisNwjJ0FPTdJNZwtZir4w fd08YtbZbQqySBImPaIbPxBMzP7bW+o= X-Google-Smtp-Source: AH8x225j/Bec9MgHl3vY5L59sjD6sQWFqvgKDlqZCgoVLT7UqACjsYajYp5oR3zELCALMF5EiPMknQ== X-Received: by 10.28.74.66 with SMTP id x63mr4819239wma.4.1518796342209; Fri, 16 Feb 2018 07:52:22 -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.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 16 Feb 2018 07:52:21 -0800 (PST) From: Alex Kiernan To: u-boot@lists.denx.de Date: Fri, 16 Feb 2018 15:50:43 +0000 Message-Id: <1518796248-28270-7-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: Martyn Welch , Ian Ray , Chris Packham Subject: [U-Boot] [PATCH v3 06/11] 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 --- Changes in v3: None Changes in v2: None 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 474632c..2008483 100644 --- a/README +++ b/README @@ -2309,12 +2309,6 @@ The following options need to be configured: - bootcount support: CONFIG_AT91SAM9XE enable special bootcounter support on at91sam9xe 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 b754758..ca14815 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 628e0a2..099d7bd 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -515,7 +515,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 07951f2..c47156b 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_BOOTFILE CONFIG_BOOTMAPSZ CONFIG_BOOTMODE From patchwork Fri Feb 16 15:50:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 874527 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="mMX+cS67"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zjdJZ5yntz9t20 for ; Sat, 17 Feb 2018 03:05:02 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id DDF59C2209B; Fri, 16 Feb 2018 16:00:42 +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 07643C220CE; Fri, 16 Feb 2018 16:00:40 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 082BBC21FB9; Fri, 16 Feb 2018 15:52:24 +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 A5113C2208B for ; Fri, 16 Feb 2018 15:52:23 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id j21so6074344wmh.1 for ; Fri, 16 Feb 2018 07:52: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=4ZVb9v5ZR1is90IV9vg+EP2fT8sFB3XM8KxuOMSNsPk=; b=mMX+cS67Unc3MULstGba1q7KXUA2HQTV17dZOSkoLh8rB45a7+bzSQcEcSIdyVCohM l8wljH52lhy0DTkpVDJbHGWUNmowcfsWr4kNyJR5r7FIlIS1+2Yvt3yur/RDXQEIMXk+ fHsc79Ljy/FylTPL2sshMFRVQSEQvlp5bYWrmo4EUgcKYFTtsxY+7xb6LCdDEPdvQg4j rSIyKzjtUmf3is5ebEPH7O25kXr1C13elOSWCwX2nkx6EtcuU2kJXn1XPs7HLGdg/tUB BiK4s5+unS3/tqkE0H7hZqVhjv70mpq8qkgVn+OekXpSZpvrlRqbMiZ2WtIolUY7fLfR aoBw== 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=4ZVb9v5ZR1is90IV9vg+EP2fT8sFB3XM8KxuOMSNsPk=; b=GLK5cwbA5IJMDEFNnWCNVyQreDHyTqGPt2dl421hmV0vcfq6bfascmVa00WlCQPzv4 X1yTK1hUdLtHuhHX/wOg/WCEu1vOd3pcpGHB7xNR7hO9w/io1o4Os3z38rr8VdRS+CGa 54thdlagp/6FxSxaK99mWbDq4fMe9npLIyD1Azb0UgfXMiAi+SVe9fd/930Q4Sxb4A3U YlRCNdrPUYMP5SDJ9BLdwj+nwdeSsmST42HNonLrZvGcmQ9dlDGaWoEC5nqJqmLQxxrw 18LOB2uL/scnv4/OdTehHd1hwv8Ru2Ipr0wmqtWJKowo0PyM4bBrvjITbH0AHuB0QRRw hvww== X-Gm-Message-State: APf1xPD6W8ey+9wD7neFtP+pBqByMsXu4+n3r85D//3wtog8LfOa7mVb 0rg9Aha33ZSButej429/2/CelhR/7UI= X-Google-Smtp-Source: AH8x226xOKYh442iGQIjv30kFNp2CmDwvUKqw8gwE7YmjsEI/eCxR3ttYn4NJ5WpfU28vgnXek92pQ== X-Received: by 10.28.235.17 with SMTP id j17mr5593650wmh.52.1518796343079; Fri, 16 Feb 2018 07:52:23 -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.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 16 Feb 2018 07:52:22 -0800 (PST) From: Alex Kiernan To: u-boot@lists.denx.de Date: Fri, 16 Feb 2018 15:50:44 +0000 Message-Id: <1518796248-28270-8-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: Martin Donnelly Subject: [U-Boot] [PATCH v3 07/11] Convert CONFIG_BOOTCOUNT_EXT 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_EXT Signed-off-by: Alex Kiernan --- Changes in v3: None Changes in v2: None README | 7 ------- configs/ge_b450v3_defconfig | 2 ++ configs/ge_b650v3_defconfig | 2 ++ configs/ge_b850v3_defconfig | 2 ++ include/configs/ge_bx50v3.h | 4 ---- 5 files changed, 6 insertions(+), 11 deletions(-) diff --git a/README b/README index 2008483..21de2e4 100644 --- a/README +++ b/README @@ -2309,13 +2309,6 @@ The following options need to be configured: - bootcount support: CONFIG_AT91SAM9XE enable special bootcounter support on at91sam9xe based boards. - CONFIG_BOOTCOUNT_EXT - enable support for the bootcounter in EXT filesystem - CONFIG_SYS_BOOTCOUNT_ADDR = RAM address used for read - and write. - CONFIG_SYS_BOOTCOUNT_EXT_INTERFACE = interface - CONFIG_SYS_BOOTCOUNT_EXT_DEVPART = device and part - CONFIG_SYS_BOOTCOUNT_EXT_NAME = filename - Show boot progress: CONFIG_SHOW_BOOT_PROGRESS diff --git a/configs/ge_b450v3_defconfig b/configs/ge_b450v3_defconfig index a5beefe..32f07ab 100644 --- a/configs/ge_b450v3_defconfig +++ b/configs/ge_b450v3_defconfig @@ -26,6 +26,8 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_DOS_PARTITION=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_EXT=y +CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="1:5" CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_NETDEVICES=y diff --git a/configs/ge_b650v3_defconfig b/configs/ge_b650v3_defconfig index cbf83b1..188238e 100644 --- a/configs/ge_b650v3_defconfig +++ b/configs/ge_b650v3_defconfig @@ -26,6 +26,8 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_DOS_PARTITION=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_EXT=y +CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="1:5" CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_NETDEVICES=y diff --git a/configs/ge_b850v3_defconfig b/configs/ge_b850v3_defconfig index 953681f..96ac173 100644 --- a/configs/ge_b850v3_defconfig +++ b/configs/ge_b850v3_defconfig @@ -26,6 +26,8 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_DOS_PARTITION=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_EXT=y +CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="1:5" CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_NETDEVICES=y diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index 8dc0a7f..0a72b58 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -267,10 +267,6 @@ #define CONFIG_BCH -#define CONFIG_BOOTCOUNT_EXT -#define CONFIG_SYS_BOOTCOUNT_EXT_INTERFACE "mmc" -#define CONFIG_SYS_BOOTCOUNT_EXT_DEVPART "1:5" -#define CONFIG_SYS_BOOTCOUNT_EXT_NAME "/boot/failures" #define CONFIG_SYS_BOOTCOUNT_ADDR 0x7000A000 #endif /* __GE_BX50V3_CONFIG_H */ From patchwork Fri Feb 16 15:50:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 874529 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="Rzc/PuhQ"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zjdLm26cxz9t20 for ; Sat, 17 Feb 2018 03:06:56 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id CFF12C220FE; Fri, 16 Feb 2018 16:03: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_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 53562C2209E; Fri, 16 Feb 2018 16:03:08 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id EFAD9C22049; Fri, 16 Feb 2018 15:52:25 +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 9E96DC21F2B for ; Fri, 16 Feb 2018 15:52:24 +0000 (UTC) Received: by mail-wm0-f67.google.com with SMTP id t3so3946609wmc.2 for ; Fri, 16 Feb 2018 07:52: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=K+TOVLfv9DrujgJJL+VQHjbUN/euaMEhc5T81shcbok=; b=Rzc/PuhQE2jFU1+I2ZqhVErzSogzsPTXJGvisKys3WpFQd1d9jn3Z3Sr/3xqAw+xrE Yd4gBcMzVPOviZgfNMdG9uddJVGSK8XTqfqSscOXbgzZ2Qwrvq4nZ4vYkJ5A5cnJOU/y TJHkHHgR752oiVpX7Tj7bYXhT7MLIAHURD8hWbKrxnx3zS8gJzDi+UsEVbCADQyGz3+k 83lJ93rZ16JA6MVtuHPX8T6dwmqPbd/dpnYMOts3fr/YOxLLUrkV7usNuQU18jrZVOTe mnEeivLst6+pevsxqNyFO04WgmNAFJM2xJYYmg38a8wa1IRyuMYT1ZUQ7yi5hQvoa6Ks UUzw== 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=K+TOVLfv9DrujgJJL+VQHjbUN/euaMEhc5T81shcbok=; b=uNCUNxoXoLCd9QEsZP1uocMgllXEO71R+cq+fz13yaSRdnz4ZFVtzWi2yUWbeJZXA8 N3f6R+04G+ZCCBTHqZRrp/IAkz3y8svVTHmnWa+Mi4iguCHh+Ff81DMi2IFopw63eP7g gLNQDfYx4Ly0EUKvQaCzynwLY4AlWzPjGR/F+J8ZQXQqtd3SFjhb0vWsk8cpaBKu9RKr GDA2i5o51sSNIAbcX2epGScu85GmwRcfZteYGTF9oWsMScjjHEiDr2KmbfIwAucHStsT ZDvREfRMJrydh/ezv359bEkdcMu4J+yjwSQZ6+jo7hdCTZBKU4Bsy3K8SzYDDGtCeesh CWGg== X-Gm-Message-State: APf1xPB5EKtzP3lh3jVFtC1SnIMl5FK4OmaJ81+mcqGFm3dFly1utH4a syJHqeuDA0L6OTeQvlwMHmnlBSFk6mA= X-Google-Smtp-Source: AH8x226HhZGQrZKedxEBzSgtdmHr0qo8Z2P0uS+Dkss7flWv0VNMFexlr1h9ZHE5myTmThV3rTvosQ== X-Received: by 10.28.137.140 with SMTP id l134mr4979206wmd.137.1518796344042; Fri, 16 Feb 2018 07:52:24 -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.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 16 Feb 2018 07:52:23 -0800 (PST) From: Alex Kiernan To: u-boot@lists.denx.de Date: Fri, 16 Feb 2018 15:50:45 +0000 Message-Id: <1518796248-28270-9-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: Martyn Welch , Ian Ray Subject: [U-Boot] [PATCH v3 08/11] 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 Reviewed-by: Lukasz Majewski Signed-off-by: Alex Kiernan --- Changes in v3: None Changes in v2: None README | 4 ---- drivers/bootcount/Kconfig | 5 +++++ drivers/bootcount/Makefile | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/README b/README index 21de2e4..a28030a 100644 --- a/README +++ b/README @@ -2306,10 +2306,6 @@ The following options need to be configured: A better solution is to properly configure the firewall, but sometimes that is not allowed. -- bootcount support: - CONFIG_AT91SAM9XE - enable special bootcounter support on at91sam9xe based boards. - - Show boot progress: CONFIG_SHOW_BOOT_PROGRESS 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 Fri Feb 16 15:50: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: 874525 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="F7D1H+HY"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zjdJ35zGtz9t20 for ; Sat, 17 Feb 2018 03:04:35 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 70E1EC22066; Fri, 16 Feb 2018 15:57:55 +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 2C93CC2208D; Fri, 16 Feb 2018 15:57:53 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id CD88AC2208F; Fri, 16 Feb 2018 15:52:26 +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 B6BFBC2205F for ; Fri, 16 Feb 2018 15:52:25 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id b21so3906984wme.4 for ; Fri, 16 Feb 2018 07:52: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=Cv11IILUZYa7I3dPq6KI838KotspdwyW3Wm+kAXL6ps=; b=F7D1H+HY2AfSUYv8gjxXrZ1+3slPGaUuS21/triGHsJJQ1MHy/aC6WGZL3ZW5UmUZO TbuHuo9mqBp/ax+zZga/P3dAZrpEuHfS4Q1UmXSzKHgwwKbkyPz2IxIYq2s43qqoCtyY 66k92aa8a1vVp6VWch7F28dK+/WbOVEyAee7Xm6ShHakS1v8bc4wX/FFLMukkEhjkkIk QfEPa32sapoJYhmwRnpixiO7GYRlK42cJPPTmLd1jgIeaJNiyDuAhuDi18d7kc5S1uT1 nr7c2WrpUUAe+3Q0YPB2k72YbwfYzaUM+7h0X4wjOES3S0JCwBjyQHhTxIFN6TpJF5TI Y3kw== 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=Cv11IILUZYa7I3dPq6KI838KotspdwyW3Wm+kAXL6ps=; b=KzWfJdCVnk4FoWFKjxc5k26rR2uVvvUD1r+gbCkPZIITHP3YtfeIaFRki/Qc+a5Q7Z wKU8xr4ccUDOwhva2X2r6toVLzvnuu6x4yUXGzRwibasFITp0I4LTwu4McLS7ofbIKmd Fijh0tBv/4CTzj6o/XYKMIkBkTaAcbR/2CAlXCyTPpaIs0TVr7KVp19Z2aw1mIis/TXe 4A0c6EZ3M6kxbSGds8jd2kdzZizxUZO1M091SMJm8HWeSVM3HURAiZIZmozkQ/cOs77G nSG1A4tPhx4Rq6CD1GmfKa4S4i57gen901giTm/NPswQT3CRQhalrQ4EUOkKEakLOaoK DKEQ== X-Gm-Message-State: APf1xPAChYXP+oQNVbiPuOL1U0iNoQtWbW+EjL3ha7cCjSBJxOuz6EKl 5Mo5q6W0sH7arGk2D0xMQ9KMTrXU5Mk= X-Google-Smtp-Source: AH8x225Weyf9iAnOs/MhIMznSfMGbJ9Aa9a5lmL1g5Uvkkd3NDUhk217aE08s1js99omWZfi+ZMbEQ== X-Received: by 10.28.103.9 with SMTP id b9mr597584wmc.32.1518796345119; Fri, 16 Feb 2018 07:52:25 -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.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 16 Feb 2018 07:52:24 -0800 (PST) From: Alex Kiernan To: u-boot@lists.denx.de Date: Fri, 16 Feb 2018 15:50:46 +0000 Message-Id: <1518796248-28270-10-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: Ian Ray , Martyn Welch Subject: [U-Boot] [PATCH v3 09/11] 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 Reviewed-by: Lukasz Majewski Signed-off-by: Alex Kiernan --- Changes in v3: None 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 From patchwork Fri Feb 16 15:50: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: 874520 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="hio8k+RS"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zjdGQ4vLdz9sDB for ; Sat, 17 Feb 2018 03:03:10 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 66C79C2208B; Fri, 16 Feb 2018 15:55:50 +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 58618C22066; Fri, 16 Feb 2018 15:55:47 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 27405C22043; Fri, 16 Feb 2018 15:52:27 +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 C884AC22059 for ; Fri, 16 Feb 2018 15:52:26 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id 141so3900385wme.3 for ; Fri, 16 Feb 2018 07:52: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=Y69dmkTHAdUYwyuwmwRw1fukriLCOx2/ggUVE2OO9Pw=; b=hio8k+RSHr7dxWfUWQVdSttCnvIrZ31dMA87YupjimoPKdjm4AALjEvGU23scZ/pdp 8qpq9+9L0gtbg0mpo0eSSHY8Uz6l7+sHzD1SdQZlNb8jHJd6xJ+TLGjqpQQbN3aT5yHZ SCpVpxvND5q74cvl9etkkHbXw9yf21JYgMcv1m7pDZVEdEdIb5Y5tJecsMmDb+0pMBz4 BlwPz+/3R4WURE2iO74Flrg3omnJ6AWnRg4OQfCmrXISvOPz83gpRtjZX4en03Sgd43M 9Kz/AMc+konZ79yIBEokoD3hNvMUA4Y3mtlNT1d/opJQdtYX3ypaGwJrRPGXMNnchJB/ yStQ== 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=Y69dmkTHAdUYwyuwmwRw1fukriLCOx2/ggUVE2OO9Pw=; b=GSk3JPU3S14I8T75TK+n+4huzq+2XIs8KOk3eDGyjGKTWj6qymCwJUeMuLbfnvrjyT 27frQrDG04/FHUQ2XvJU/aBkFE8vPC3Ki0Z9y8KdyZbUpEo91dPxVPJZlvWNHVTM6ljF pz/SIgxK5/63pksmeqb3awYdj/2/3/RM7gjYHwgm/RGiL0Kg/VolwKBz/W8ljyEoP0R9 w3hKiAVrjQL6DuA+X2z/af6OzbhTxLCzrL/Nyv8C8fByRczUhbrSUpv157nRdEXmFzzV hYvB4DKPsPWdrKaZwxFaDlu/IbWD8Ky6xPT8wAiYp1nvxOx7hBxteAP3+QQsZ/uC9YXb KhAg== X-Gm-Message-State: APf1xPAzxTlF7h9jGxztVcjUoUXo9i47HWwytrnxOlRPRK4QhsPCJXXa dZhXBpTOh1owbyWkpC65jPFvwZJM4VE= X-Google-Smtp-Source: AH8x227uUL1/PpMyTvq7FyZ3xrc6/m4/5yLuVFZMUZ6CqckWKT0DVNVVUn5ioW+wpnk2MpE4wk+3dg== X-Received: by 10.28.62.203 with SMTP id l194mr4861339wma.121.1518796346177; Fri, 16 Feb 2018 07:52:26 -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.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 16 Feb 2018 07:52:25 -0800 (PST) From: Alex Kiernan To: u-boot@lists.denx.de Date: Fri, 16 Feb 2018 15:50:47 +0000 Message-Id: <1518796248-28270-11-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: Martyn Welch , Ian Ray , Chris Packham Subject: [U-Boot] [PATCH v3 10/11] Migrate CONFIG_BOOTCOUNT_ALEN 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" Convert CONFIG_BOOTCOUNT_ALEN to Kconfig Signed-off-by: Alex Kiernan --- Changes in v3: None Changes in v2: None drivers/bootcount/Kconfig | 9 ++++++++- include/configs/ids8313.h | 1 - scripts/config_whitelist.txt | 1 - 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig index 9fde2f2..c41b131 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 099d7bd..388685d 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -515,7 +515,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 c47156b..4caa94f 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -147,7 +147,6 @@ CONFIG_BOARD_TYPES CONFIG_BOOGER CONFIG_BOOM CONFIG_BOOTBLOCK -CONFIG_BOOTCOUNT_ALEN CONFIG_BOOTFILE CONFIG_BOOTMAPSZ CONFIG_BOOTMODE From patchwork Fri Feb 16 15:50: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: 874518 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="A70AIbNy"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zjdFX1ZMqz9sDB for ; Sat, 17 Feb 2018 03:02:24 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id D012FC220E3; Fri, 16 Feb 2018 15:58:50 +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_H2, 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 36F60C22002; Fri, 16 Feb 2018 15:58:42 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E7E80C2203F; Fri, 16 Feb 2018 15:52:27 +0000 (UTC) Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by lists.denx.de (Postfix) with ESMTPS id A95E6C22066 for ; Fri, 16 Feb 2018 15:52:27 +0000 (UTC) Received: by mail-wr0-f193.google.com with SMTP id o76so3347322wrb.7 for ; Fri, 16 Feb 2018 07:52:27 -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=v+lxLNpBiwA79udKIkHKqDgvVjYnzqaFRFA3ysf2cmo=; b=A70AIbNytbPJJ8x+qmxcd5jV5UV7AyhOUvEpLy6/SeQ4vuXT9WsQzoa2VxfCUWCFsE Wpx5iqnHFFyu3x737zeMwDsmIGSzXO7fPuBfSqYoaSA5hob2xq2GXTMnMiPV/ASs+5Td pWWMx2rKX47IHyu9zvUalISrCmas5gupAota1NBSkVFglmOxwNK2g9DpHJa6Y2laOOfk BBxf1P4mvnfU0KBeoYkbRvRQgqo0+bsTIoyk2wigUVOTYgGNnz3XuHw0fy5VYd8rTZzV ll9dzqVrI70oL/aEbFzx4fyB7b6KCBD95s6IZV0e2GaOefHMk++o6LdaLU/xiTkgpjST 1qCg== 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=v+lxLNpBiwA79udKIkHKqDgvVjYnzqaFRFA3ysf2cmo=; b=rKgVRBxrjQA7OsliK7F7SiJOyOA9lFAJwF0ihUl65WicUDYy/X+eAAMsJw0QcKl9yY q3bVdd9Pc0TW2+Jw+F4VBM6Eegli8D2BvuV/WrraL6C6us9eMmCW2CptHe8nPLVV+Xf2 F8kQMQ1YIKlbjx5MXUsu71w9sRfRDWA2ropUQThodt15NISf6Q8X/ICU6eumjzG7pQR7 E+je6gnNRiIBbEIZbpmJMcCGNJn3yLosHCSvDqkkU4tYnu9774W1k+9Hv6Y+ef65SPDi CFzN+0bIGDD/xRQ7fe8p+3ipBxhgbElYXSx1NSeWLLaIjydLqcpYpmHZuMP6Bm6uBPKP nedA== X-Gm-Message-State: APf1xPD3VIl/DtXfh0DCFV7c39W90yU3Sz/K/FLcUAinV1F/pekaWqVG AvKuyqWrnS4d6ZV2mtDjT1tzFhEUsB8= X-Google-Smtp-Source: AH8x225VafqU3fpRcpwRu3RG8jPzHt0ZQ8oqvtafzIet1e0h2zLwbDA6MFGJhXxOqGDG+AeVDmCEng== X-Received: by 10.223.133.182 with SMTP id 51mr2396408wrt.226.1518796347138; Fri, 16 Feb 2018 07:52:27 -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.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 16 Feb 2018 07:52:26 -0800 (PST) From: Alex Kiernan To: u-boot@lists.denx.de Date: Fri, 16 Feb 2018 15:50:48 +0000 Message-Id: <1518796248-28270-12-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: Chris Packham Subject: [U-Boot] [PATCH v3 11/11] Remove CONFIG_SYS_BOOTCOUNT_SINGLEWORD 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" Tidy up CONFIG_SYS_BOOTCOUNT_SINGLEWORD from the whitelist as there's no remaining uses of it left. Signed-off-by: Alex Kiernan --- Changes in v3: None Changes in v2: None scripts/config_whitelist.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 4caa94f..4112e40 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -2213,7 +2213,6 @@ CONFIG_SYS_BOARD_VERSION CONFIG_SYS_BOOK3E_HV CONFIG_SYS_BOOTCOUNT_BE CONFIG_SYS_BOOTCOUNT_LE -CONFIG_SYS_BOOTCOUNT_SINGLEWORD CONFIG_SYS_BOOTFILE_PREFIX CONFIG_SYS_BOOTMAPSZ CONFIG_SYS_BOOTM_LEN