From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 395CDC04AA5 for ; Thu, 25 Aug 2022 06:54:15 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 02B9084522; Thu, 25 Aug 2022 08:54:13 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=br-automation.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id CDE0584869; Thu, 25 Aug 2022 08:54:10 +0200 (CEST) Received: from inet11.abb.com (inet11.abb.com [138.225.1.77]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 4753E84522 for ; Thu, 25 Aug 2022 08:54:08 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=br-automation.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bernhard.messerklinger@br-automation.com Received: from brsmtp01.br-automation.co.at ([10.15.2.36]) by inet11.abb.com (8.14.7/8.14.7) with ESMTP id 27P6s6Ue021190 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Thu, 25 Aug 2022 08:54:07 +0200 Received: from extmail.br-automation.com ([192.168.112.26]) by brsmtp01.br-automation.co.at (IBM Domino Release 10.0.1FP3) with ESMTP id 2022082508540724-29984 ; Thu, 25 Aug 2022 08:54:07 +0200 Received: from ATEGGE3725.br-automation.co.at ([10.43.64.28]) by extmail.br-automation.com (IBM Domino Release 10.0.1FP3) with ESMTP id 2022082508540630-9632 ; Thu, 25 Aug 2022 08:54:06 +0200 From: "Bernhard Messerklinger" To: u-boot@lists.denx.de Cc: wolfgang.wallner@br-automation.com, "Bernhard Messerklinger" , "Hannes Schmelzer" Subject: [PATCH 4/5] include: configs: brppt1: Fix commit 0ea4fc4dcf90 Date: Thu, 25 Aug 2022 08:54:03 +0200 Message-Id: <20220825065404.161821-5-bernhard.messerklinger@br-automation.com> In-Reply-To: <20220825065404.161821-1-bernhard.messerklinger@br-automation.com> Content-Transfer-Encoding: quoted-printable X-Mailer: git-send-email 2.37.2 References: <20220825065404.161821-1-bernhard.messerklinger@br-automation.com> MIME-Version: 1.0 X-MIMETrack: Itemize by SMTP Server on BRSMTPINTERN2/InternSMTP(Release 10.0.1FP3|August 09, 2019) at 25/08/2022 08:54:06, Serialize by Router on BRSMTPINTERN2/InternSMTP(Release 10.0.1FP3|August 09, 2019) at 25/08/2022 08:54:06, Itemize by SMTP Server on BRSMTP01/Eggelsberg/AT/B&R(Release 10.0.1FP3|August 09, 2019) at 08/25/2022 08:54:07 AM X-TNEFEvaluated: 1 X-Disclaimed: 3143 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.6 at phobos.denx.de X-Virus-Status: Clean Commit 0ea4fc4dcf90 ("board/BuR: invalidate ${dtbaddr} before cfgscr") destroys the boot targets b=5Ft30lgcy#0 and b=5Ft30lgcy#1. The reason behind this is, that b=5Ft30lgcy#0 and b=5Ft30lgcy#1 both load the for booting needed device trees from mmc and the cfgscr script patches those. Because of this, cfgscr is not allowed to destroy the previously loaded device tree otherwise cfgscr will fail. This patch moves the device trees invalidation on warm restart to the PREBOOT cmd to fix that issue. Fixes: 0ea4fc4dcf90 ("board/BuR: invalidate ${dtbaddr} before cfgscr") Signed-off-by: Bernhard Messerklinger --- configs/brppt1=5Fmmc=5Fdefconfig | 2 +- include/configs/brppt1.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/configs/brppt1=5Fmmc=5Fdefconfig b/configs/brppt1=5Fmmc=5Fdefc= onfig index 716650aac9..6da6d58bfd 100644 --- a/configs/brppt1=5Fmmc=5Fdefconfig +++ b/configs/brppt1=5Fmmc=5Fdefconfig @@ -26,7 +26,7 @@ CONFIG=5FBOOTDELAY=3D0 CONFIG=5FUSE=5FBOOTCOMMAND=3Dy CONFIG=5FBOOTCOMMAND=3D"run b=5Fdefault" CONFIG=5FUSE=5FPREBOOT=3Dy -CONFIG=5FPREBOOT=3D"run cfgscr; run brdefaultip" +CONFIG=5FPREBOOT=3D"mw ${dtbaddr} 0; run cfgscr; run brdefaultip" CONFIG=5FSYS=5FCONSOLE=5FIS=5FIN=5FENV=3Dy CONFIG=5FSYS=5FCONSOLE=5FOVERWRITE=5FROUTINE=3Dy CONFIG=5FSYS=5FCONSOLE=5FINFO=5FQUIET=3Dy diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index 481473ae2c..aaf3f8b4a5 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -53,7 +53,6 @@ #ifdef CONFIG=5FENV=5FIS=5FIN=5FMMC #define MMCTGTS \ MMC=5FTGTS \ -"cfgscr=3Dmw ${dtbaddr} 0;" \ " mmc dev 1; mmc read ${cfgaddr} 200 80; source ${cfgaddr};" \ " fdt addr ${dtbaddr} || cp ${fdtcontroladdr} ${dtbaddr} 4000\0" #else --=20 2.37.2