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 019F6C04AA5 for ; Thu, 25 Aug 2022 06:54:33 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9902F84869; Thu, 25 Aug 2022 08:54:22 +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 B356B8486A; Thu, 25 Aug 2022 08:54:13 +0200 (CEST) Received: from inet11.abb.com (spf.hitachienergy.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 6C53D845E2 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 27P6s7Nn021206 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Thu, 25 Aug 2022 08:54:08 +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 2022082508540735-29985 ; 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 2022082508540649-9633 ; 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" Subject: [PATCH 5/5] brppt1: Update environment to support new boot concept Date: Thu, 25 Aug 2022 08:54:04 +0200 Message-Id: <20220825065404.161821-6-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: 54731 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 * Drop legacy /boot/PPTImage.md5 check * Update device tree naming * Update t30args#0 root cmd line property to support latest kernel versions (root=3D/dev/mmcblk0p2 for linux < 4 and root=3D/dev/mmcblk1p2 for linux >=3D 4) * Add custom bootloader version string * Destroy invalid dtb at ${dtbaddr} and configuration script at ${cfgaddr} to ensure proper boot in warm restart case. Signed-off-by: Bernhard Messerklinger --- configs/brppt1=5Fmmc=5Fdefconfig | 4 +++- include/configs/brppt1.h | 18 ++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/configs/brppt1=5Fmmc=5Fdefconfig b/configs/brppt1=5Fmmc=5Fdefc= onfig index 6da6d58bfd..a45604de16 100644 --- a/configs/brppt1=5Fmmc=5Fdefconfig +++ b/configs/brppt1=5Fmmc=5Fdefconfig @@ -17,6 +17,8 @@ CONFIG=5FSPL=5FSERIAL=3Dy CONFIG=5FSPL=3Dy CONFIG=5FENV=5FOFFSET=5FREDUND=3D0x50000 CONFIG=5FSYS=5FLOAD=5FADDR=3D0x80000000 +CONFIG=5FLOCALVERSION=3D"-2.0.0" +# CONFIG=5FLOCALVERSION=5FAUTO is not set CONFIG=5FHAS=5FCUSTOM=5FSYS=5FINIT=5FSP=5FADDR=3Dy CONFIG=5FCUSTOM=5FSYS=5FINIT=5FSP=5FADDR=3D0x4030ff00 # CONFIG=5FEXPERT is not set @@ -26,7 +28,7 @@ CONFIG=5FBOOTDELAY=3D0 CONFIG=5FUSE=5FBOOTCOMMAND=3Dy CONFIG=5FBOOTCOMMAND=3D"run b=5Fdefault" CONFIG=5FUSE=5FPREBOOT=3Dy -CONFIG=5FPREBOOT=3D"mw ${dtbaddr} 0; run cfgscr; run brdefaultip" +CONFIG=5FPREBOOT=3D"mw ${cfgaddr} 0; mw ${dtbaddr} 0; run cfgscr; run brde= faultip" 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 aaf3f8b4a5..2c5236aa58 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -29,18 +29,16 @@ =20 #define MMC=5FTGTS \ "t30args#0=3Dsetenv bootargs ${optargs=5Frot} ${optargs} console=3D${conso= le} " \ - "b=5Fmode=3D${b=5Fmode} root=3D/dev/mmcblk0p2 rootfstype=3Dext4\0" \ + "b=5Fmode=3D${b=5Fmode} root=3D${root=5Fdev} rootfstype=3Dext4 rootwait\0= " \ "b=5Ft30lgcy#0=3D" \ - "load ${loaddev}:2 ${loadaddr} /boot/PPTImage.md5 && " \ "load ${loaddev}:2 ${loadaddr} /boot/zImage && " \ - "load ${loaddev}:2 ${dtbaddr} /boot/am335x-ppt30.dtb || " \ - "load ${loaddev}:1 ${dtbaddr} am335x-ppt30-legacy.dtb; "\ + "run load=5Fdtb && " \ "run t30args#0; run cfgscr; bootz ${loadaddr} - ${dtbaddr}\0" \ "t30args#1=3Dsetenv bootargs ${optargs=5Frot} ${optargs} console=3D${conso= le} " \ "b=5Fmode=3D${b=5Fmode}\0" \ "b=5Ft30lgcy#1=3D" \ "load ${loaddev}:1 ${loadaddr} zImage && " \ - "load ${loaddev}:1 ${dtbaddr} am335x-ppt30.dtb && " \ + "load ${loaddev}:1 ${dtbaddr} am335x-brppt30.dtb && " \ "load ${loaddev}:1 ${ramaddr} rootfsPPT30.uboot && " \ "run t30args#1; run cfgscr; bootz ${loadaddr} ${ramaddr} ${dtbaddr}\0" \ "b=5Fmmc0=3Dload ${loaddev}:1 ${scraddr} bootscr.img && source ${scraddr}\= 0" \ @@ -48,11 +46,19 @@ "b=5Ftgts=5Fstd=3Dmmc0 mmc1 t30lgcy#0 t30lgcy#1 usb0 net\0" \ "b=5Ftgts=5Frcy=3Dt30lgcy#1 usb0 net\0" \ "b=5Ftgts=5Fpme=3Dnet usb0 mmc0 mmc1\0" \ -"loaddev=3Dmmc 1\0" +"loaddev=3Dmmc 1\0" \ +"root=5Fdev=3D/dev/mmcblk0p2\0" \ +"load=5Fdtb=3Dload ${loaddev}:2 ${dtbaddr} /boot/am335x-brppt30.dtb; " \ + "if test $? -eq 0; then " \ + "setenv root=5Fdev /dev/mmcblk1p2; " \ + "else; " \ + "load ${loaddev}:1 ${dtbaddr} am335x-brppt30-legacy.dtb; " \ + "fi;\0" =20 #ifdef CONFIG=5FENV=5FIS=5FIN=5FMMC #define MMCTGTS \ MMC=5FTGTS \ +"cfgscr=3Dmw ${cfgaddr} 0;" \ " mmc dev 1; mmc read ${cfgaddr} 200 80; source ${cfgaddr};" \ " fdt addr ${dtbaddr} || cp ${fdtcontroladdr} ${dtbaddr} 4000\0" #else --=20 2.37.2