From patchwork Mon Apr 24 11:11:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1772856 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=MTZh6j+c; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q4jCJ5cLYz23s0 for ; Mon, 24 Apr 2023 21:12:28 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7FC4486061; Mon, 24 Apr 2023 13:12:21 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="MTZh6j+c"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C271C86061; Mon, 24 Apr 2023 13:12:19 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-oa1-x33.google.com (mail-oa1-x33.google.com [IPv6:2001:4860:4864:20::33]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D111D85E7C for ; Mon, 24 Apr 2023 13:12:16 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=festevam@gmail.com Received: by mail-oa1-x33.google.com with SMTP id 586e51a60fabf-1877eda6a1eso342471fac.1 for ; Mon, 24 Apr 2023 04:12:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682334735; x=1684926735; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=+v6Cefs8YCAlloDHPPLw3KzY3VjhEo0sGu98G6vibKE=; b=MTZh6j+cKBM/3aJ/MLdPgcJRAowZ65TXOR5/z3wJAS9mW6iMwmdeL3pRHCOh+pcew9 gWyIly2yh9/OrvYxTuzlQ4CUkPP4XCKzSxGFNm1Q3y68iy3/3NDXbk9HNtkQx4o7IQRD lzdJ5W6d3uK4UKg9bH3KNxf2H9SRduxuQTLqh7Rqm1Gl+j5yfP7vVs3d7BeHpFtaJCYQ MvkRififXzrfcAC9FqfAEBhHnDLUOcciJc7oBCshl40ZxK35rtn5JMQO0F13Zo5vp9vG ZGP9n9qU8P/jaAJEhDPeOLkLhe8RmQKNnQCkFCgtPp3xaZQpiPRsSrC4Sqxt5Yk0tQUg 8uWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682334735; x=1684926735; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=+v6Cefs8YCAlloDHPPLw3KzY3VjhEo0sGu98G6vibKE=; b=P2YLlVUf3fQE9Aq0fsPRzuFaIr+5e8AiPYVXcnZVT7htkctToGlTW6Xn7T9CIXzJQ5 cMz7+89BCY+zb+TkZZMEaIycdX+lWefSaUYEq9/xiRP0s365fqkdreEMGmcTY9aICt6K IX+GYzTZN+naSss++hGER9ClHHBbRZzaIr13cu7ZUOUbPRPoXajGuJ6yHziadEcz+SzZ Z9R8Hicn8SHSJGyK6p69FWcGqOQHFvSovT+mRNKPrFmAExzwJdJmZnRXKimEQyzfchrh dyXTsAA1OCJiBGKHoE/BwSKNcxMGmex7nlUy5isLgjwBrTpnqkG1XBDjgFUPsdsckoIl 1U2A== X-Gm-Message-State: AAQBX9eLQQuDK1SR7/25OWM58EADBKjom4XiiB+K2qNSdz2dVfXdgcNx cttZUTx5NTdeaoGQHdwRX1s= X-Google-Smtp-Source: AKy350bh12FeUCdrk79DAOiEcFVSFMoObHwJMfR7Zrqsqdk3zFtEl3Kaf88bN1oAt/XmFoI1b+c56g== X-Received: by 2002:a05:6870:d10f:b0:17a:d300:fd1a with SMTP id e15-20020a056870d10f00b0017ad300fd1amr9200889oac.2.1682334735347; Mon, 24 Apr 2023 04:12:15 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b69:1d84:e533:11fa:26c6]) by smtp.gmail.com with ESMTPSA id 27-20020a4ae1bb000000b00541fbbbcd31sm2294678ooy.5.2023.04.24.04.12.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Apr 2023 04:12:14 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v3 01/13] smegw01: Enable setting additional boot params Date: Mon, 24 Apr 2023 08:11:54 -0300 Message-Id: <20230424111206.1438983-1-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean From: Eduard Strehlau Introduce EXTRA_BOOTPARAMS to allow passing additional parameters to kernel command line. This is useful for debugging purposes. Signed-off-by: Eduard Strehlau Signed-off-by: Fabio Estevam --- Changes since v2: - None include/configs/smegw01.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/configs/smegw01.h b/include/configs/smegw01.h index 11031744be..a356f095a6 100644 --- a/include/configs/smegw01.h +++ b/include/configs/smegw01.h @@ -17,6 +17,11 @@ /* MMC Config*/ #define CFG_SYS_FSL_ESDHC_ADDR 0 +/* default to no extra bootparams, we need an empty define for stringification*/ +#ifndef EXTRA_BOOTPARAMS +#define EXTRA_BOOTPARAMS +#endif + #define CFG_EXTRA_ENV_SETTINGS \ "image=zImage\0" \ "console=ttymxc0\0" \ @@ -26,7 +31,8 @@ "mmcdev=0\0" \ "mmcpart=1\0" \ "mmcargs=setenv bootargs console=${console},${baudrate} " \ - "root=/dev/mmcblk0p${mmcpart} rootwait rw\0" \ + "root=/dev/mmcblk0p${mmcpart} rootwait rw " \ + __stringify(EXTRA_BOOTPARAMS) "\0" \ "loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} boot/${image}\0" \ "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} boot/${fdtfile}\0" \ "mmcboot=echo Booting from mmc ...; " \ From patchwork Mon Apr 24 11:11:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1772857 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=dFFcOPLL; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q4jCW2zdTz23s0 for ; Mon, 24 Apr 2023 21:12:39 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 969AF86034; Mon, 24 Apr 2023 13:12:24 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="dFFcOPLL"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 71F5B8609E; Mon, 24 Apr 2023 13:12:22 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ot1-x32f.google.com (mail-ot1-x32f.google.com [IPv6:2607:f8b0:4864:20::32f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 23CE886041 for ; Mon, 24 Apr 2023 13:12:19 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=festevam@gmail.com Received: by mail-ot1-x32f.google.com with SMTP id 46e09a7af769-6a4142c11f0so1177415a34.0 for ; Mon, 24 Apr 2023 04:12:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682334737; x=1684926737; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fEfD8eTSSeoCsATV6MVZiue16Epr9j6OGDHivG3rnvk=; b=dFFcOPLLhixyHWmDeMsu+tEtmkUlpdvsQI8/sETkC8I8hzyymu+GJ77lKzInbyCryc JW2YXkJ0/xOOAgYwWaspJHqibbOrCOZA+KDTnNh7L/a01SMHCSFOZIPfwN7HKB8eehAT vA+e7Pjj+gdTx6R4VzSvNOEFJwx7RdTBWYWUsUkkpd+eDBl2ZwEJ5dmE4+F0uKAH/rdg i7VHBpczzGgmgsKCTu3dDQEQbtYIKymGJrF4fUTy2aelMonv/ek6p7XX2qC4jj3Y7iMG hKr8lEQDZOlopYaQl/2VKGKRiilYOMCpeW3PD28v26XAfNJp/4R9d7TwJiHwBY4e1Cta 6o3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682334737; x=1684926737; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fEfD8eTSSeoCsATV6MVZiue16Epr9j6OGDHivG3rnvk=; b=WyesszP3HuNa1J6nECRNJlH0HJuvSzOATtdpncjx9F7ZiU11Sfi9sxwCtZljSGDMSk 2jF6x1Bu7Dre9Dfchon3+gbBu6hKeNSM85EhEr6sg4kC8cBSQDNLNObi/YMaEkqnWxtG tpRvwnzPXXVzpPyPFayTGrGPIl0kuzIkMzYtQ7VFwvX1mH/fDnqto6g1vKwlz3UuPzgg Gau5JEpm2kUQpdimlU7Jp5no0zvE+1ykA5Txdr/KKrzllGDTskShrISS+/VVA3a1gN7f jc/extLE17dTIzQJ0EW158cJTJ6w5XVWMWK0vgDEHoyzKywKmz/QX7PFVAQx80gqt2BN NX+w== X-Gm-Message-State: AAQBX9cK8BIjxl+tVr5akRzgmC7pUHNrC8VFbABKAky8OMZ4c+TVr8R2 8KqXaxh8sWrylgZKkJXFhfk= X-Google-Smtp-Source: AKy350aIUio/P5y6Feem3Ud8TZvGKIsLy4a87hMeQg75y1e2JEpCMSNOGYxa1wyNtPS6bWFz0gvfAA== X-Received: by 2002:aca:3357:0:b0:38c:56d9:5976 with SMTP id z84-20020aca3357000000b0038c56d95976mr6640944oiz.4.1682334737556; Mon, 24 Apr 2023 04:12:17 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b69:1d84:e533:11fa:26c6]) by smtp.gmail.com with ESMTPSA id 27-20020a4ae1bb000000b00541fbbbcd31sm2294678ooy.5.2023.04.24.04.12.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Apr 2023 04:12:16 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v3 02/13] smegw01: Select CONFIG_CMD_SQUASHFS Date: Mon, 24 Apr 2023 08:11:55 -0300 Message-Id: <20230424111206.1438983-2-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230424111206.1438983-1-festevam@gmail.com> References: <20230424111206.1438983-1-festevam@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean From: Eduard Strehlau Select CONFIG_CMD_SQUASHFS so that the SquashFS U-Boot commands are available. Signed-off-by: Eduard Strehlau Signed-off-by: Fabio Estevam --- Changes since v2: - None configs/smegw01_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/smegw01_defconfig b/configs/smegw01_defconfig index 1e0b9aa5be..f15291f1dd 100644 --- a/configs/smegw01_defconfig +++ b/configs/smegw01_defconfig @@ -38,6 +38,7 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y +CONFIG_CMD_SQUASHFS=y CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y From patchwork Mon Apr 24 11:11:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1772858 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=kvVHiA7n; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q4jCn3PPlz23s0 for ; Mon, 24 Apr 2023 21:12:53 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8206286043; Mon, 24 Apr 2023 13:12:29 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="kvVHiA7n"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1AE2E86055; Mon, 24 Apr 2023 13:12:24 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-oa1-x32.google.com (mail-oa1-x32.google.com [IPv6:2001:4860:4864:20::32]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 2343286025 for ; Mon, 24 Apr 2023 13:12:21 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=festevam@gmail.com Received: by mail-oa1-x32.google.com with SMTP id 586e51a60fabf-188090ebf84so695289fac.1 for ; Mon, 24 Apr 2023 04:12:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682334740; x=1684926740; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=obWz1+5WIl28xOXJ+fdbnrxU5KC4EnCBlRYScl3ykiE=; b=kvVHiA7nJ+vBbdFHYkPFlZkEUiBPd26XEi2lwsyP87UOdEZQYd+c3AajYs7z3N3dd9 sDsPPaeztvUC16LxH1sg6qvWAfNeaHco/StPrkns1w8ELnqRmfgPLEYVpvJyeuotuCIv FIMdKD4pOUeEyuZuWDtQ/b5XIvuVZtViZLafkNVRZGwOGTYb87jBWvJlClO1egrD73SC Ngr8/cL6R1uobBCZ9e8r+z0Y3GYKT8EqIeWkS0qSZuLKXcb+buH5QcjwsrWmX27pdL2l SblD0UPculg59/9jHFMGpJjevO0SrI836b8NVRmr0wa7Hr7REcLWg8ESBEtjQ9R99Lmo 4J5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682334740; x=1684926740; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=obWz1+5WIl28xOXJ+fdbnrxU5KC4EnCBlRYScl3ykiE=; b=Wwgg2DJsT1xJL25HLdwmg8oRKp5LBoDhS2nPe5D3RDZF2S7UiTDycxBT01lGu8o4U6 3oGT8yO5kgfHL81fBkiEMhjNUPL80yI4LjjcugWrI978D/RGlqZ+/N26ziUchrSki7BM bVoiROOmW9Y4Qz3tt0ARF2ohIcB04LCh8pciOsZZDB9KnXKuAmqfdE+QG4UmtEhNlR2M bsXdYSjrs9NyMre2RsFfgqE65HS8+XZ0UA4XyG7oP30z0lJ9XfPjVhqkn8muhyVb1xFx EVnLgATMqW7CsMQ+h7XE+aAEDGvANXbDc7C4FZ0trCikMX1ZR0BJXzKMwDsJMutMw1KW N+WQ== X-Gm-Message-State: AAQBX9fYaC4uhg5HrUhUtAo87lURolHa+D4OMRz7FeCcm3jnXbJPHGBm 9oAOU4Dx2BBDZEq8Vm7QAIw= X-Google-Smtp-Source: AKy350b/33vZeIBDgDOo/BoqwsjGmo+XQxolZ35Xy++VsgntvjcI5eJHDqnLqKmR4wgyJrhe+DidPw== X-Received: by 2002:a05:6870:b419:b0:187:add0:94dd with SMTP id x25-20020a056870b41900b00187add094ddmr9011971oap.1.1682334739680; Mon, 24 Apr 2023 04:12:19 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b69:1d84:e533:11fa:26c6]) by smtp.gmail.com with ESMTPSA id 27-20020a4ae1bb000000b00541fbbbcd31sm2294678ooy.5.2023.04.24.04.12.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Apr 2023 04:12:19 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v3 03/13] smegw01: Select bootcount support Date: Mon, 24 Apr 2023 08:11:56 -0300 Message-Id: <20230424111206.1438983-3-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230424111206.1438983-1-festevam@gmail.com> References: <20230424111206.1438983-1-festevam@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean From: Eduard Strehlau Add automatic boot counter that increases after every reset. After a power-on reset, it will be initialized with 1, and each reboot will increment the value by 1. By default it is disabled if bootlimit isn't set. Signed-off-by: Eduard Strehlau Signed-off-by: Fabio Estevam --- Changes since v2: - None configs/smegw01_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/smegw01_defconfig b/configs/smegw01_defconfig index f15291f1dd..5d9d419463 100644 --- a/configs/smegw01_defconfig +++ b/configs/smegw01_defconfig @@ -46,6 +46,8 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_BOUNCE_BUFFER=y +CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_ENV=y CONFIG_DFU_MMC=y CONFIG_DM_I2C=y CONFIG_SUPPORT_EMMC_BOOT=y From patchwork Mon Apr 24 11:11:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1772859 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=GuzeFv+h; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q4jD306V7z23s0 for ; Mon, 24 Apr 2023 21:13:06 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F1ACA860B9; Mon, 24 Apr 2023 13:12:30 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="GuzeFv+h"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0E2E786040; Mon, 24 Apr 2023 13:12:26 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-ot1-x32f.google.com (mail-ot1-x32f.google.com [IPv6:2607:f8b0:4864:20::32f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 63AA68609F for ; Mon, 24 Apr 2023 13:12:22 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=festevam@gmail.com Received: by mail-ot1-x32f.google.com with SMTP id 46e09a7af769-6a4142c11f0so1177418a34.0 for ; Mon, 24 Apr 2023 04:12:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682334742; x=1684926742; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ai/xZ5/HeR63FmyRUsqPYvE9QwwV6VYGSfGUltye6Dc=; b=GuzeFv+hX8EIPKNXCzXgFr0nMi9Sc6b1Pj6y1gZK07g/Ofu5aXpFiRpyNhG5lk5OiC maSKyLKHTqqx2J0hY4eI2niK1TDWTBwnRQDfg+xOZSL2mplwt1+pIgpvoO/nH/3l1Tay MV+0MFN9yjfSNOy6ZPMi8vjpdvybF5H8ihek0lVXskxtfpvjQMZ0ZNGDeaVPCWH5El6W YhvFtwOXrfKbQBVCZU2C7Nzm4LrFGWfE0mL7L+0esUNuIyXcBwq4rB+DnPFBq8M51yVR 0Py5TkVNuIPofRcjHskAaqhDtQrd59ACsWHMGP881yUycFYbjEurz/nZ4gnEG7ElCY/5 ogzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682334742; x=1684926742; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ai/xZ5/HeR63FmyRUsqPYvE9QwwV6VYGSfGUltye6Dc=; b=GuuhALTdPLb0UvCFNG5ao8KkONA3AuUSzdyF1QKmRLL+0hbx/A24iWR3Bb28rlqRnA NxLiNRQJtvKIh7oI8pRI9ZmZyh7F/1G5D/xHC5QbMnhz4PoAtmfSOr5R/hk95gxst5mH qstPAdbVSnbZN3+8tbmLud8kB+vSFTNuKLzrcKPB6qosu1inxGiGDxnjFSsUHIkX8xSg ZHOBU9oG/vmS5QmGBvYqq8JIeuTrFHSqEeC1vGjv+EzxA77EHgt66IVF21wVu6S2Ped3 /3Hb+VgBBZzbueayAuQz7uL+MRjJA+QY/M6C7B7jQyr19qAQ2JmgObqnsyaKTzLUDzjV iSsQ== X-Gm-Message-State: AAQBX9eXleOQYB8D3dR6YzEzwExqVXhw3MioKbwX3hIpzuXI1Tw56FZ2 Q8HAZfybVBHHdGv6kqzbTEED6CJV1D+zyA== X-Google-Smtp-Source: AKy350adsHzkkfRM69seSJnCIzavlOWPkwFaUj51PzGrL3IOHMUh+vRB10QxKoOglZfRaWWcEDWXIg== X-Received: by 2002:aca:3357:0:b0:38c:56d9:5976 with SMTP id z84-20020aca3357000000b0038c56d95976mr6641015oiz.4.1682334741913; Mon, 24 Apr 2023 04:12:21 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b69:1d84:e533:11fa:26c6]) by smtp.gmail.com with ESMTPSA id 27-20020a4ae1bb000000b00541fbbbcd31sm2294678ooy.5.2023.04.24.04.12.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Apr 2023 04:12:21 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v3 04/13] smegw01: Add altbootcmd Date: Mon, 24 Apr 2023 08:11:57 -0300 Message-Id: <20230424111206.1438983-4-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230424111206.1438983-1-festevam@gmail.com> References: <20230424111206.1438983-1-festevam@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean From: Eduard Strehlau Add an altbootcmd script, which is convenient way to integrate with swupdate and perform a roll back of the previous working version in the case of update failure. Signed-off-by: Eduard Strehlau Signed-off-by: Fabio Estevam --- Changes since v2: - None configs/smegw01_defconfig | 2 +- include/configs/smegw01.h | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/configs/smegw01_defconfig b/configs/smegw01_defconfig index 5d9d419463..418151a6de 100644 --- a/configs/smegw01_defconfig +++ b/configs/smegw01_defconfig @@ -18,7 +18,7 @@ CONFIG_SYS_MEMTEST_END=0xa0000000 CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_USE_BOOTCOMMAND=y -CONFIG_BOOTCOMMAND="if run loadimage; then run mmcboot; fi; " +CONFIG_BOOTCOMMAND="if test \"${ustate}\" = 1; then setenv upgrade_available 1; saveenv; fi; if run loadimage; then run mmcboot; fi; " CONFIG_HUSH_PARSER=y CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=532 diff --git a/include/configs/smegw01.h b/include/configs/smegw01.h index a356f095a6..6ee4acc70d 100644 --- a/include/configs/smegw01.h +++ b/include/configs/smegw01.h @@ -33,6 +33,7 @@ "mmcargs=setenv bootargs console=${console},${baudrate} " \ "root=/dev/mmcblk0p${mmcpart} rootwait rw " \ __stringify(EXTRA_BOOTPARAMS) "\0" \ + "bootlimit=3\0" \ "loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} boot/${image}\0" \ "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} boot/${fdtfile}\0" \ "mmcboot=echo Booting from mmc ...; " \ @@ -40,6 +41,13 @@ "if run loadfdt; then " \ "bootz ${loadaddr} - ${fdt_addr}; " \ "fi;\0" \ + "altbootcmd=echo Performing rollback...; " \ + "if test \"${mmcpart}\" = 1; then " \ + "setenv mmcpart 2; " \ + "else " \ + "setenv mmcpart 1; " \ + "fi; setenv bootcount 0; setenv upgrade_available; setenv ustate 3; saveenv; " \ + "run bootcmd;\0" /* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR From patchwork Mon Apr 24 11:11:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1772860 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=SfQTNeNj; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q4jDH3MFVz23s0 for ; Mon, 24 Apr 2023 21:13:19 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0519B86040; Mon, 24 Apr 2023 13:12:39 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="SfQTNeNj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 30D7386065; Mon, 24 Apr 2023 13:12:29 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-ot1-x32e.google.com (mail-ot1-x32e.google.com [IPv6:2607:f8b0:4864:20::32e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D2C7D86043 for ; Mon, 24 Apr 2023 13:12:25 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=festevam@gmail.com Received: by mail-ot1-x32e.google.com with SMTP id 46e09a7af769-6a5f57c64ceso677905a34.1 for ; Mon, 24 Apr 2023 04:12:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682334744; x=1684926744; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cxel8H4F39ST1CDEeq8qapt3LyGS0joyZ9YAhlzBxVU=; b=SfQTNeNjG5ZxgPtHsnrhba6avcPZpmJc2JH97Sr2A6+ibp6qYap3tTSK5IfNhXutj9 eG6UMrky4Y3G2haQ4HIhN98tdkG/ESfClg1XMALrH2qwBL5l6O6J6xWdtjvlqirljWt3 QNxpUhITDKnboOCV6yLOIMsZDf86Vb2h9v5XpLgYoDQocEH5pNFQv1WoeRaqdfj/c+qT JhDdZGfTSLilquds5E5JzcwU5c0vBfIW0xSokVy8lBitbwaHa8AkPawjrpWFLX+EIVAt /nL+9aMiZIW10oKYJ6E6hBn2yPAhqUrsqIvBGWP8EBr0jZAJTVn1j3GnE7iCCzbmpqMs R4+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682334744; x=1684926744; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cxel8H4F39ST1CDEeq8qapt3LyGS0joyZ9YAhlzBxVU=; b=KY3bzJ+i9CvJoxy0YfC4DHzHbLHF5xbrI7YwZQkqmKTifjHZO7yU1WTb4dlQk+8UlI pVTzjx45YZhj8cvtltFLFsYyO7c8Y/9RSzvI9xVbulDubjbHigWcp07rChxy+W7tphN8 EwA6d+NclWIFJuPiaKoIHrERy1Y/XTypVsFB5UeUmotbklVHGD1UC3XGePswNhnPLtJ+ vMSA7IJ1raYf5YRf5ULDOFIsGPQUQOaxYdCeTaX6s/lVN10n59yfX18FxgpIf9KKroxd 97e0hoD7n58zQqPUEqEj/plx8EbdaT40e2gnjiNLXdjtwefdthz2UdttUIcg6Qrm8MY6 7qkg== X-Gm-Message-State: AAQBX9ds2+Xh8O1pAiKnfpU7RZG8m+d4uM21oUnH1LjZ/phDL532cxW6 XRGJvtQW9d8uRddpJpTreH4= X-Google-Smtp-Source: AKy350Y02dzSW4BhEZF58032MIjMlb6ciUT/ordCeqd37Dhr6JcHai7D68+/yN5Rxde3pZkurkcdzg== X-Received: by 2002:a05:6870:fb90:b0:18e:8d82:5c19 with SMTP id kv16-20020a056870fb9000b0018e8d825c19mr2987996oab.1.1682334744278; Mon, 24 Apr 2023 04:12:24 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b69:1d84:e533:11fa:26c6]) by smtp.gmail.com with ESMTPSA id 27-20020a4ae1bb000000b00541fbbbcd31sm2294678ooy.5.2023.04.24.04.12.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Apr 2023 04:12:23 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v3 05/13] smegw01: Run altbootcmd in the case of failure Date: Mon, 24 Apr 2023 08:11:58 -0300 Message-Id: <20230424111206.1438983-5-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230424111206.1438983-1-festevam@gmail.com> References: <20230424111206.1438983-1-festevam@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean From: Eduard Strehlau Run the altbootcmd script if any step of bootcmd fails. This ensures that always a valid image can be run. Signed-off-by: Eduard Strehlau Signed-off-by: Fabio Estevam --- Changes since v2: - None configs/smegw01_defconfig | 2 +- include/configs/smegw01.h | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/configs/smegw01_defconfig b/configs/smegw01_defconfig index 418151a6de..b3580d5d6e 100644 --- a/configs/smegw01_defconfig +++ b/configs/smegw01_defconfig @@ -18,7 +18,7 @@ CONFIG_SYS_MEMTEST_END=0xa0000000 CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_USE_BOOTCOMMAND=y -CONFIG_BOOTCOMMAND="if test \"${ustate}\" = 1; then setenv upgrade_available 1; saveenv; fi; if run loadimage; then run mmcboot; fi; " +CONFIG_BOOTCOMMAND="if test \"${ustate}\" = 1; then setenv upgrade_available 1; saveenv; fi; if run loadimage; then run mmcboot; else run altbootcmd; fi; " CONFIG_HUSH_PARSER=y CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=532 diff --git a/include/configs/smegw01.h b/include/configs/smegw01.h index 6ee4acc70d..05edaac42f 100644 --- a/include/configs/smegw01.h +++ b/include/configs/smegw01.h @@ -39,7 +39,13 @@ "mmcboot=echo Booting from mmc ...; " \ "run mmcargs; " \ "if run loadfdt; then " \ - "bootz ${loadaddr} - ${fdt_addr}; " \ + "if bootz ${loadaddr} - ${fdt_addr}; then " \ + "; " \ + "else " \ + "run altbootcmd; " \ + "fi;" \ + "else " \ + "run altbootcmd; " \ "fi;\0" \ "altbootcmd=echo Performing rollback...; " \ "if test \"${mmcpart}\" = 1; then " \ From patchwork Mon Apr 24 11:11:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1772861 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=GhZ+89CP; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q4jDW55XCz23s0 for ; Mon, 24 Apr 2023 21:13:31 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5CAC186114; Mon, 24 Apr 2023 13:12:43 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="GhZ+89CP"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 07B2C860C0; Mon, 24 Apr 2023 13:12:31 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-oa1-x34.google.com (mail-oa1-x34.google.com [IPv6:2001:4860:4864:20::34]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 05796860A5 for ; Mon, 24 Apr 2023 13:12:28 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=festevam@gmail.com Received: by mail-oa1-x34.google.com with SMTP id 586e51a60fabf-187e0ec513eso474146fac.1 for ; Mon, 24 Apr 2023 04:12:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682334746; x=1684926746; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MF/GVEvlybo7v/q5XDupyBFVaSxueSUqL42JZR3WrmY=; b=GhZ+89CPQa8YdQ+giGeUPSA+3m9HDbqmZdTNJiNre0PHsMfpXtiCQqIOiIVxaYjC4C 1JN4N/tOVAWjlMwQBnW3a91m8Ym+j1Jh5Dv0Ec8SHI8TzdDU2lU8tJPhZwfeZe+d4WTY cS44NFfJoiVTlg1gXi2dvV6pQi3iKlKxtxl2gP4Y2byhlQ9wMxZ7N2LvDfRDAEj0T9LD 4dBPbjZlJePtCODtNIH1fjHwT572f4F2LpWTo47zCGhCu2ZpCbHlOdrZs6/ilNI67yjH i19zuQvAz19zgEVAUEtDRvapARmlOuPMdAvbDo9KKJ+YJjDLKW7/5sRBQhSNUI2S9lqG jClQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682334746; x=1684926746; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MF/GVEvlybo7v/q5XDupyBFVaSxueSUqL42JZR3WrmY=; b=H4WgrIpIb0kwPYtbqTyriKmQjyCyn1qqnDrZnbTFiYTOnBKFfi4uymHitByOR2ZnkZ aU9Q3llBc4Xf40NsYsUzcavgUhJXgFj3VlfFQyxHy11WnhzwGDncsYT6uDXX/g1kjJmd qLmM8P2dNH35PjAItBhIvhMGhsyVFlMQCOCu/VG1oq8yQViIDzvhBbX6Zx+p2OYraMIm ehWBXSSfXBrocpRrgf+IreoniqTUcO+5iMVk+l3X/3kYjcxg0fMtXt6P0x/22iI8oR3S hjoT/9JKxYmfZ1AYp9B2C/fAbwrbm3iw3EICc72vqTZCzFIL92sD7QbB2zMQ5pm0N7aU QfXw== X-Gm-Message-State: AAQBX9cWjw9HvWHcXcnM7a571Pz8BeE4N2gxJOQ2ONCMz3WVvEj4+b2Z 5wa3L4/uNjuoqmSM1OxorJw= X-Google-Smtp-Source: AKy350Zv+Nzr7m5Hv+A3Le9inmawJMUOrpccxAdaBJ00FtFklakK56+drXBZw4CDKVin7SdIevwTLQ== X-Received: by 2002:a05:6870:a182:b0:18e:2bb2:3f95 with SMTP id a2-20020a056870a18200b0018e2bb23f95mr5905610oaf.4.1682334746479; Mon, 24 Apr 2023 04:12:26 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b69:1d84:e533:11fa:26c6]) by smtp.gmail.com with ESMTPSA id 27-20020a4ae1bb000000b00541fbbbcd31sm2294678ooy.5.2023.04.24.04.12.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Apr 2023 04:12:25 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v3 06/13] smegw01: Only commit to new partition if update was successful Date: Mon, 24 Apr 2023 08:11:59 -0300 Message-Id: <20230424111206.1438983-6-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230424111206.1438983-1-festevam@gmail.com> References: <20230424111206.1438983-1-festevam@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean From: Eduard Strehlau When performing rootfs update via swupdate, it is convenient to check the 'ustate' variable to decide whether the update succeeded or not. Signed-off-by: Eduard Strehlau Signed-off-by: Fabio Estevam --- Changes since v2: - None include/configs/smegw01.h | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/include/configs/smegw01.h b/include/configs/smegw01.h index 05edaac42f..277c828d0e 100644 --- a/include/configs/smegw01.h +++ b/include/configs/smegw01.h @@ -30,13 +30,19 @@ "bootm_size=0x10000000\0" \ "mmcdev=0\0" \ "mmcpart=1\0" \ + "mmcpart_committed=1\0" \ "mmcargs=setenv bootargs console=${console},${baudrate} " \ - "root=/dev/mmcblk0p${mmcpart} rootwait rw " \ + "root=/dev/mmcblk0p${mmcpart_committed} rootwait rw " \ __stringify(EXTRA_BOOTPARAMS) "\0" \ + "commit_mmc=if test \"${ustate}\" = 1 -a \"${mmcpart}\" != \"${mmcpart_committed}\"; then " \ + "setenv mmcpart_committed ${mmcpart};" \ + "saveenv;" \ + "fi;\0" \ "bootlimit=3\0" \ - "loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} boot/${image}\0" \ - "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} boot/${fdtfile}\0" \ + "loadimage=load mmc ${mmcdev}:${mmcpart_committed} ${loadaddr} boot/${image}\0" \ + "loadfdt=load mmc ${mmcdev}:${mmcpart_committed} ${fdt_addr} boot/${fdtfile}\0" \ "mmcboot=echo Booting from mmc ...; " \ + "run commit_mmc; " \ "run mmcargs; " \ "if run loadfdt; then " \ "if bootz ${loadaddr} - ${fdt_addr}; then " \ @@ -48,10 +54,12 @@ "run altbootcmd; " \ "fi;\0" \ "altbootcmd=echo Performing rollback...; " \ - "if test \"${mmcpart}\" = 1; then " \ + "if test \"${mmcpart_committed}\" = 1; then " \ "setenv mmcpart 2; " \ + "setenv mmcpart_committed 2;" \ "else " \ "setenv mmcpart 1; " \ + "setenv mmcpart_committed 1;" \ "fi; setenv bootcount 0; setenv upgrade_available; setenv ustate 3; saveenv; " \ "run bootcmd;\0" From patchwork Mon Apr 24 11:12:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1772862 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=hQ6ENg7b; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q4jDm2N15z23s0 for ; Mon, 24 Apr 2023 21:13:44 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 72105860B4; Mon, 24 Apr 2023 13:12:46 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="hQ6ENg7b"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A890E860D4; Mon, 24 Apr 2023 13:12:33 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-oa1-x2c.google.com (mail-oa1-x2c.google.com [IPv6:2001:4860:4864:20::2c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 507FB86040 for ; Mon, 24 Apr 2023 13:12:30 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=festevam@gmail.com Received: by mail-oa1-x2c.google.com with SMTP id 586e51a60fabf-18802d14ba7so633858fac.0 for ; Mon, 24 Apr 2023 04:12:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682334749; x=1684926749; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0pdPxfzZg9jOB3vUQrQIE5nGMp+t15k9Fm8Qf9hQ4aQ=; b=hQ6ENg7bAjNNfW7zhBOTZHwhd2fPQoShPYpkixAfWdisDO5GgJdq8epiyzLvHxqxq2 KldyERFVBTcue5vVhWl0B+7D6y2zWevZLnwIU7VAik6E2RqxzFN74559/hWIXPp+H/+l R8QkpVrcqyjJYYzon+3v0RcMS+yu26Dh94vjJ+7Zxqt/qBrnBx9IZdtvlfpwac/VfefQ p9F7n0W+1sr1djGGmplBWVUMTTLCfj+WU6B3/kuRYJkYrStf/qHiSboeh8qqjw6fwBQ3 A8hCA3zFdMtSdEekhE3J82cJP22Uot3vObLfGGdtnqu1+7A+/xU2ZfmA/BetIYcDzTiF qCMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682334749; x=1684926749; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0pdPxfzZg9jOB3vUQrQIE5nGMp+t15k9Fm8Qf9hQ4aQ=; b=LzEj+vi4kq84ZOd8IXyZgtDNh8CSP0+a/LkRg2wI+gUbiimnoM/jPBTKKPcaxInRxl Jd7V/tACxlridKmdp5Ni2fXeJL/uNYtQJa65HumWWdj0vNImbR5V6jdEMphzCbNO94RS e0w5VDiJ+ZydfeAh5OuefTKtU292OcXVS8eUv10CBro7mDpm60CrEDrZbuxjKgZLv9+6 zipBLpmXNtOGf1szryyTYS0rOhaJ9LN8iIyowcUqo7H+HTIG7s4nOSytBxIO3MXWa/08 9ciyAScT8hGr9XReRYNZPR3+xAH8+f0owMi2i2DMKyThz35HfcoZ9qGeekjss4ZDDaHy T+zQ== X-Gm-Message-State: AAQBX9ekh4PgY/fAVFPSSl9iwIQuExVcZKpo7ROetrM/32LaJ+VKDcXv SDYgEjPpw/tbNuJJAz6/TTE= X-Google-Smtp-Source: AKy350ZTXnfhv9hZ0Me9QCS22y4uI4A1SYZludI2+iXcCXux7bK828TrsaNoqJF/oPFddYJpNnborg== X-Received: by 2002:aca:e08a:0:b0:386:9c02:89eb with SMTP id x132-20020acae08a000000b003869c0289ebmr6913980oig.3.1682334748783; Mon, 24 Apr 2023 04:12:28 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b69:1d84:e533:11fa:26c6]) by smtp.gmail.com with ESMTPSA id 27-20020a4ae1bb000000b00541fbbbcd31sm2294678ooy.5.2023.04.24.04.12.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Apr 2023 04:12:28 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam , =?utf-8?q?Pali_Roh=C3=A1r?= Subject: [PATCH v3 07/13] smegw01: Enable EMMC boot from multiple partitions Date: Mon, 24 Apr 2023 08:12:00 -0300 Message-Id: <20230424111206.1438983-7-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230424111206.1438983-1-festevam@gmail.com> References: <20230424111206.1438983-1-festevam@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean From: Eduard Strehlau GPT Partition labels are used for determining the right root filesystem to boot from. The U-Boot environment is configured to reside in the eMMC hardware boot partition we are currently booted from. This should enable a dual copy approach for upgrading the bootloader. One can overwrite the inactive hardware partition with new bootloader and environment and afterwards switch the eMMC boot partition for an atomic bootloader switch. Signed-off-by: Eduard Strehlau Signed-off-by: Fabio Estevam --- Changes since v2: - Use the same board_mmc_get_env_part() implementations as board/purism/librem5/librem5.c. Cc: Pali Rohár board/storopack/smegw01/smegw01.c | 10 ++++++++++ configs/smegw01_defconfig | 2 ++ include/configs/smegw01.h | 12 ++++++++---- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/board/storopack/smegw01/smegw01.c b/board/storopack/smegw01/smegw01.c index e6bff80e5565..7d4de9326d6f 100644 --- a/board/storopack/smegw01/smegw01.c +++ b/board/storopack/smegw01/smegw01.c @@ -17,6 +17,7 @@ #include #include #include +#include DECLARE_GLOBAL_DATA_PTR; @@ -93,3 +94,12 @@ int board_late_init(void) return 0; } + +uint board_mmc_get_env_part(struct mmc *mmc) +{ + uint part = EXT_CSD_EXTRACT_BOOT_PART(mmc->part_config); + + if (part == 7) + part = 0; + return part; +} diff --git a/configs/smegw01_defconfig b/configs/smegw01_defconfig index b3580d5d6e54..54cf1cfc1f1b 100644 --- a/configs/smegw01_defconfig +++ b/configs/smegw01_defconfig @@ -30,6 +30,7 @@ CONFIG_CMD_MEMTEST=y CONFIG_CMD_UNZIP=y CONFIG_CMD_DFU=y CONFIG_CMD_GPIO=y +CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_PART=y CONFIG_CMD_DHCP=y @@ -44,6 +45,7 @@ CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_NET_RANDOM_ETHADDR=y CONFIG_BOUNCE_BUFFER=y CONFIG_BOOTCOUNT_LIMIT=y diff --git a/include/configs/smegw01.h b/include/configs/smegw01.h index 277c828d0e07..71f2d9c8e85c 100644 --- a/include/configs/smegw01.h +++ b/include/configs/smegw01.h @@ -32,17 +32,21 @@ "mmcpart=1\0" \ "mmcpart_committed=1\0" \ "mmcargs=setenv bootargs console=${console},${baudrate} " \ - "root=/dev/mmcblk0p${mmcpart_committed} rootwait rw " \ - __stringify(EXTRA_BOOTPARAMS) "\0" \ + "root=/dev/mmcblk${mmcdev}p${gpt_partition_entry} rootwait rw " \ + __stringify(EXTRA_BOOTPARAMS) " SM_ROOT_DEV=${mmcdev} SM_ROOT_PART=${gpt_partition_entry} SM_BOOT_PART=${boot_part}\0" \ "commit_mmc=if test \"${ustate}\" = 1 -a \"${mmcpart}\" != \"${mmcpart_committed}\"; then " \ "setenv mmcpart_committed ${mmcpart};" \ "saveenv;" \ "fi;\0" \ "bootlimit=3\0" \ - "loadimage=load mmc ${mmcdev}:${mmcpart_committed} ${loadaddr} boot/${image}\0" \ - "loadfdt=load mmc ${mmcdev}:${mmcpart_committed} ${fdt_addr} boot/${fdtfile}\0" \ + "loadimage=load mmc ${mmcdev}#rootfs-${mmcpart_committed} ${loadaddr} boot/${image}\0" \ + "loadfdt=load mmc ${mmcdev}#rootfs-${mmcpart_committed} ${fdt_addr} boot/${fdtfile}\0" \ + "loadpart=gpt setenv mmc ${mmcdev} rootfs-${mmcpart_committed}\0" \ + "loadbootpart=mmc partconf 1 boot_part\0" \ "mmcboot=echo Booting from mmc ...; " \ "run commit_mmc; " \ + "run loadpart; " \ + "run loadbootpart; " \ "run mmcargs; " \ "if run loadfdt; then " \ "if bootz ${loadaddr} - ${fdt_addr}; then " \ From patchwork Mon Apr 24 11:12:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1772863 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=nNGCnIFw; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q4jF072Dxz23s0 for ; Mon, 24 Apr 2023 21:13:56 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 439DE86131; Mon, 24 Apr 2023 13:12:48 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="nNGCnIFw"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6456986102; Mon, 24 Apr 2023 13:12:35 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-oa1-x2c.google.com (mail-oa1-x2c.google.com [IPv6:2001:4860:4864:20::2c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 7E862860A8 for ; Mon, 24 Apr 2023 13:12:31 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=festevam@gmail.com Received: by mail-oa1-x2c.google.com with SMTP id 586e51a60fabf-18802d14ba7so633861fac.0 for ; Mon, 24 Apr 2023 04:12:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682334751; x=1684926751; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LfqwvJ0mfL5EysIjAs+EXHUMHzi2Opgh7zjCp+b6QiQ=; b=nNGCnIFwIP4KFBpmR9Xy79w8Fn8abcpm/nCuGmywumBqe0ProwA7R/FICOcfysQcJA LavK72MV0NLzNf7n8k3Hly4JBnNjKiDw3cE8gjUaGrv7/8aodoJA1zXe838l/Fs3aU0y NInEcXpunj2SvCIyrV7UjDjwK9MEFSOr8jZIJBSWmYd9NklmjbNvMPRisOn7JsHlvzoX eq7xTj0snULAYIk29OkQbyNKaPYILPiY1DfHwIvynCX/IPk7YIkDkUsD21sTbsSJgYVw lABxBjMifaDONwhoTZLPSO660zl9nFM+nCwacz5NfWIGClVMj6SpYCm2sywTgiyKLdhp b6NQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682334751; x=1684926751; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LfqwvJ0mfL5EysIjAs+EXHUMHzi2Opgh7zjCp+b6QiQ=; b=OZhgN+y62B3ZnBNLqJLSHRybLKay7YSD2fKX9jTnmqUp/HIfJk05cC+aFJIZ4wH5cS rKOUPek2D47ylfCjflAWmLthOk3b5Qj7DQ+XZzEgGHv9JHZfzQOmUe9MavUNZfHF2LkY DZzYFlq1G3dbpxKE5rSAYjwj1znsN67Ekcx1ggu+DNtqJQHxdTWSwugZzE7/1dr7Owbt AuD/SRJ+HKXjPBMqwjapBxVAxX9R7Emhx8KsfVZiMWPNyEjTXzLAG3MkI9t58xCDXECH yOZEuxcQQ3Xyb+WfC9EJX2AfPvxNlXp94SVBrQBzeJVQurRS0OKAFYVSaDGPjuSLJnnE +GLA== X-Gm-Message-State: AAQBX9fnyC2IU8ZrhHFVj00NTCuXq6EJ75u6hzTyDuO/aU5BaeU0kKCv 5+2e70i07vP1Q/+bVU1P63349SbAmkLA5A== X-Google-Smtp-Source: AKy350a4R2L1W5i68/PSdtPgkelsneC+La93QQ8x91cVaiq/57NxtSkcOTDeWRt3vVjuIUfqv+nEQQ== X-Received: by 2002:a4a:a845:0:b0:545:7571:cae2 with SMTP id p5-20020a4aa845000000b005457571cae2mr6450268oom.1.1682334751015; Mon, 24 Apr 2023 04:12:31 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b69:1d84:e533:11fa:26c6]) by smtp.gmail.com with ESMTPSA id 27-20020a4ae1bb000000b00541fbbbcd31sm2294678ooy.5.2023.04.24.04.12.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Apr 2023 04:12:30 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v3 08/13] smegw01: Change default boot device to eMMC Date: Mon, 24 Apr 2023 08:12:01 -0300 Message-Id: <20230424111206.1438983-8-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230424111206.1438983-1-festevam@gmail.com> References: <20230424111206.1438983-1-festevam@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean From: Eduard Strehlau Let eMMC be the default boot medium. Signed-off-by: Eduard Strehlau Signed-off-by: Fabio Estevam --- Changes since v2: - None include/configs/smegw01.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/smegw01.h b/include/configs/smegw01.h index 71f2d9c8e8..8f68472f5b 100644 --- a/include/configs/smegw01.h +++ b/include/configs/smegw01.h @@ -28,7 +28,7 @@ "fdtfile=imx7d-smegw01.dtb\0" \ "fdt_addr=0x83000000\0" \ "bootm_size=0x10000000\0" \ - "mmcdev=0\0" \ + "mmcdev=1\0" \ "mmcpart=1\0" \ "mmcpart_committed=1\0" \ "mmcargs=setenv bootargs console=${console},${baudrate} " \ From patchwork Mon Apr 24 11:12:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1772864 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=h86833qT; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q4jFF6CVGz23s0 for ; Mon, 24 Apr 2023 21:14:09 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 16FD986136; Mon, 24 Apr 2023 13:12:51 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="h86833qT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 990958610B; Mon, 24 Apr 2023 13:12:38 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-ot1-x32d.google.com (mail-ot1-x32d.google.com [IPv6:2607:f8b0:4864:20::32d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id BCA45860F4 for ; Mon, 24 Apr 2023 13:12:34 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=festevam@gmail.com Received: by mail-ot1-x32d.google.com with SMTP id 46e09a7af769-6a6091ef0easo1177243a34.1 for ; Mon, 24 Apr 2023 04:12:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682334753; x=1684926753; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=teZFNYyLV88OiMWp1wlvwGutRiqUi4490XQBVN77Ny0=; b=h86833qTrJBEfcVzHCZIqPp6/uj+Hu25/5JpMLT7rOuyOC2Dl3jfEwKKqEjMNCrKAQ OTXM0BXkrKgPaGkbBWc/JPenjrCljawjSvZMvoNOF06KXOkSAlFLqFo4bb4EUEnMTeH4 IQVuKrzzWxRM+YmbXEtbKu2xLAqhNGQMr1gqpqcu0xhKjubBPLZGFK4bDno5Dk69Qzc/ nGTxiy3n70sti53sLTt9Uwwo0UZFg1tDZrF2uzD2h9l58a2xXXiR6VVsQyC/szawjsjf c3SdjEBzXIw6VemcMYKrDrvARh4sAAXCvj1GS9HHqFgvdg3p6NRifTSfKQ14epz41Ejb tc4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682334753; x=1684926753; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=teZFNYyLV88OiMWp1wlvwGutRiqUi4490XQBVN77Ny0=; b=ZoqtOCAgbPw6WD+sZk+2glwFLxmzLXF1qP9K6GSIALAp2bssktUlKXP1fnUFzY8j11 sI3G6mfPJTXucWrNrbOVuvTYs68OOOzYui7kI8F3esrntItMP+2QzxP07baSJheWU1ow jhJ4PpmgEUL9x/CxYs4R+y/AhPIcpfB/6+kWWpVOSEQl12l9AL8oYDjAu8mZjGD2IX7S Y3TuXlY+rxAs0dkFtUNCf8DmzNPK2eWwkU4f1Dc/cmgisseH9DIGoUZAyop2+jTOl5vN 4JbQNBZwLMxsk1/a6ppFjjFR3l9/TeEQmu3SZLTW11oo0iX2lvmVHuZGYYxVJx4e7h/B MNzA== X-Gm-Message-State: AAQBX9e3W3nJlx2OLn+PjkFd6JSGeO5hYBu8rvxc97chs9QVFO80yYNL VBL+UJeMH9mtLagE7Avl3UI= X-Google-Smtp-Source: AKy350ZY+w2lNk4loX8U58w0a/ndkMbJkSunJFMDIE84ZHA4cBvl842lrtQv0A9+Car5sCjrguNZBg== X-Received: by 2002:a4a:bb11:0:b0:547:92c9:e30b with SMTP id f17-20020a4abb11000000b0054792c9e30bmr1346678oop.1.1682334753192; Mon, 24 Apr 2023 04:12:33 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b69:1d84:e533:11fa:26c6]) by smtp.gmail.com with ESMTPSA id 27-20020a4ae1bb000000b00541fbbbcd31sm2294678ooy.5.2023.04.24.04.12.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Apr 2023 04:12:32 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v3 09/13] smegw01: Switch to fitImage Date: Mon, 24 Apr 2023 08:12:02 -0300 Message-Id: <20230424111206.1438983-9-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230424111206.1438983-1-festevam@gmail.com> References: <20230424111206.1438983-1-festevam@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean From: Eduard Strehlau Instead of loading the zImage kernel and the devicetree separately, switch to the fitImage format, which is more convenient when working with secure boot, for example. Signed-off-by: Eduard Strehlau Signed-off-by: Fabio Estevam --- Changes since v2: - None include/configs/smegw01.h | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/include/configs/smegw01.h b/include/configs/smegw01.h index 8f68472f5b..8521883277 100644 --- a/include/configs/smegw01.h +++ b/include/configs/smegw01.h @@ -23,7 +23,7 @@ #endif #define CFG_EXTRA_ENV_SETTINGS \ - "image=zImage\0" \ + "image=fitImage\0" \ "console=ttymxc0\0" \ "fdtfile=imx7d-smegw01.dtb\0" \ "fdt_addr=0x83000000\0" \ @@ -39,8 +39,8 @@ "saveenv;" \ "fi;\0" \ "bootlimit=3\0" \ - "loadimage=load mmc ${mmcdev}#rootfs-${mmcpart_committed} ${loadaddr} boot/${image}\0" \ - "loadfdt=load mmc ${mmcdev}#rootfs-${mmcpart_committed} ${fdt_addr} boot/${fdtfile}\0" \ + "fit_addr=0x88000000\0" \ + "loadimage=load mmc ${mmcdev}#rootfs-${mmcpart_committed} ${fit_addr} boot/${image}\0" \ "loadpart=gpt setenv mmc ${mmcdev} rootfs-${mmcpart_committed}\0" \ "loadbootpart=mmc partconf 1 boot_part\0" \ "mmcboot=echo Booting from mmc ...; " \ @@ -48,12 +48,8 @@ "run loadpart; " \ "run loadbootpart; " \ "run mmcargs; " \ - "if run loadfdt; then " \ - "if bootz ${loadaddr} - ${fdt_addr}; then " \ - "; " \ - "else " \ - "run altbootcmd; " \ - "fi;" \ + "if bootm ${fit_addr}; then " \ + "; " \ "else " \ "run altbootcmd; " \ "fi;\0" \ From patchwork Mon Apr 24 11:12:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1772865 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=Ko6rgp0f; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q4jFV2PVfz23s0 for ; Mon, 24 Apr 2023 21:14:22 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AA06A86061; Mon, 24 Apr 2023 13:12:55 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Ko6rgp0f"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E9397860C0; Mon, 24 Apr 2023 13:12:42 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-oi1-x233.google.com (mail-oi1-x233.google.com [IPv6:2607:f8b0:4864:20::233]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D6DD6860C8 for ; Mon, 24 Apr 2023 13:12:36 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=festevam@gmail.com Received: by mail-oi1-x233.google.com with SMTP id 5614622812f47-38c629026b4so44740b6e.1 for ; Mon, 24 Apr 2023 04:12:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682334755; x=1684926755; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fKaMSdfhZ9h0SKfDqTiJ8+nQ46tH95G16cen0fSoX44=; b=Ko6rgp0fX16ys83w4Frnrm9pl0tn3wHRZtSgBiTIZRpiDuq0XPwR84ELn0W9GIQMzZ Dak/X1ba2PyV4hQVNsIF2+7JI3iuS/o3wRHGaVMSRxZ3Vg/i0g9ndrQ+Uz2U2M1LPqXH zVbqRbv3GIMcZ5Mxl2kXB4JwVyb5PXRwD7rPNQ98CmJut6UpYviw4WMLV0kwZmFF0zd6 GGT8Mfzp3fFjMU1JlDlrFos5qdyKG5d260uo29qLc6fhcfGR1ZJLyLjD3/yGL1ehiRBU hMWZyJqTP4tXXvdNfXR8psXb+SG/XcZGY0aenAWEB8dKHmU9dQErO/3Dw1gXXX9jUn1s RI3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682334755; x=1684926755; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fKaMSdfhZ9h0SKfDqTiJ8+nQ46tH95G16cen0fSoX44=; b=SrRsJ9KQLmAzKTyApZgCKlnt9LkQHovlV8CferafIjvtYC11MvO5SzKB3qqZ+4ViT4 /yd3Lz+chXmWR6wCPnoZYhpTDH9KQdvcm38lBRLancz5hAt9s6O6Mrzr/G9gXEURe443 q8LGx16RRYzkS2FrWFvNc8LJGi3IttCXEd/phdolp+Q+1H0qO4LgbreCSagFmQv51XpR plAjpmQepqTFYu9PDTWCp2kda/oql1Om8OOsdB0xYk5eTTqwa93546oKuaFWu9sVRZHl SkRd3tAEW18qnFM3CKq2MQ99GmDkZXcYuK4jvMu8b0pjSDHgK9QraGkIGetoAfHVgRDU BlpA== X-Gm-Message-State: AAQBX9dxdGSB9CNzMQm3eUqXXdfW6y+SEyzVP1DZjJG0ktCi8d9ldjzP uqvBOBQEPTZ0yeL3ZAyVqOc= X-Google-Smtp-Source: AKy350ZCJAPtnJBdH3SJ6CSUrbhlQl1GYiZHYx6bGCiLy1+Y0KpKU2u6sOg0NSopxXjxeCsc68qdbA== X-Received: by 2002:a4a:e04c:0:b0:547:12df:5daa with SMTP id v12-20020a4ae04c000000b0054712df5daamr7065759oos.1.1682334755216; Mon, 24 Apr 2023 04:12:35 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b69:1d84:e533:11fa:26c6]) by smtp.gmail.com with ESMTPSA id 27-20020a4ae1bb000000b00541fbbbcd31sm2294678ooy.5.2023.04.24.04.12.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Apr 2023 04:12:34 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v3 10/13] smegw01: Add lockdown U-Boot env support Date: Mon, 24 Apr 2023 08:12:03 -0300 Message-Id: <20230424111206.1438983-10-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230424111206.1438983-1-festevam@gmail.com> References: <20230424111206.1438983-1-festevam@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean From: Eduard Strehlau Add lockdown U-Boot env support so that only certain U-Boot environment variables are allowed to be modified. Signed-off-by: Eduard Strehlau Signed-off-by: Fabio Estevam --- Changes since v2: - None board/storopack/smegw01/Kconfig | 7 +++++ board/storopack/smegw01/smegw01.c | 17 +++++++++++ configs/smegw01_defconfig | 11 ++++++- include/configs/smegw01.h | 48 +++++++++++++++++++++++++++++-- 4 files changed, 79 insertions(+), 4 deletions(-) diff --git a/board/storopack/smegw01/Kconfig b/board/storopack/smegw01/Kconfig index d8f24695d0..390214c285 100644 --- a/board/storopack/smegw01/Kconfig +++ b/board/storopack/smegw01/Kconfig @@ -12,4 +12,11 @@ config SYS_CONFIG_NAME config IMX_CONFIG default "board/storopack/smegw01/imximage.cfg" +config SYS_BOOT_LOCKED + bool "Lock boot process to EMMC" + default y + help + Say N here if you want to boot from eMMC and SD. + Say Y to boot from eMMC. + endif diff --git a/board/storopack/smegw01/smegw01.c b/board/storopack/smegw01/smegw01.c index 9482f88773..e786429476 100644 --- a/board/storopack/smegw01/smegw01.c +++ b/board/storopack/smegw01/smegw01.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -113,3 +114,19 @@ uint mmc_get_env_part(struct mmc *mmc) return part; } + +enum env_location env_get_location(enum env_operation op, int prio) +{ + if (op == ENVOP_SAVE || op == ENVOP_ERASE) + return ENVL_MMC; + + switch (prio) { + case 0: + return ENVL_NOWHERE; + + case 1: + return ENVL_MMC; + } + + return ENVL_UNKNOWN; +} diff --git a/configs/smegw01_defconfig b/configs/smegw01_defconfig index 54cf1cfc1f..ea25b3b87c 100644 --- a/configs/smegw01_defconfig +++ b/configs/smegw01_defconfig @@ -7,6 +7,7 @@ CONFIG_ENV_OFFSET=0x100000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx7d-smegw01" CONFIG_TARGET_SMEGW01=y +# CONFIG_SYS_BOOT_LOCKED is not set CONFIG_ENV_OFFSET_REDUND=0x110000 CONFIG_ARMV7_BOOT_SEC_DEFAULT=y # CONFIG_ARMV7_VIRT is not set @@ -17,13 +18,18 @@ CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0xa0000000 CONFIG_FIT=y CONFIG_FIT_VERBOSE=y +CONFIG_AUTOBOOT_MENU_SHOW=y +CONFIG_BOOTMENU_DISABLE_UBOOT_CONSOLE=y CONFIG_USE_BOOTCOMMAND=y -CONFIG_BOOTCOMMAND="if test \"${ustate}\" = 1; then setenv upgrade_available 1; saveenv; fi; if run loadimage; then run mmcboot; else run altbootcmd; fi; " +CONFIG_BOOTCOMMAND="if test \"${ustate}\" = 1; then setenv upgrade_available 1; saveenv; fi; run mmcboot; " +CONFIG_USE_PREBOOT=y +CONFIG_PREBOOT="run setup_boot_menu;" CONFIG_HUSH_PARSER=y CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=532 # CONFIG_CMD_BOOTD is not set CONFIG_CMD_BOOTZ=y +CONFIG_CMD_BOOTMENU=y # CONFIG_CMD_IMI is not set # CONFIG_CMD_XIMG is not set CONFIG_CMD_MEMTEST=y @@ -43,9 +49,12 @@ CONFIG_CMD_SQUASHFS=y CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_NOWHERE=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SYS_MMC_ENV_DEV=1 +CONFIG_ENV_WRITEABLE_LIST=y +CONFIG_ENV_ACCESS_IGNORE_FORCE=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_BOUNCE_BUFFER=y CONFIG_BOOTCOUNT_LIMIT=y diff --git a/include/configs/smegw01.h b/include/configs/smegw01.h index 8521883277..6f373973ab 100644 --- a/include/configs/smegw01.h +++ b/include/configs/smegw01.h @@ -22,6 +22,32 @@ #define EXTRA_BOOTPARAMS #endif +#ifdef CONFIG_SYS_BOOT_LOCKED +#define EXTRA_ENV_FLAGS +#define SETUP_BOOT_MENU "setup_boot_menu=setenv bootmenu_0 eMMC=run bootcmd\0" +#else +#define EXTRA_ENV_FLAGS "mmcdev:dw," +#define SETUP_BOOT_MENU "setup_boot_menu=" \ + "if test \"${mmcdev}\" = 1; then " \ + "setenv emmc_priority 0;" \ + "setenv sd_priority 1;" \ + "else " \ + "setenv emmc_priority 1;" \ + "setenv sd_priority 0;" \ + "fi;" \ + "setenv bootmenu_${emmc_priority} eMMC=run boot_emmc;" \ + "setenv bootmenu_${sd_priority} SD=run boot_sd;\0" +#endif + +#define CFG_ENV_FLAGS_LIST_STATIC \ + "mmcpart:dw," \ + "mmcpart_committed:dw," \ + "ustate:dw," \ + "bootcount:dw," \ + "bootlimit:dw," \ + "upgrade_available:dw," \ + EXTRA_ENV_FLAGS + #define CFG_EXTRA_ENV_SETTINGS \ "image=fitImage\0" \ "console=ttymxc0\0" \ @@ -40,13 +66,28 @@ "fi;\0" \ "bootlimit=3\0" \ "fit_addr=0x88000000\0" \ - "loadimage=load mmc ${mmcdev}#rootfs-${mmcpart_committed} ${fit_addr} boot/${image}\0" \ + "loadimage=load mmc ${mmcdev}:${gpt_partition_entry} ${fit_addr} boot/${image}\0" \ "loadpart=gpt setenv mmc ${mmcdev} rootfs-${mmcpart_committed}\0" \ "loadbootpart=mmc partconf 1 boot_part\0" \ - "mmcboot=echo Booting from mmc ...; " \ + "boot_sd=setenv mmcdev_wanted 0; run persist_mmcdev; run bootcmd;\0" \ + "boot_emmc=setenv mmcdev_wanted 1; run persist_mmcdev; run bootcmd;\0" \ + "persist_mmcdev=" \ + "if test \"${mmcdev}\" != \"${mmcdev_wanted}\"; then " \ + "setenv mmcdev \"${mmcdev_wanted}\";" \ + "saveenv;" \ + "fi;\0" \ + "mmcboot=echo Booting...; " \ + "echo mmcdev: ${mmcdev}; " \ "run commit_mmc; " \ + "echo mmcpart: ${mmcpart_committed}; " \ "run loadpart; " \ + "echo gptpart: ${gpt_partition_entry}; " \ "run loadbootpart; " \ + "if run loadimage; then " \ + "; " \ + "else " \ + "run altbootcmd; " \ + "fi; " \ "run mmcargs; " \ "if bootm ${fit_addr}; then " \ "; " \ @@ -61,7 +102,8 @@ "setenv mmcpart 1; " \ "setenv mmcpart_committed 1;" \ "fi; setenv bootcount 0; setenv upgrade_available; setenv ustate 3; saveenv; " \ - "run bootcmd;\0" + "run bootcmd;\0" \ + SETUP_BOOT_MENU /* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR From patchwork Mon Apr 24 11:12:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1772867 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=KQfoycRS; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q4jG05T97z23s0 for ; Mon, 24 Apr 2023 21:14:48 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BEA8886157; Mon, 24 Apr 2023 13:13:02 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="KQfoycRS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DD571860A8; Mon, 24 Apr 2023 13:12:45 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-oi1-x232.google.com (mail-oi1-x232.google.com [IPv6:2607:f8b0:4864:20::232]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id CC954860FC for ; Mon, 24 Apr 2023 13:12:40 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=festevam@gmail.com Received: by mail-oi1-x232.google.com with SMTP id 5614622812f47-38e0a37594eso44740b6e.0 for ; Mon, 24 Apr 2023 04:12:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682334759; x=1684926759; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TLkxQiJJNdSCojz5lyWh/8R2EAxyggMOMia+bRH445Q=; b=KQfoycRSGu0yBwyK7q6mma5FBo2YlFrTPd0PLGIin8q1opiLOl9cgYNhd8QSH6IEFt wM0n48kHfrEWmCWk9k3qgbeQvA8l5Tt7XCjUbKPwUFj/Uz8Twf9G3XjKb8OvD701jRhe AMqgqw7WhSOj/5P4q+Dxrv6AGSRIuD68YcobIpo4SXsyzBL3gRYNDQ+ILcE/fVja6CIJ W7JTEkSloGabSZQ0m8d5gMekWLrLAk1axAe5Xg/A/mGOgcQlkFMVxBkLE+FHxEMhUg9M mEurJq150GymfAQHEx7810js3RxPeF9cc4pxmymQmSSLSJqzuXu6vxsRolVZTmSZ6R+x Iz5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682334759; x=1684926759; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TLkxQiJJNdSCojz5lyWh/8R2EAxyggMOMia+bRH445Q=; b=L40r2fhpLbx+bHMNS4kVBU0MJvW8P7uqrnyGjC4R7INdQHbrAP9iGTaXxsbZdwaZn6 3Smw5JFHTrLXr3C5AfteI3qw3uc50Ub68IPPbfaGILv62Gim8Kxi19PGbD4ufOjR6wy4 QiF0xCSc23tmHh9ZvY4QMMVwrV/40u/Y4zTYB76nBRIk6e0v4Q9Q3y+ocbuu/62vN8bW Q5L/I+RZWdlurwvi4SA773ZmaWwPPgCasz6DTpEm90/+6J+CyQLhEDMM0i4B1aEGLhw/ bxZCOqELs1JO7iLWv3XwJIC3hbPc+xh29BFnYbCR3g1AVGnSIeIXIZETZmPg4X948vPJ 93pA== X-Gm-Message-State: AAQBX9coVtzx7RBH+Vow1CdFba8GCMwiYwdBqNdl9Zfwowkbf4rQuK4P Lc8EZpD3faVie9LjrMl4MXCJnn+SFm+2LQ== X-Google-Smtp-Source: AKy350bx51nMEwhCl75yFTSIW5JTsOKIKn/wCet0l0bmfgFH/gh9f1qiCnP35VOZ7AxiZNXAOHKB6w== X-Received: by 2002:a4a:e04c:0:b0:547:12df:5daa with SMTP id v12-20020a4ae04c000000b0054712df5daamr7065792oos.1.1682334757530; Mon, 24 Apr 2023 04:12:37 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b69:1d84:e533:11fa:26c6]) by smtp.gmail.com with ESMTPSA id 27-20020a4ae1bb000000b00541fbbbcd31sm2294678ooy.5.2023.04.24.04.12.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Apr 2023 04:12:36 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v3 11/13] smegw01: Read the second MAC address Date: Mon, 24 Apr 2023 08:12:04 -0300 Message-Id: <20230424111206.1438983-11-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230424111206.1438983-1-festevam@gmail.com> References: <20230424111206.1438983-1-festevam@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean From: Fabio Estevam Currently, only the first MAC address is read from the fuses. The second MAC address is not read and Linux assigns a random one. To prevent this behavior, read the second MAC address from the fuses and store it into the eth1addr environment variable so that it can be passed to Linux. Signed-off-by: Fabio Estevam --- Changes since v2: - Fixed typo in the Subject "smegw01". board/storopack/smegw01/smegw01.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/board/storopack/smegw01/smegw01.c b/board/storopack/smegw01/smegw01.c index e786429476..605253ead3 100644 --- a/board/storopack/smegw01/smegw01.c +++ b/board/storopack/smegw01/smegw01.c @@ -82,6 +82,7 @@ int board_init(void) int board_late_init(void) { struct wdog_regs *wdog = (struct wdog_regs *)WDOG1_BASE_ADDR; + unsigned char eth1addr[6]; imx_iomux_v3_setup_multiple_pads(wdog_pads, ARRAY_SIZE(wdog_pads)); @@ -93,6 +94,11 @@ int board_late_init(void) */ clrsetbits_le16(&wdog->wcr, 0, 0x10); + /* Get the second MAC address */ + imx_get_mac_from_fuse(1, eth1addr); + if (!env_get("eth1addr") && is_valid_ethaddr(eth1addr)) + eth_env_set_enetaddr("eth1addr", eth1addr); + return 0; } From patchwork Mon Apr 24 11:12:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1772866 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=MzhCzP5q; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q4jFl32wJz23s0 for ; Mon, 24 Apr 2023 21:14:35 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6280686139; Mon, 24 Apr 2023 13:12:59 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="MzhCzP5q"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EFFAF86128; Mon, 24 Apr 2023 13:12:43 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-oa1-x2c.google.com (mail-oa1-x2c.google.com [IPv6:2001:4860:4864:20::2c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 067C5860B1 for ; Mon, 24 Apr 2023 13:12:40 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=festevam@gmail.com Received: by mail-oa1-x2c.google.com with SMTP id 586e51a60fabf-18802d14ba7so633892fac.0 for ; Mon, 24 Apr 2023 04:12:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682334759; x=1684926759; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=y3WV96dwBHJ4nqIIySQ90egGvXxNDNrbyr0jHcyznPk=; b=MzhCzP5q1SmZFdWz+nSsgE/GrvAJfUqJOuLNeIYh4iM4sLoiVMDFJh4uE7IyYdtqRf HxIxeWCF21J38kPWXiNsURhZItZxlTR7CD9mKyR0aZEcmNqO5qPRZ777fBEQHXqk7KOR dIm8TKF7HmkfTmnN/MXnDp4aLAqADoC1KD/Jnkc3YHwywwgzpMjmpIKXhBfHAtdLR5CW 9dPCN1xHQ6f7ljVoZ62RtfsFMY5iZesgS7JVadl4OtAWV3qYLN/7p4pS+CfcxGbZxJyA Ds0NToxxu8jTcoCvtqzRLWPDE7ceRtglMTdbHmG4W2V9PaSU+7DqwKVElGbZA7dfuB2B pqxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682334759; x=1684926759; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=y3WV96dwBHJ4nqIIySQ90egGvXxNDNrbyr0jHcyznPk=; b=fSt1JX0ao+CCUHkMEEZ5KbJXgH2NkuxHrTbtVd7kOu2r1GeQrodSqKF3eKavlbssia iJQYsJr/6vr7JKhvdlZ4A6SZMieqEfNeSdmbxawpczWHvy3lsuwrgxAMTCxSwv9KjvOM cjf4Mws3zZBVzp42Z4B5FimkwrKbZ8A6RxZ8ao2CBxtb4JbuJtOjDol5kL8D+xufRaef WqnBOd6pa7QUhdVAcgAS5pkLChJW5Q6riOJhz2u09aaF4WAzqoYzEg6jCU0mgkmzTgXG KAO07uEc5wHfT5OkP1WjjAG7MpGc5VuJLQK+z1zjCkU+uUcFstdpg3+eudUx1z1Uq63K 9caA== X-Gm-Message-State: AAQBX9dJl/S3U2FPJd8TdqfwYPtu4lTvNPsztwB5BA+Z3xFaBgbHSoA1 iCmrWbZgQ4vofm0xYLhUU0n138wvls3dEQ== X-Google-Smtp-Source: AKy350bWlatTga1gBeSTYFywsqnTzNVHoH0HHA88lbP6qN9NW0H6MvrWht7ro8LNIrBswQXHZrzi9A== X-Received: by 2002:a05:6870:818a:b0:176:3704:1a15 with SMTP id k10-20020a056870818a00b0017637041a15mr8640964oae.1.1682334759570; Mon, 24 Apr 2023 04:12:39 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b69:1d84:e533:11fa:26c6]) by smtp.gmail.com with ESMTPSA id 27-20020a4ae1bb000000b00541fbbbcd31sm2294678ooy.5.2023.04.24.04.12.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Apr 2023 04:12:39 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v3 12/13] smegw01: Disable additional boot menu options Date: Mon, 24 Apr 2023 08:12:05 -0300 Message-Id: <20230424111206.1438983-12-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230424111206.1438983-1-festevam@gmail.com> References: <20230424111206.1438983-1-festevam@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean From: Eduard Strehlau Defaults have changed, we do not want the bootmenu to contain EFI options. Signed-off-by: Eduard Strehlau Signed-off-by: Fabio Estevam --- Changes since v2: - None configs/smegw01_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/smegw01_defconfig b/configs/smegw01_defconfig index ea25b3b87c..fe8152f33e 100644 --- a/configs/smegw01_defconfig +++ b/configs/smegw01_defconfig @@ -19,6 +19,8 @@ CONFIG_SYS_MEMTEST_END=0xa0000000 CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_AUTOBOOT_MENU_SHOW=y +# CONFIG_BOOTSTD is not set +# CONFIG_CMD_BOOTEFI_BOOTMGR is not set CONFIG_BOOTMENU_DISABLE_UBOOT_CONSOLE=y CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="if test \"${ustate}\" = 1; then setenv upgrade_available 1; saveenv; fi; run mmcboot; " From patchwork Mon Apr 24 11:12:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1772868 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=HfcbQKW/; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q4jGF196Bz23s0 for ; Mon, 24 Apr 2023 21:15:01 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7B5D386163; Mon, 24 Apr 2023 13:13:05 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="HfcbQKW/"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B01A68610B; Mon, 24 Apr 2023 13:12:47 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-oa1-x33.google.com (mail-oa1-x33.google.com [IPv6:2001:4860:4864:20::33]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 4E4568611E for ; Mon, 24 Apr 2023 13:12:43 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=festevam@gmail.com Received: by mail-oa1-x33.google.com with SMTP id 586e51a60fabf-18806dcf1c1so633075fac.1 for ; Mon, 24 Apr 2023 04:12:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682334762; x=1684926762; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FnR5qFj5s8s3aIFm6sU2P0cUCGGY5oA4l4p4zGkZa/M=; b=HfcbQKW/bsKQL8t8pHeFwqpAOz1rSV8MaSIFUR/1vQbNl2oDvismFl++/wkr3zXQig 0ZSPXhjYjAGqQQI53t90fBMbrJB27fZc12QbUcKqBNZrkvjK7IrZ4iw3vYIb6qr4pPQZ lK+NMROnORvlCwviHhgK4wubl/rerwvnfqi2WBBdBL6zjnHt4oo0A+zaHm1RB51UyLPI wvDBKxyJWGMk9m1eAHf5sNs8XLCsmLSNrZbbP29VPSkpySib4BpyKScBhCvmyUgvUXrA tYlnvsV0LWc+mqcHMmjkrrdpgHixteAHf2hl0i4MQpq9UNTyeeHMZh05F9UYFFnrp+Po j/YA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682334762; x=1684926762; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FnR5qFj5s8s3aIFm6sU2P0cUCGGY5oA4l4p4zGkZa/M=; b=AZwKC85/dRSXh7NEtYrPr5xnUrUP+cVqHtBdtOp9/eQ379ysaOKnxWwBVGNegV4jot 1eaj76DVR4C7UipwPp+ZR62OSKL4wG8qBA2/d6SdYKvk4jH+iDKdCtjK91DryHUfx1tS 9456RM0g169vT5KzKTyGnIdlszEHQFLeHxJmZkSjzgd6Rr88lYo27VmcOFLnZg8F7S6a UqDsMbW6zL62qwly7wvJQQ8YBuHpJNoaPG8b2m1o+N1vv+93XjxyM+PXOsibIrnaz/yF eAjhieHjCSy5bKwg9wicHL1oBsCMOQmdwVPRxDBE/SGZse2ZM5FF3kX+9mrejaveznkO E7pA== X-Gm-Message-State: AC+VfDziDwUt6svBavgaOIu38qdid0/2Cos+dTPvYC7SgmAz03B0CC4s waP0aXL78p6Xy+vMW6W7IMk= X-Google-Smtp-Source: ACHHUZ7RcI3/PhoiCUhzCRBFROujag2ipDj/lFt+qd0ozFQgIT9SX2aE8h8s7FPtGWYMPFZd7GhyOA== X-Received: by 2002:a05:6870:1612:b0:18e:b2f9:7bf1 with SMTP id b18-20020a056870161200b0018eb2f97bf1mr1051928oae.2.1682334761863; Mon, 24 Apr 2023 04:12:41 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b69:1d84:e533:11fa:26c6]) by smtp.gmail.com with ESMTPSA id 27-20020a4ae1bb000000b00541fbbbcd31sm2294678ooy.5.2023.04.24.04.12.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Apr 2023 04:12:41 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v3 13/13] smegw01: Fix fallback to altbootcmd Date: Mon, 24 Apr 2023 08:12:06 -0300 Message-Id: <20230424111206.1438983-13-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230424111206.1438983-1-festevam@gmail.com> References: <20230424111206.1438983-1-festevam@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean From: Eduard Strehlau The bootcmd/altbootcmd mechanism is not invoked for bootmenus. Manually compare bootcount and bootlimit to implement fallback on all codepaths. Signed-off-by: Eduard Strehlau Signed-off-by: Fabio Estevam --- Changes since v2: - None configs/smegw01_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/smegw01_defconfig b/configs/smegw01_defconfig index fe8152f33e..3d2713f528 100644 --- a/configs/smegw01_defconfig +++ b/configs/smegw01_defconfig @@ -23,7 +23,7 @@ CONFIG_AUTOBOOT_MENU_SHOW=y # CONFIG_CMD_BOOTEFI_BOOTMGR is not set CONFIG_BOOTMENU_DISABLE_UBOOT_CONSOLE=y CONFIG_USE_BOOTCOMMAND=y -CONFIG_BOOTCOMMAND="if test \"${ustate}\" = 1; then setenv upgrade_available 1; saveenv; fi; run mmcboot; " +CONFIG_BOOTCOMMAND="if test \"${bootcount}\" -gt \"${bootlimit}\"; then run altbootcmd; else if test \"${ustate}\" = 1; then setenv upgrade_available 1; saveenv; fi; run mmcboot; fi;" CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="run setup_boot_menu;" CONFIG_HUSH_PARSER=y