From patchwork Wed Apr 26 16:04:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1774153 X-Patchwork-Delegate: sbabic@denx.de 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=E5u3+Hb1; 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 4Q63cJ45Krz23vJ for ; Thu, 27 Apr 2023 02:05:20 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A77298629B; Wed, 26 Apr 2023 18:05:15 +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="E5u3+Hb1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 73B5086068; Wed, 26 Apr 2023 18:05:14 +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-x2b.google.com (mail-oa1-x2b.google.com [IPv6:2001:4860:4864:20::2b]) (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 B5E1986068 for ; Wed, 26 Apr 2023 18:05:11 +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-x2b.google.com with SMTP id 586e51a60fabf-18802d14ba7so1093271fac.0 for ; Wed, 26 Apr 2023 09:05:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682525110; x=1685117110; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=JN1u8g5d1xyyxA8TyLf8+wN04Yja5SYHdHw65L50YGY=; b=E5u3+Hb133PrwVn7aTya25u3SJbkb8IsPbzyWOp0DZuFkt+01GztkFviylsLp35xUS 6yy8z5vJjm0OAQp/06rsxfyHr+M9wEXnWsM0uxxumf8l58amM0r6dMrZcptc+qfMXsmf pvRamymaXAQiPpuefix4iJMItKOwR8PRTUUJ7yqI0sZoD7zDvJmepn0LJH0OtDNq84kS q9eT60ccoMNcNluhEVrQuhx8ZkXSPCL1egq3qsNSGvC8zNI3W6WypMT8qxqyWcyN1PxM Cas+RWnTyqwJaVzH9d6VaSLN8lLNoNZiNaj7+ocg+NWTzx7mtOi7Rcl7teiqWbFrKRt0 YPSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682525110; x=1685117110; 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=JN1u8g5d1xyyxA8TyLf8+wN04Yja5SYHdHw65L50YGY=; b=KZZJcqEsleUBbrejusdjUXsIyp3v6Airg7TAL0TmnZL2B8dYu3Q3wAQh0m4BS98fcb hCbKxB6w4/kAJnTgEhPLAfy+2CyWRFilRdqt7eDU1vusl1Gd3/aNijyLozuBaW01W/mI xSNdM8cuOQHRBHOye5H3fm6sKIchk0bW7krAQhx/NiUHyyOR0sah7grGqvFH8Vs6yZNa MvnSGlXPHgptzWUvVAc/C9ZRO77Lb5gi+h0cz63o3h3p/YEy22TkwWEZKwTaE+mbT+rQ Xq609zmg3Q2U3skW811wnCcldCxuLe0VIsoVfiscHeTE1W1llBOnL1C20gJE5NszzBZE dDMg== X-Gm-Message-State: AC+VfDzWHtboWlO3io02zgPAnF1mW8l3VRl0W+y8R5zxkRViogoa3lLK EIKplZfjdcivIJ7U6GprAKk= X-Google-Smtp-Source: ACHHUZ6n8Jq9QXXYDkDu3pQpTjUoJC1KasRI8+vD/LglTBASho/NyfsZ+0EgTtl5vts+S6DpVNJNNA== X-Received: by 2002:a05:6870:1612:b0:18e:b2f9:7bf1 with SMTP id b18-20020a056870161200b0018eb2f97bf1mr5763628oae.2.1682525109681; Wed, 26 Apr 2023 09:05:09 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b69:f6e1:8741:de7a:38fc]) by smtp.gmail.com with ESMTPSA id u2-20020a05687036c200b00177c314a358sm6755325oak.22.2023.04.26.09.05.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Apr 2023 09:05:09 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v5 01/14] smegw01: Enable setting additional boot params Date: Wed, 26 Apr 2023 13:04:48 -0300 Message-Id: <20230426160501.1199085-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 v4: - 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 11031744bef8..a356f095a68c 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 Wed Apr 26 16:04:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1774154 X-Patchwork-Delegate: sbabic@denx.de 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=sYLii9pA; 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 4Q63cZ5Dr4z23vJ for ; Thu, 27 Apr 2023 02:05:34 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 81B008636A; Wed, 26 Apr 2023 18:05:20 +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="sYLii9pA"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D8E6286333; Wed, 26 Apr 2023 18:05:16 +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-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 2C06A8633B for ; Wed, 26 Apr 2023 18:05:14 +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-18f0e1cbb95so14022fac.0 for ; Wed, 26 Apr 2023 09:05:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682525113; x=1685117113; 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=qSjEAKCXaZ1kqbxaA9woVlg2h9JqijWNXdfhm2CGlDs=; b=sYLii9pAeb5KqptNLtYWekkcanDdI2rCjYeAefAQSvlwoe6rskMHvWjDOg90gt4HyY 678mh00dgPEXCd/fXCkGUQoU7tCUPxym1xCmxh1WS+D+GyVmaGPTKtFcp3hayzu8dZf4 bedeve2If9WsFXlQSi6/4wH+sIEVrKTXuNmZXgA2/jWZKyHgu5iWlYQ4ZejxBZRCJ1+5 f3NmbBxxkVeZsrTIgIdNjm428tj1JmwqamPmRkEvD/9N3Qe/5+Zrj71KAZiq5xtw5+en Vt3cfwvZhXYO2VSobUEa0m6R2k+S/JGS0IDxXMpQEAjHSZMD1HZa8saX5DkzRI8MJeBQ WkZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682525113; x=1685117113; 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=qSjEAKCXaZ1kqbxaA9woVlg2h9JqijWNXdfhm2CGlDs=; b=DcTBK5turncuTyomsiI3A2b9yXcSpJ7iCcW7DxwiTFWEuphiIvFAa4a/LSaxYAj1wd 5/D8gl1VCqbQrkwkORXEQC1LJXS4kIMbmCgIdZYfhyy7rYgOi7zKOkmaKdlnC3KUEpB6 sCZbTcDpUg/Il28wh6vAkdrwZX3JwO8ksrt3eLUGWegPbZrCmBJzDmQ7XPgiuWgoZypv axCspigr4TLfzQO4cfGiRn7IDHAzN5Qq9UZUhqnXjPqRopXF+BhLXk0VE5UEV/Xj5zGd eCr1wanfAiW7CHz7u9cDbm1T8gZARj+2AbN6qRzo8hCNn6PjBa/MMoqLTacec3LES0Xv 3Isw== X-Gm-Message-State: AAQBX9cjXTC0qM63k67ds6F6W51CURqOWEMnkiMF5uyNTpf7hSTGaavg boCp746TUIdv/qn8Y/tVDBY= X-Google-Smtp-Source: AKy350anGDvvpTgBMc6ZFlZ20EUEwo8wH1T8t9/iBodchZyDkmuSwVqE72TYSe1FDWX2kjjAMTKZmQ== X-Received: by 2002:a05:6870:589c:b0:184:8047:5594 with SMTP id be28-20020a056870589c00b0018480475594mr12759550oab.5.1682525112761; Wed, 26 Apr 2023 09:05:12 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b69:f6e1:8741:de7a:38fc]) by smtp.gmail.com with ESMTPSA id u2-20020a05687036c200b00177c314a358sm6755325oak.22.2023.04.26.09.05.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Apr 2023 09:05:12 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v5 02/14] smegw01: Select CONFIG_CMD_SQUASHFS Date: Wed, 26 Apr 2023 13:04:49 -0300 Message-Id: <20230426160501.1199085-2-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230426160501.1199085-1-festevam@gmail.com> References: <20230426160501.1199085-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 v4: - None configs/smegw01_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/smegw01_defconfig b/configs/smegw01_defconfig index 1e0b9aa5be11..f15291f1dd04 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 Wed Apr 26 16:04:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1774155 X-Patchwork-Delegate: sbabic@denx.de 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=AIgmqklj; 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 4Q63ct3yt8z23vJ for ; Thu, 27 Apr 2023 02:05:50 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0462A86343; Wed, 26 Apr 2023 18:05: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=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="AIgmqklj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5963186333; Wed, 26 Apr 2023 18:05:18 +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-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 E2C928636A for ; Wed, 26 Apr 2023 18:05:15 +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-18f0e1cbb95so14042fac.0 for ; Wed, 26 Apr 2023 09:05:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682525115; x=1685117115; 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=3EKi9Xd6nJYSndzHH/vzIIyZYl0FLKFDD+nx/eis34U=; b=AIgmqklj3YUvab9ooN5WCn67SsIRYx86HcOs/TV28ubzfvN5WNCvqCTo88jTMG1vaP OewjWe21WbyTLrOWPO6ted27mEgl/ImiE1skMsPV5hU691p3pScYINb5lfLLOnDP8h7n t9QYasMeWxCb4i68Y5OYneIa5CAM5+Lh3pBib9Qhc82o7B/B6yokzbqfttJtiIDVdENu +JFevYZr7gxNCiaWJCo7msm2gt145lML6oS+cjQ+pntLw6j7mmCLBVOG11tKPBHIguO4 Qvpokm/eSfncSAfal/r6dsvBZOOtVM7I8R2xX9MMC/+QjLNyfV0XpQJJZwF1VCOJ70QD xBoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682525115; x=1685117115; 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=3EKi9Xd6nJYSndzHH/vzIIyZYl0FLKFDD+nx/eis34U=; b=JRkfyrqhvJTkvV1WIcsWr7U/5prLP5YCwm/4+BX9J0Plpv/rbTe1Vvr9GfR7CdfpJj x0a0AiChPzsr/0olaFjZ/8ybbLAbAOBqEmyrs5VW1YCOutJ14Q/6X6aFVbht7cStg2lW Y30ufU0uknK8+QVLBImqDaCcviHgcB4uXBrhjpZHU65FctFnu3bTIfdzxHfHUz6X1ja6 0NeZiB8TMdCIkpB/ikOrw3hBzSTQG/Fp7i7Gyk2ssr8mupaH4mcuqHZP+4uGINv3EdpV 6Z0EWtITtsLYB5N8T3Ku6kUi1G1V3lEnjyunSejxBgp2axMZbjIEr0dOnTP9A/qetrwj Kc5w== X-Gm-Message-State: AAQBX9dGjDYBaTH84wmxUtdppaMyQR/1yKqLVNDvVKiX3GAs+5xuyklY +Dm/OuEKriMW5BcEPrUg9y0dlMwUD6Km6w== X-Google-Smtp-Source: AKy350aVpc/Iza0ifX4eLm4qaulv1L5D59TBMqcdYD29zrSyu7BFoPw2gyxytlr24XdQ6VGqjFrdow== X-Received: by 2002:a05:6870:589c:b0:184:8047:5594 with SMTP id be28-20020a056870589c00b0018480475594mr12759708oab.5.1682525115466; Wed, 26 Apr 2023 09:05:15 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b69:f6e1:8741:de7a:38fc]) by smtp.gmail.com with ESMTPSA id u2-20020a05687036c200b00177c314a358sm6755325oak.22.2023.04.26.09.05.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Apr 2023 09:05:15 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v5 03/14] smegw01: Select bootcount support Date: Wed, 26 Apr 2023 13:04:50 -0300 Message-Id: <20230426160501.1199085-3-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230426160501.1199085-1-festevam@gmail.com> References: <20230426160501.1199085-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 v4: - None configs/smegw01_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/smegw01_defconfig b/configs/smegw01_defconfig index f15291f1dd04..5d9d4194639d 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 Wed Apr 26 16:04:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1774156 X-Patchwork-Delegate: sbabic@denx.de 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=Yj1lUqLg; 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 4Q63d96KVnz23vJ for ; Thu, 27 Apr 2023 02:06:05 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A499D86334; Wed, 26 Apr 2023 18:05:26 +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="Yj1lUqLg"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EE1DA8639F; Wed, 26 Apr 2023 18:05: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=unavailable autolearn_force=no version=3.4.2 Received: from mail-ot1-x32c.google.com (mail-ot1-x32c.google.com [IPv6:2607:f8b0:4864:20::32c]) (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 CC9FB862EC for ; Wed, 26 Apr 2023 18:05: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-x32c.google.com with SMTP id 46e09a7af769-6a4142c11f0so1613388a34.0 for ; Wed, 26 Apr 2023 09:05:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682525118; x=1685117118; 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=UssTFecL6xniUVq6g/APNuAZtSOvbS2SpdmLadtiU7g=; b=Yj1lUqLgvIAo/u0NX6usUaPYvGEj5yXzR5nwGuP65MuJJV7K543wvYg/xePzZkZL1I w5rfgbybPliOokXexszLAqQoB3k2EZKx8ZZJEo78g9o9Vb7Bkge/BNZz/4QhOr9flbq8 EWN54Y6CD7+hP80aaJchv54pV3QX534hPC+qwcLprw2NlW8FQ3WScXbyhWQs3zI4qPHM gYmuAP/ScygHKNAGGttyr8jrkiy/OedgHxNYoBYynu8t8Br09Kiq3gQ+uf4MySdNVwBG 53aZo/wVkk+olmXLR2PYIJzjSSgPiff013WgZtmHFhNOBDZFF69mrwIymq3TKRzfeG4r g2Hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682525118; x=1685117118; 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=UssTFecL6xniUVq6g/APNuAZtSOvbS2SpdmLadtiU7g=; b=Q6nYATpBHuOLyHqH09Zc1WpoPlYGQ5r2RRPFfxteAdxO+CAVDM7tiGKudg9r7HnAxu +AV36+s8wFAMGt/pqRAIgksV3b9aGM7iZjxdSccHsDswR3OJv+E5hTFW3XbdYFU8QBXU 97+D3U4ypg3/CbqWOOuKpKwzbcwK9s9+NPQuArY7r4eqe0NlB2LEg0AOFHz1xk9uHdj4 4SruPq0B2/CHXVxDU/wBEcd3Z+zf1ycXjNKFkdd3ruYRsaj5DT6XKHA/6kivQVNYlXk3 f3QCAu06BQ2ybX3vI3/mvSEaYfWfH/7kTVOZups5NiGUq2pbL/ayrph/V4mhbLwHDY9k ADHA== X-Gm-Message-State: AC+VfDxh0Bt5xGE6DaZvjGXK/MzxudUZtIgQp5hNtBE3fpuf3pNdVp3K HRghWoxDEckpz7fvS7loVVg= X-Google-Smtp-Source: ACHHUZ5Ct25JmLDuIHyZjHjZW1kaM5C38uOYBzW2JUcPhzimWnm034n8QCgzdDBoE1KdlEu8lYioKg== X-Received: by 2002:a05:6871:a8:b0:18f:cd7:4f1a with SMTP id u40-20020a05687100a800b0018f0cd74f1amr353476oaa.3.1682525117943; Wed, 26 Apr 2023 09:05:17 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b69:f6e1:8741:de7a:38fc]) by smtp.gmail.com with ESMTPSA id u2-20020a05687036c200b00177c314a358sm6755325oak.22.2023.04.26.09.05.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Apr 2023 09:05:17 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v5 04/14] smegw01: Add altbootcmd Date: Wed, 26 Apr 2023 13:04:51 -0300 Message-Id: <20230426160501.1199085-4-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230426160501.1199085-1-festevam@gmail.com> References: <20230426160501.1199085-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 v4: - 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 5d9d4194639d..418151a6de05 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 a356f095a68c..6ee4acc70d29 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 Wed Apr 26 16:04:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1774157 X-Patchwork-Delegate: sbabic@denx.de 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=aSFLHhMv; 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 4Q63dT09W4z23vJ for ; Thu, 27 Apr 2023 02:06:21 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3634B8639A; Wed, 26 Apr 2023 18:05: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=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="aSFLHhMv"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AC2E68636B; Wed, 26 Apr 2023 18:05: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-x35.google.com (mail-oa1-x35.google.com [IPv6:2001:4860:4864:20::35]) (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 3834B86380 for ; Wed, 26 Apr 2023 18:05: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-oa1-x35.google.com with SMTP id 586e51a60fabf-188090ebf84so1146389fac.1 for ; Wed, 26 Apr 2023 09:05:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682525121; x=1685117121; 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=rl45SiubKxz1YSniOOUXGBTFbgK4g+TCE2b2lk2rQMQ=; b=aSFLHhMvKBlvlvht0WRfZe9ei/qMaTy8+qPnaPhhpp+iNKIpXqP9naMa/fY5bG8VDQ qlVRetVpduvz7lzXN4jWO/euIlao24SYRIGMbVJUqL6yxcAAUIjMoyalu8c7t3JdycYe 1SN0N+LPGajl29Hjbr+e2FaaoGPReZQVdBpJS8Vaw5h2WuVZ+7tZ1iTHreMZnJv5GSRT dt0GO2dKJRoXZTk5bn+C0xfqDe9K12Mke9a3rCJggyCi9GMCxz5z/bwzCtbWr3L45rzJ Az6V8DtRRkTwyfj/2xGsoH3qQRAT7TWrpCLYMehW0jFVZcM3SowtaQLCzwrmHOEkoaTm c+Uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682525121; x=1685117121; 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=rl45SiubKxz1YSniOOUXGBTFbgK4g+TCE2b2lk2rQMQ=; b=Jke2q74KJl/+Li4tG6jmoQiUaRP2ab/CvSVUw72GA2xby/waxTdutiAdhwXbDyvuGV kY4dIQiFYfYDZznakzD/4jcDn+dupd+eOrpkmAeA/qWqe/Mvtk9DF+5+G07La8E5fEXM /nkDb+Jl3itSLZRiaKjwMD4+N2visdFosW2KVsBKBbK1LLUb5ig09QYijh7443HFHFWr zrvgVDVy3pKEMmjm/HL5Oz6cUeFYKdgVuYrtsUi4SBkumMRPcg7peIXI1Scq8fLBRah5 KO/8ZFfmQ6WUVX896DAiCO+m/aur27ax0xOzAtKwDjfFl2gFRuFgvybf2ACBT/cygcpd +nkw== X-Gm-Message-State: AAQBX9dJUYULuI+pSR5liXFGL0H/s67awOVHr2iF+CzAE4BxnRXIQTYq 3WNn9i87NCWXX91Pz/5fD/I= X-Google-Smtp-Source: AKy350bWaFIuAdF/zwTg5hUpG+Hjvkz2Dl8yOxs10ztN1Ts332s8ezx1b4BkyvCgaeiCGJw9dC6Dxg== X-Received: by 2002:a05:6870:b689:b0:17e:a596:672f with SMTP id cy9-20020a056870b68900b0017ea596672fmr12869078oab.4.1682525120673; Wed, 26 Apr 2023 09:05:20 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b69:f6e1:8741:de7a:38fc]) by smtp.gmail.com with ESMTPSA id u2-20020a05687036c200b00177c314a358sm6755325oak.22.2023.04.26.09.05.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Apr 2023 09:05:20 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v5 05/14] smegw01: Run altbootcmd in the case of failure Date: Wed, 26 Apr 2023 13:04:52 -0300 Message-Id: <20230426160501.1199085-5-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230426160501.1199085-1-festevam@gmail.com> References: <20230426160501.1199085-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 v4: - 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 418151a6de05..b3580d5d6e54 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 6ee4acc70d29..05edaac42f8e 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 Wed Apr 26 16:04:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1774158 X-Patchwork-Delegate: sbabic@denx.de 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=E4y1B3ts; 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 4Q63dl6Bshz23vJ for ; Thu, 27 Apr 2023 02:06:35 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 563E4863B2; Wed, 26 Apr 2023 18:05:35 +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="E4y1B3ts"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 59A7F863A5; Wed, 26 Apr 2023 18:05:27 +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-x329.google.com (mail-ot1-x329.google.com [IPv6:2607:f8b0:4864:20::329]) (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 B3F0F86375 for ; Wed, 26 Apr 2023 18:05: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=festevam@gmail.com Received: by mail-ot1-x329.google.com with SMTP id 46e09a7af769-6a5dd5543cdso1188882a34.0 for ; Wed, 26 Apr 2023 09:05:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682525123; x=1685117123; 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=vM2dFeBooXZY+7Pji2zYjFML3gzBVUpU2S/OubZN4vw=; b=E4y1B3tsd9QFa6XYiJ+cN6ZONBXSgAjLgFn/vX9TrmMJfIHR7Ns33irYxlMjYBgBhp PPpDEa4poaXP2zoQIdAsZOokWMj5s2PiS3H7Gh5/JRmcREix/dIsYi1dLgdQFlzfgMcf GX6kFHjYFO7qNv35jzUywsd5W1w7sHhcULQKLbDJqMVsycIhGJIHIdlA3UU/tXhmTXD/ PLB20fuowlYENvqmSeTdgY62344sBKaw0Ok/V0dsqQIRCiYYN6e4/fgtn7msNtI9UYsf EYEhpBDFQA0ZbfHlM3qBiItLnT6S4Q4slVB73XcmeXhr+T3NMRwFNivdLEa0y4nGeFFf mNVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682525123; x=1685117123; 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=vM2dFeBooXZY+7Pji2zYjFML3gzBVUpU2S/OubZN4vw=; b=UjHDcXY2lmEreOuObPDWQhpnJrDXcS2laGbK8JH9bG9xqwi7kg3CLPhqlaZc6NmWq6 D/blXooK+/A9tTIQBmZCZ4j0+eoEkXuJGaPBdHff5LVw6UDDs3kb0xXQMyCJL8lJgcGB y70s75WwdCmJgvl0IeSbsBlj3jpJUpye+1UZgtzBBRd5SfT3CypDlmAi5guN/pgzu4wf MDki84rPf9oSUI/FKCh3fk/D4Z7QP5O6ZYldeJEiRmk/zhlnxJiGLhqP+QYGhaF5Je4Z v1o6iHhPSkGkyFTiMUNrUURoqVz4V+XRp+nn+2kuHXsc4ZtwKLw/hZPddmlWFssVefUN Z+LQ== X-Gm-Message-State: AAQBX9d/4ExkzNJrN+UBjCC+7kr1UqSYdf3FA3PuAF6Cx+a+K+JHwdHi 0AoUmtzi0nWO1PrNU/6o+4w= X-Google-Smtp-Source: AKy350bQ/CqlvKDKhrypi7P6iHRJJbFiCfyN44bLzo6G51+VFz9nSdPQfjrjoAd1xCJC7PQWVFD/6A== X-Received: by 2002:a05:6870:2409:b0:171:a749:bc0c with SMTP id n9-20020a056870240900b00171a749bc0cmr4001411oap.3.1682525123247; Wed, 26 Apr 2023 09:05:23 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b69:f6e1:8741:de7a:38fc]) by smtp.gmail.com with ESMTPSA id u2-20020a05687036c200b00177c314a358sm6755325oak.22.2023.04.26.09.05.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Apr 2023 09:05:22 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v5 06/14] smegw01: Only commit to new partition if update was successful Date: Wed, 26 Apr 2023 13:04:53 -0300 Message-Id: <20230426160501.1199085-6-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230426160501.1199085-1-festevam@gmail.com> References: <20230426160501.1199085-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 v4: - 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 05edaac42f8e..277c828d0e07 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 Wed Apr 26 16:04: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: 1774159 X-Patchwork-Delegate: sbabic@denx.de 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=B0HUexEE; 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 4Q63f71y7hz23vJ for ; Thu, 27 Apr 2023 02:06:55 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 63679863C7; Wed, 26 Apr 2023 18:05:37 +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="B0HUexEE"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6E45C863B7; Wed, 26 Apr 2023 18:05:30 +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-x2d.google.com (mail-oa1-x2d.google.com [IPv6:2001:4860:4864:20::2d]) (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 42B0B863A3 for ; Wed, 26 Apr 2023 18:05:27 +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-x2d.google.com with SMTP id 586e51a60fabf-1877eda6a1eso756447fac.1 for ; Wed, 26 Apr 2023 09:05:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682525126; x=1685117126; 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=F97bM72Kh7Df/A7idSVU1nxy9uvQoxplgs7UqxJeNBw=; b=B0HUexEEsmnbDt4R5ytpnN+2N7nLzTBU820ayUsbf2vmL+RPMI0eNSKBDRu2L3cy8T gK+3auR8AYnIX9VHWroD4D3uJ7kyHO6mt2QKji+aVs6osB7jxu62oC/54TV9TEI/LNAw 7zHE8JBjG6Ktf4NrJqRdK/IN1A3IVB3diJ2VFc96XtoElmVLbTUhtdYA68qtunPqOuAH 3HRkxBrtI5l0d8/tGPXVRmtHdVqoYI4gNFx4POgpEh7RwmQOeaM+Fb0cdfp6ig4VvLBh UfItbYkY8HM/fSA/1/qKmUh3j3ck79VdZpK6HBP5s5Vmm/WhxVlnVUb6PkbGMPH2IFaO xKmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682525126; x=1685117126; 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=F97bM72Kh7Df/A7idSVU1nxy9uvQoxplgs7UqxJeNBw=; b=ccGAaoTT/U6razAx25wT4iZ1kxsD21Zgzp/Imb2cML4DivHEDLDV95wnPAl0YABoZH WnDww+o9b8UF9zKjIebvajsqnbVUehklPSS9wy5/xlFLyXJomIQm4SxlctPXkFpVV2hG dfcYJB58vLUKUE4dR+um9ptygwnJuqbDi9/E/aK3lmeEXIUYJqFSVKnbNQsrDlNCVEbS JZQmB/+Ev0O6Sns93In/rrSZ6tJi/byyru8wF1nDYhO4pNY6a/90akY+UICsx3hZ6zK/ MJD3qaONcmrjAsMlOQXVGeFhFkB+/YCOFybM2Jr97XUn5d3ZrAIlpnjCQubMWjitTuVs 7pXw== X-Gm-Message-State: AAQBX9cMgQIF3UZisqr+TmmuW6jStQ1EO1xBm1et5LVfPqR6nZsjuolc Wz3slKJuJxZoSsacUmLAUyU3vrNRUwtB9A== X-Google-Smtp-Source: AKy350ZZUTfwaTUX6+6WXomMMuzUH2CeLdkTDeQOVhSvcEaoskEl1gySq1jiIVK30iB5U2k2uWAwxg== X-Received: by 2002:a05:6870:c212:b0:172:2204:3a0b with SMTP id z18-20020a056870c21200b0017222043a0bmr14167008oae.0.1682525125869; Wed, 26 Apr 2023 09:05:25 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b69:f6e1:8741:de7a:38fc]) by smtp.gmail.com with ESMTPSA id u2-20020a05687036c200b00177c314a358sm6755325oak.22.2023.04.26.09.05.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Apr 2023 09:05:25 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v5 07/14] smegw01: Enable EMMC boot from multiple partitions Date: Wed, 26 Apr 2023 13:04:54 -0300 Message-Id: <20230426160501.1199085-7-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230426160501.1199085-1-festevam@gmail.com> References: <20230426160501.1199085-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 v4: - None 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 Wed Apr 26 16:04: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: 1774160 X-Patchwork-Delegate: sbabic@denx.de 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=m4LBeH8Q; 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 4Q63fR5btGz23vJ for ; Thu, 27 Apr 2023 02:07:11 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E0941863CC; Wed, 26 Apr 2023 18:05:38 +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="m4LBeH8Q"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1226B863B7; Wed, 26 Apr 2023 18:05:32 +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-x35.google.com (mail-oa1-x35.google.com [IPv6:2001:4860:4864:20::35]) (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 1CCFB86380 for ; Wed, 26 Apr 2023 18:05: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=festevam@gmail.com Received: by mail-oa1-x35.google.com with SMTP id 586e51a60fabf-188090ebf84so1146426fac.1 for ; Wed, 26 Apr 2023 09:05:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682525128; x=1685117128; 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=vIaUJVCeewjaJj9CsG9YrnAPxYGAVa68+bWmYFI5w1w=; b=m4LBeH8QzZvUqimYoxACWy2gnT9nX0g2kxv1WQOlcQLX7nxkYmuZWZPMhc6oL195B3 Es0gdti0KX1IuGw29ZI4Qq+vjSOkj8OmSS2/u8L6IcKTiQlAcDd+6yVJ1gUElsy1lHHd IpRxUH58/L3nGHSpQ41UMW6SPAxrEdjvmGj7TjqrFWwLJyiZ05Hi3rspEFX8y2QE51FL jq0h88yV8vC1oPGBvmGetWYBKmVIipHTSaus5pDb6EgewAFKpemFkFegACjwBkDimZ1i fqAZ+dbF0jRG1IRcwptYAF+fcZjF1E0w4SfpJC6klGurPQvOWAybZZNGhfNZE3Tcyqb2 7fEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682525128; x=1685117128; 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=vIaUJVCeewjaJj9CsG9YrnAPxYGAVa68+bWmYFI5w1w=; b=gL1tHeZop4TaptJ2KnQrmYUtrX+UJbhJbngS3YCa7p4ZOnTICkTJOsg216a0GTdPWi KqExUKdG9mYmTPpmLVkybXHx+Uee/ptdnUdUih+a6DrOwSRyuQqrEPKhzWIp4KQkXNdv oNk+BD/qlgjaiohv29Cusv5qliS5LePFbYUJJ+PcehSRNQ9VftLtfvTVzdEdxrOFO1oR tunt5E24OujYxg2/jgyTwcuEcUkeQoYpt/cEpmmhfQJVJuilHGZpJ9wYzE7h8HueRugs 6ZJAgLoBFYiZdQ/wshPX9lYeHm6j8zUahAywVQJ/fbNEsjJSsYdtyXriJfl4myJzjYDs d/bw== X-Gm-Message-State: AAQBX9cZ5l+doWXxv94v3O+08rV/tsySwoDdYBgaV70H7DVG4tErSxzW LaY0ikB3YV+RpPbQTgHfhYe+oFL03bwt4w== X-Google-Smtp-Source: AKy350bYq5U1w6R+NAfZBY+ZmQrl74N6xNVcwForkUFZfsQiYWhZQSsVn1Yc1aDMBRHE/G6Zen9/fg== X-Received: by 2002:a05:6870:41cd:b0:187:9a3d:c8ce with SMTP id z13-20020a05687041cd00b001879a3dc8cemr14213415oac.3.1682525128583; Wed, 26 Apr 2023 09:05:28 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b69:f6e1:8741:de7a:38fc]) by smtp.gmail.com with ESMTPSA id u2-20020a05687036c200b00177c314a358sm6755325oak.22.2023.04.26.09.05.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Apr 2023 09:05:28 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v5 08/14] smegw01: Change default boot device to eMMC Date: Wed, 26 Apr 2023 13:04:55 -0300 Message-Id: <20230426160501.1199085-8-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230426160501.1199085-1-festevam@gmail.com> References: <20230426160501.1199085-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 v4: - 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 71f2d9c8e85c..8f68472f5bad 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 Wed Apr 26 16:04: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: 1774161 X-Patchwork-Delegate: sbabic@denx.de 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=MIoF1mrQ; 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 4Q63fk41nBz23vJ for ; Thu, 27 Apr 2023 02:07:26 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8CB26863DD; Wed, 26 Apr 2023 18:05: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="MIoF1mrQ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7389A863B5; Wed, 26 Apr 2023 18:05: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-x30.google.com (mail-oa1-x30.google.com [IPv6:2001:4860:4864:20::30]) (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 911E08639F for ; Wed, 26 Apr 2023 18:05:32 +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-x30.google.com with SMTP id 586e51a60fabf-18eabdf5215so432156fac.0 for ; Wed, 26 Apr 2023 09:05:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682525131; x=1685117131; 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=RNhWMyxfhmp+gKjC3IO9O6I2rp8wLkJUnbv4115NQXs=; b=MIoF1mrQlnBmZF7gl+zr68KmTY3qMv5xDtII8vsyxsOyB7ZHv6Eenf+GhOHy1mKyfw 3othS52p835TCB34Wi1m4Sy6s8WgTfst6Imbs2TFxVnsa1bRuY3u67TFyV6h8mGEigGN zH5jMhh+ApdaHNPt7VqI9L4HOSzODTrzO5JcW9iLY8ptdESbZH/Lm2qT7FIiUqa802yt X8zqjjtqL+8NnucSTPrM+Yl/xQ2kvG2wKaAAY/VBs2EdKD2dOfFCoXQINqkVkiH535Ys re8kjGHC+gPlNIEciF5YUr4ZgAXwIMo8uQIvTDpopYiXM6Nl84r2LuSUI/BJzCUVRnfj OmCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682525131; x=1685117131; 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=RNhWMyxfhmp+gKjC3IO9O6I2rp8wLkJUnbv4115NQXs=; b=InQlUzr1xDBdQd8Z2eGYArAcu2KIKFzFwVFXF5uCtVvwfOp59xKIo4tKgzPLh0nvm/ t4nL4VTjWnCvthpK3e3HWCWxHp1U9tvtGbk2nHkZnCV56eKYJ3tmhY8Wc/nE+H5XzKKA 6twTNWJpuIrp6JCQ7642RWq1v2VU8l+bhz0wE2vW7BQP36YbqqsqSkbRVPWNGKNE8YrR hQoo0iPxLsIw0y6AnQJCmC8AW0G8MqjvpgkhKHW7h9NiQYLmuzE06/VK2nJI95KGrF0t Xoknc9IdFZQ1Y4pbVU/PTlLuy6Gj5k9EIvWc1VC8ZlVYAnWiNbeWU2e05yiO/ZBZyIz4 a1KA== X-Gm-Message-State: AAQBX9d14snag1W8ep06vFJIwHp3nlkLi3ZQWD0Abgn43vXWGr5gWRLP 6cnSDELVfN7fyINSYbOojMo= X-Google-Smtp-Source: AKy350aWLdjzBYut0AgrdWtzKtm823ny1jrEwHmrlpHJzE8oKaDrJYDFG98ZEMffcNFanrsK71qt9g== X-Received: by 2002:a05:6870:2409:b0:171:a749:bc0c with SMTP id n9-20020a056870240900b00171a749bc0cmr4001736oap.3.1682525131050; Wed, 26 Apr 2023 09:05:31 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b69:f6e1:8741:de7a:38fc]) by smtp.gmail.com with ESMTPSA id u2-20020a05687036c200b00177c314a358sm6755325oak.22.2023.04.26.09.05.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Apr 2023 09:05:30 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v5 09/14] smegw01: Switch to fitImage Date: Wed, 26 Apr 2023 13:04:56 -0300 Message-Id: <20230426160501.1199085-9-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230426160501.1199085-1-festevam@gmail.com> References: <20230426160501.1199085-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 v4: - 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 8f68472f5bad..852188327777 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 Wed Apr 26 16:04: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: 1774162 X-Patchwork-Delegate: sbabic@denx.de 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=Vt3EXsU3; 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 4Q63g05V2Mz23vJ for ; Thu, 27 Apr 2023 02:07:40 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DAA1A863F2; Wed, 26 Apr 2023 18:05:44 +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="Vt3EXsU3"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B2036863BF; Wed, 26 Apr 2023 18:05:37 +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-x35.google.com (mail-oa1-x35.google.com [IPv6:2001:4860:4864:20::35]) (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 03330863AA for ; Wed, 26 Apr 2023 18:05: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-oa1-x35.google.com with SMTP id 586e51a60fabf-188090ebf84so1146444fac.1 for ; Wed, 26 Apr 2023 09:05:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682525133; x=1685117133; 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=MYPVwNuhOd7xEAYUOfA8xJfTM8xMIbRLmQt7OsQHlTQ=; b=Vt3EXsU3Bb7fXBiXnf9YPrckf1eTBwcMIok+ehWR4ZioJo063yjrdpDzYKzrZge9Vm lbut9XOTBMkppTH3Z/4OaWcurYGuEmI7TxswlEx4pVlQ2bp69eAmD4a6P1UQjzh4sOnL qtp3JF8V1CH+c8f3qJpjsj6vMpMijAwVamoVrXDevrM4/9TLLIjMalHy4j6rUOiI41/Q YlfDUpBfUd0mHTcBIfFPe6ofTiK3Zruw0hGJhjY5bKsV1wTkTa5otG/n9mxfxmG0UZYm x+JX8Md3QubtZI34tiXmAHHdMcSdp06eLxQ2WHXDjjzkOO0oJTlsVTcourNcN1GGrqh6 ydYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682525133; x=1685117133; 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=MYPVwNuhOd7xEAYUOfA8xJfTM8xMIbRLmQt7OsQHlTQ=; b=JNqHl4m2dVvLEA+myXk8sgp54z1Xq5vl1au6k3bdZXRqmp/TBrJEQD9Hh8EZIzRsOe CWa8excynHR8K4UgjQcsFfdvEdIuY3v34jXmp8xhEaXfTxgacaAMN1MKDWw+Zm27ntFZ CW+aFiLk7RfShHz7Kx0jxKaIQDn5zQSaKp/XExnUcArbQE5VI6KznX392gCTGKRcJseQ Ewwc3Gt1rM9b9lTfd2QIp3zFM8GeaWOxtOJw19V+FAMfFLWJZkf0tKSEsf25jniBrtUZ sWCacGjaE9SH6M91e5D1KrzdVc4p0NQGfaBzoOH6UQhutWRGAEWageNgPJb/dS8e/Era uX7A== X-Gm-Message-State: AAQBX9d7yClL8ftLQeuwetpDk2iRtgTLdUFjWCIQSRawNLbyZSK9RA8X m+qyYeTPZaUdEgXkl7eIC4MzsSRV7uMBRg== X-Google-Smtp-Source: AKy350aF6nCXshEd6qmhIkew2iTbWNiKowTpkBCpn/yD3BD6HpF33hys6vwe+QbK81wHo0WZ7glc+g== X-Received: by 2002:a05:6870:b689:b0:17e:a596:672f with SMTP id cy9-20020a056870b68900b0017ea596672fmr12869664oab.4.1682525133504; Wed, 26 Apr 2023 09:05:33 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b69:f6e1:8741:de7a:38fc]) by smtp.gmail.com with ESMTPSA id u2-20020a05687036c200b00177c314a358sm6755325oak.22.2023.04.26.09.05.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Apr 2023 09:05:33 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v5 10/14] smegw01: Add lockdown U-Boot env support Date: Wed, 26 Apr 2023 13:04:57 -0300 Message-Id: <20230426160501.1199085-10-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230426160501.1199085-1-festevam@gmail.com> References: <20230426160501.1199085-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 v4: - 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 d8f24695d0d2..390214c285bb 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 7d4de9326d6f..e648b196b9d1 100644 --- a/board/storopack/smegw01/smegw01.c +++ b/board/storopack/smegw01/smegw01.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -103,3 +104,19 @@ uint board_mmc_get_env_part(struct mmc *mmc) part = 0; 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 54cf1cfc1f1b..ea25b3b87ce4 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 852188327777..6f373973ab84 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 Wed Apr 26 16:04: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: 1774163 X-Patchwork-Delegate: sbabic@denx.de 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=NvNH4K70; 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 4Q63gG5d98z23vJ for ; Thu, 27 Apr 2023 02:07:54 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5397A863E6; Wed, 26 Apr 2023 18:05: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="NvNH4K70"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id ADF25863BF; Wed, 26 Apr 2023 18:05: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=ham autolearn_force=no version=3.4.2 Received: from mail-oa1-x35.google.com (mail-oa1-x35.google.com [IPv6:2001:4860:4864:20::35]) (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 43EA58636B for ; Wed, 26 Apr 2023 18:05: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-oa1-x35.google.com with SMTP id 586e51a60fabf-188090ebf84so1146455fac.1 for ; Wed, 26 Apr 2023 09:05:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682525136; x=1685117136; 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=LhZ6G6t2Tb7iE9Ad1DVpowFz5gqYDMXDEYRyT45Owm0=; b=NvNH4K709HfxxCMpjgtUJLVwdnwW2gLU6oIlCQHEGhXJZ8+IJzi0LAUNza4GxdpPUF 0cJKogBuYo7dIhJomUlxNzpurjypyaIRNobjhw7TUc9nigJLSc8Fr7HFs9sscQqvHzHy pDhXLC3VdZIEXDLfoMPxm+F/ClobckacXXEZdkUR7Hv400+Qz7/auZovQ7URwC10FS9A 0ZnMezTLSeVxceog9nr1x/oYUBByMrVy6m20ZBNokjsshnbrhZAJh7SfxQxZ12BVHsS2 irA4OIijRAH92mra3tx7y3TfyqQajmx0FQPG5Nc5gZjmxcLoiY4JYiPfsOKPzviHLNe/ rnvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682525136; x=1685117136; 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=LhZ6G6t2Tb7iE9Ad1DVpowFz5gqYDMXDEYRyT45Owm0=; b=bSzKyODVkz1XzmHqj1K530uA7Rn0q50js88hh/P1uLIb0jbj5VNwbUzhpOpgtAAopq ZlNNauRH66fUOgWbsynnhHXaFKbtDKaiboeXU8vJ2XFgo+kBaWTg3RCk4Q3aRJlFo4cX OJ2RQBIcALftIRDDUN8DKK6vZW8SWDHqtPghGabH3XfiUoXOp6B7mhAGIophoc4RCJGo eWDkNfzT97dlYtejCIRKIQ5WA2TsQy29zNeE35QOnqOLd9eN5xwyN4EDh4nZetaw3GSy CIuGdbS++QvlmPw/rX9W+XtlMJgbgzmCDioocBjU5IcjPvnJJE6c/543BrpYJWhA42uw p6cA== X-Gm-Message-State: AAQBX9cBIRdCZN3gLKKWG1g6KOcdxXTr+E+oKW8NeZ0/I5IIcWhm9QPI CG14CipIIox/mBnfHt0F9rM= X-Google-Smtp-Source: AKy350ZGGNwMb206ggZ74h7orz4O1gD1nSHnWzmatAruDWEUxik47GOsW8ABFbeD2S7wEbxxcVC7wg== X-Received: by 2002:a05:6870:2194:b0:18e:1d73:1022 with SMTP id l20-20020a056870219400b0018e1d731022mr12217917oae.2.1682525135755; Wed, 26 Apr 2023 09:05:35 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b69:f6e1:8741:de7a:38fc]) by smtp.gmail.com with ESMTPSA id u2-20020a05687036c200b00177c314a358sm6755325oak.22.2023.04.26.09.05.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Apr 2023 09:05:35 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v5 11/14] smegw01: Read the second MAC address Date: Wed, 26 Apr 2023 13:04:58 -0300 Message-Id: <20230426160501.1199085-11-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230426160501.1199085-1-festevam@gmail.com> References: <20230426160501.1199085-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 v4: - None 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 e648b196b9d1..20c09700bf0d 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 Wed Apr 26 16:04: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: 1774165 X-Patchwork-Delegate: sbabic@denx.de 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=b8lWihjt; 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 4Q63gZ4k8Tz23vJ for ; Thu, 27 Apr 2023 02:08:10 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F1F57863EB; Wed, 26 Apr 2023 18:05:47 +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="b8lWihjt"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 60703863BF; Wed, 26 Apr 2023 18:05:41 +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-x2b.google.com (mail-oa1-x2b.google.com [IPv6:2001:4860:4864:20::2b]) (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 CEA088636B for ; Wed, 26 Apr 2023 18:05:38 +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-x2b.google.com with SMTP id 586e51a60fabf-18802d14ba7so1093365fac.0 for ; Wed, 26 Apr 2023 09:05:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682525138; x=1685117138; 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=yGGj89laJEbviljKKzwHdnl/yS01qSmKm0Ufvc9XjJk=; b=b8lWihjtqgpPZGrmqcc8713vwrJhLuyI1C8gaRg3IAm8t9YwFcPYos/H+vpqGBa9av YbBmgX/B9JeYZoqhsMle7EwYluVmGcCtZ0wIi0i1SV2yqoZUkVYZ15yfweavhmTedyJV By7Q+NlidWtQyxuppa79klBxWeG+8oF2qZu5zndLESU4V8ngk6XiZQKFFK9ISM5VBKK/ NYRqiQMAILfYl1uzAC+Gmcby4Y87bp09qQoKW/P3sXgxf6hbK2GTIzxkwnkQa9ye08i2 BYkK9WlWOi7mDz4upxtKun3Ohe36CSC+kKGJgi1nyI7dWUfaiG8Rjk4KpBmxP3QzTHGi vAhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682525138; x=1685117138; 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=yGGj89laJEbviljKKzwHdnl/yS01qSmKm0Ufvc9XjJk=; b=bPZEICegY7cShIMt6YTcrM2XmcEQ1E3lGREU74ZWqu6hAEubkUSiU0xgZdQdOr54zh H2Dhm1y6DiFYLYkZV4hpx8sbUES+p3cZ9pYylVCwNf84OMiPahYxfA2E7Dh0DN5dv8eG x25f+U0JsI0VdaJlaftDpVCjuDh4j6v8YQy22hWL1vba4nvyJd9l22+caFGisiycDQzq HZFaJlgIXoW2LLsqpA6WDTcNuxI3PkhADPqt1lQsRobSQ8Kj+DEXMZFwUKnchEL/tfF0 TzuO/jqFPLIimv2d4E4wbMGGP6IFWyFW3Ml6mkV7Nk/dpIdKEB9VTCso76kFvjR8cU7Z y06A== X-Gm-Message-State: AAQBX9disn1WTRwzBbzoPFHESwof26pbdEv+lniGonf9i60vYE2M1f8I V7PY2hyAl4g7EoJXwmUcgd2KS6bTkNjDdw== X-Google-Smtp-Source: AKy350b/kAfOTwmL3DKWjW20mDvqsBpqm/9cQM54wgJ2T+wpbQlRfyHO22i7yPHfc9DOCFGlUzq1gg== X-Received: by 2002:a05:6870:818a:b0:176:3704:1a15 with SMTP id k10-20020a056870818a00b0017637041a15mr13130340oae.1.1682525138344; Wed, 26 Apr 2023 09:05:38 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b69:f6e1:8741:de7a:38fc]) by smtp.gmail.com with ESMTPSA id u2-20020a05687036c200b00177c314a358sm6755325oak.22.2023.04.26.09.05.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Apr 2023 09:05:37 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v5 12/14] smegw01: Disable additional boot menu options Date: Wed, 26 Apr 2023 13:04:59 -0300 Message-Id: <20230426160501.1199085-12-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230426160501.1199085-1-festevam@gmail.com> References: <20230426160501.1199085-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 v4: - None configs/smegw01_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/smegw01_defconfig b/configs/smegw01_defconfig index ea25b3b87ce4..fe8152f33e6e 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 Wed Apr 26 16:05:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1774166 X-Patchwork-Delegate: sbabic@denx.de 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=ksJjDEIn; 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 4Q63gt1chKz23vJ for ; Thu, 27 Apr 2023 02:08:26 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AA7AC86333; Wed, 26 Apr 2023 18:05: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="ksJjDEIn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 84975863EF; Wed, 26 Apr 2023 18:05:44 +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-x2b.google.com (mail-oa1-x2b.google.com [IPv6:2001:4860:4864:20::2b]) (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 4923B863C8 for ; Wed, 26 Apr 2023 18:05:42 +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-x2b.google.com with SMTP id 586e51a60fabf-1840ad6769fso1142557fac.0 for ; Wed, 26 Apr 2023 09:05:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682525141; x=1685117141; 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=wJNLEmqBp/tJNiAP4E4jK/WYELgQuyQ7elQi5ypldCs=; b=ksJjDEIn0fbmMmWd8c2MQ82euPgN1qL2l/GAb2XFnGo9xLsbpKpJnZEybzwiir2dyr 7jxVqtiiZVBM0Y023q+xdbjT1ToVc45idQev03QhxCNmKdTePI15XDh9S3OJMVQQexT7 0X4VCf7kcNuntysy3vQWNvQxcl/5q4FEXMxh6YavfsP6PYhq9bsYgLxH4QE9gSMdo2i1 fXQq16HbcCQ/hxPGDP1QxznJhSeOY9qVYmgRJakjM3xVZ6sz3q4mECbMl1FY2/GrMvoJ Tepk/JnhX/u7YBF3Pn71fMrPszDeOonNKMK9NJ3uDZibV4EiN8wTYhX45nmSR9A/XsWN XN7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682525141; x=1685117141; 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=wJNLEmqBp/tJNiAP4E4jK/WYELgQuyQ7elQi5ypldCs=; b=ScNXHTKj2NutNEj8G27LWMQvN9vtHq6nrUpMNMDeRnhpfMDmgpKM39CRnW9GaGjERl O0bF9hxJg4doVFb4xRE5OKx/J8u/pUy8VauvoM6EmH7TUAIH1/7sy9QDu6oCUv5Ee/lm EUJlN6PX+MgKonvoxwVUuYQfgIYmDyjyoHag8MmnlGLhI/1rXrIqZdcE6COOSrEpX8tp 7oNTYP9rZGvjSuwnxLIznsl2qhU21Il8Gt5ftQ3BiXzmglmINikJ5g6CZ0fDgqelxNuj nyKO+vGRRmlN/AY9ps7fWf0CmpRr+cPJmH6GS/RQWLoDtS+dDvPLk2+d00n4Gg+Y8Mlg /IjQ== X-Gm-Message-State: AAQBX9dfl6XmjopfNQDudKOBKhsS7mG68QSXLWcJ79GLVljN7vOzPc7R sv1oOZyHyVeY90hPoLQHvjRjSismsl+lGw== X-Google-Smtp-Source: AKy350aaExEKJpucRpZwgdZvYPP1WGQdvxfZ6mflYBRnWJf6An0mvjzRas0j57vBKY3iUhi3M4dlTA== X-Received: by 2002:a05:6871:8a7:b0:177:8383:7287 with SMTP id r39-20020a05687108a700b0017783837287mr14239487oaq.5.1682525140908; Wed, 26 Apr 2023 09:05:40 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b69:f6e1:8741:de7a:38fc]) by smtp.gmail.com with ESMTPSA id u2-20020a05687036c200b00177c314a358sm6755325oak.22.2023.04.26.09.05.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Apr 2023 09:05:40 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v5 13/14] smegw01: Fix fallback to altbootcmd Date: Wed, 26 Apr 2023 13:05:00 -0300 Message-Id: <20230426160501.1199085-13-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230426160501.1199085-1-festevam@gmail.com> References: <20230426160501.1199085-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 v4: - None configs/smegw01_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/smegw01_defconfig b/configs/smegw01_defconfig index fe8152f33e6e..3d2713f52807 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 From patchwork Wed Apr 26 16:05: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: 1774167 X-Patchwork-Delegate: sbabic@denx.de 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=CsGTvXNk; 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 4Q63h85jJZz23vJ for ; Thu, 27 Apr 2023 02:08:40 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B0643863BF; Wed, 26 Apr 2023 18:05:56 +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="CsGTvXNk"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7C22A863E9; Wed, 26 Apr 2023 18:05: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=ham autolearn_force=no version=3.4.2 Received: from mail-oa1-x2b.google.com (mail-oa1-x2b.google.com [IPv6:2001:4860:4864:20::2b]) (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 19C008636B for ; Wed, 26 Apr 2023 18:05:44 +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-x2b.google.com with SMTP id 586e51a60fabf-18802d14ba7so1093391fac.0 for ; Wed, 26 Apr 2023 09:05:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682525143; x=1685117143; 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=4u3n9yUGilUfxegNbhh/m2IBnJhU9kgMHVbRnX7KTMg=; b=CsGTvXNkqhrAA+kVIo/n0b22i/eInVosduO0JrTD1d6tpZaJ1GMTw+I/Yp0wnkvlu2 j1Jq0UPLtW58wLbMJcY0GnTdZs+9+N3TjBDLyWy5tLPLUWuOCnNCgEd1ikwAOhizDH25 Wk0j5sTBTdVoxpPBk4+wN4LV8dMHsTn3HrunUOkHncMznOGcdD2anBqbc4Gi3SIWaMwV D6QmETentM/VJMs68jINJwC2mwECWbnZqpGQ0CkS0qWX62/acKB3x1KLUtk+SuRCfAG0 +/s0LStsPm4+5S7z6S//UvEO88FrDqLuEyFVZkLUY9A1Gvstf7l0LHnIrCDLiPLBtb5w YNOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682525143; x=1685117143; 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=4u3n9yUGilUfxegNbhh/m2IBnJhU9kgMHVbRnX7KTMg=; b=FSUCDg3VsRgvnXojX0ZxjQ8z1p3Nk9enzbHIRzzz/dfYTftFic6nj9SjIFwRSrklxR zihqSSXtqqTUC4A3mbDCLKhoHJlXBAqbLRA9paK+ioonEoTfK4QxtbQFkGNm7WMpsyap DM3DNVz/tYKr4g03K3p2c3noT379K4tdJZ/VLbjEhfKkiohaeIkgjEs1X+DnRd3dzIlZ KF/CgKCPjAyg314WjPd7SY6PjXCIC752ZexKwA9LA/gfmWFMcgQnrIMaZeBqRI1HnMN2 iazdvdAOJQ3TECKqTbhvsORdDu99D/GtGxiTE+jWYRG2/oQ8Fc7frE3r+oEm9ubLOLA6 4RVw== X-Gm-Message-State: AAQBX9c0iYINFZpp2VmuDNd2K+va6YkWd2PS19qsbTQY7sw1/x/pKaFF LpWIYCGSxSQT0+grMjKQdVrKHhS7ueSVXg== X-Google-Smtp-Source: AKy350ZvrSJTmYQUY3XUfU2Ytq2CjFWiB9+tMJdxDIdEBdpNLtxJ5xkdFbqAiSHGxBPXStqSpvJzfA== X-Received: by 2002:a05:6870:3515:b0:16e:4fb6:707f with SMTP id k21-20020a056870351500b0016e4fb6707fmr12961400oah.3.1682525143515; Wed, 26 Apr 2023 09:05:43 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b69:f6e1:8741:de7a:38fc]) by smtp.gmail.com with ESMTPSA id u2-20020a05687036c200b00177c314a358sm6755325oak.22.2023.04.26.09.05.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Apr 2023 09:05:43 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam , Tom Rini Subject: [PATCH v5 14/14] smegw01: Convert CFG_EXTRA_ENV_SETTINGS to an env file Date: Wed, 26 Apr 2023 13:05:01 -0300 Message-Id: <20230426160501.1199085-14-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230426160501.1199085-1-festevam@gmail.com> References: <20230426160501.1199085-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, it is recommended to move from CFG_EXTRA_ENV_SETTINGS to an env file, so do the conversion. Suggested-by: Tom Rini Signed-off-by: Fabio Estevam Reviewed-by: Tom Rini --- Changes since v4: - Also add SETUP_BOOT_MENU into the .env file (Tom). Cc: Tom Rini board/storopack/smegw01/smegw01.env | 89 +++++++++++++++++++++++++++++ include/configs/smegw01.h | 68 ---------------------- 2 files changed, 89 insertions(+), 68 deletions(-) create mode 100644 board/storopack/smegw01/smegw01.env diff --git a/board/storopack/smegw01/smegw01.env b/board/storopack/smegw01/smegw01.env new file mode 100644 index 000000000000..25bc7cdbd28b --- /dev/null +++ b/board/storopack/smegw01/smegw01.env @@ -0,0 +1,89 @@ +// SPDX-License-Identifier: GPL-2.0+ +#ifdef CONFIG_SYS_BOOT_LOCKED +#define SETUP_BOOT_MENU setup_boot_menu=setenv bootmenu_0 eMMC=run bootcmd +#else +#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; +#endif + +altbootcmd= + echo Performing rollback...; + 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; +boot_emmc=setenv mmcdev_wanted 1; run persist_mmcdev; run bootcmd; +boot_sd=setenv mmcdev_wanted 0; run persist_mmcdev; run bootcmd; +bootcmd=run finduuid; run distro_bootcmd +bootdelay=2 +bootlimit=3 +bootm_size=0x10000000 +commit_mmc= + if test "${ustate}" = 1 -a "${mmcpart}" != "${mmcpart_committed}"; then + setenv mmcpart_committed ${mmcpart}; + saveenv; + fi; +console=ttymxc0 +fdt_addr=0x83000000 +fdtfile=imx7d-smegw01.dtb +fit_addr=0x88000000 +image=fitImage +loadaddr=0x80800000 +loadbootpart=mmc partconf 1 boot_part +loadimage=load mmc ${mmcdev}:${gpt_partition_entry} ${fit_addr} boot/${image} +loadpart=gpt setenv mmc ${mmcdev} rootfs-${mmcpart_committed} +mmcargs= + setenv bootargs console=${console},${baudrate} root=/dev/mmcblk${mmcdev}p${gpt_partition_entry} rootwait rw SM_ROOT_DEV=${mmcdev} SM_ROOT_PART=${gpt_partition_entry} SM_BOOT_PART=${boot_part} +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 + ; + else + run altbootcmd; + fi; +mmcdev=1 +mmcpart=1 +mmcpart_committed=1 +persist_mmcdev= + if test "${mmcdev}" != "${mmcdev_wanted}"; then + setenv mmcdev "${mmcdev_wanted}"; + saveenv; + fi; +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; +SETUP_BOOT_MENU diff --git a/include/configs/smegw01.h b/include/configs/smegw01.h index 6f373973ab84..0aa25f9e2eaa 100644 --- a/include/configs/smegw01.h +++ b/include/configs/smegw01.h @@ -24,19 +24,8 @@ #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 \ @@ -48,63 +37,6 @@ "upgrade_available:dw," \ EXTRA_ENV_FLAGS -#define CFG_EXTRA_ENV_SETTINGS \ - "image=fitImage\0" \ - "console=ttymxc0\0" \ - "fdtfile=imx7d-smegw01.dtb\0" \ - "fdt_addr=0x83000000\0" \ - "bootm_size=0x10000000\0" \ - "mmcdev=1\0" \ - "mmcpart=1\0" \ - "mmcpart_committed=1\0" \ - "mmcargs=setenv bootargs console=${console},${baudrate} " \ - "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" \ - "fit_addr=0x88000000\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" \ - "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 " \ - "; " \ - "else " \ - "run altbootcmd; " \ - "fi;\0" \ - "altbootcmd=echo Performing rollback...; " \ - "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" \ - SETUP_BOOT_MENU - /* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR