From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web09.906.1625011784956240003 for ; Tue, 29 Jun 2021 17:09:45 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id DA8A940C52; Wed, 30 Jun 2021 00:09:43 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TNJcTtER3lrK; Wed, 30 Jun 2021 00:09:43 +0000 (UTC) Received: from mail.denix.org (pool-100-15-86-127.washdc.fios.verizon.net [100.15.86.127]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 970D340C16; Wed, 30 Jun 2021 00:09:38 +0000 (UTC) Received: by mail.denix.org (Postfix, from userid 1000) id 103FF17461C; Tue, 29 Jun 2021 20:09:38 -0400 (EDT) Date: Tue, 29 Jun 2021 20:09:38 -0400 From: "Denys Dmytriyenko" To: nm@ti.com Cc: praneeth@ti.com, yogeshs@ti.com, denys@konsulko.com, Tom Rini , meta-ti@lists.yoctoproject.org Subject: Re: [meta-ti] [dunfell/master PATCH] ti-sci-fw: k3-image-gen: Revert SPL address change for mainline Message-ID: <20210630000938.GA1528@denix.org> References: <20210629203630.28915-1-nm@ti.com> MIME-Version: 1.0 In-Reply-To: <20210629203630.28915-1-nm@ti.com> User-Agent: Mutt/1.5.20 (2009-06-14) Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, Jun 29, 2021 at 03:36:30PM -0500, Nishanth Menon via lists.yoctoproject.org wrote: > Commit 02a2433c ("ti-sci-fw: Update image gen to latest") switched to a > newer commit in k3-image-gen that also picked up TISCI firmware release, > However, does include a change where the SPL address changed. > > This switch in address has been queued for upstream in a future release > (v5.14 + u-boot 2021.10) and current mainline formal tags do not support > this address change. As a result, we have a broken AM64x mainline > support. > > Revert this specific change from k3-image-gen for mainline alone for > now. > > NOTE: This uses ARAGO_BRAND=mainline which is NOT accurate for meta-ti > which is distro independent, hence without appropriate changes while > using alternate distros, this change will not take effect. Right, this flag is Arago Distro specific and it won't do anything for people using meta-ti directly. Hopefully this can be fixed properly very soon and this hack removed. One more cleaner approach would be to have a separate "mainline" branch for k3-image-gen repo, where you have the correct address and mainline recipe using it - that way it will work for meta-ti by itself... Another cleaner solution could be to pass SBL_LOADADDR from the recipe itself to override the one weakly-assigned in the Makefile... Meanwhile, I would suggest weakly-definint ARAGO_BRAND in the recipe, as otherwise the variable will be undefined and may break parsing, i.e. "undefined behavior": ARAGO_BRAND ?= "" > Reported-by: Tom Rini > Suggested-by: Denys Dmytriyenko > Signed-off-by: Nishanth Menon > --- > > Example: u-boot 2021.07-rc5 + v5.13 kernel: https://pastebin.ubuntu.com/p/Xxvz5YkCvY/ > > ...-Makefile-Move-the-SPL-Load-address-.patch | 36 +++++++++++++++++++ > recipes-bsp/ti-sci-fw/ti-sci-fw.inc | 8 +++++ > 2 files changed, 44 insertions(+) > create mode 100644 recipes-bsp/ti-sci-fw/files/0001-Revert-soc-am64x-Makefile-Move-the-SPL-Load-address-.patch > > diff --git a/recipes-bsp/ti-sci-fw/files/0001-Revert-soc-am64x-Makefile-Move-the-SPL-Load-address-.patch b/recipes-bsp/ti-sci-fw/files/0001-Revert-soc-am64x-Makefile-Move-the-SPL-Load-address-.patch > new file mode 100644 > index 000000000000..63a5796d6b82 > --- /dev/null > +++ b/recipes-bsp/ti-sci-fw/files/0001-Revert-soc-am64x-Makefile-Move-the-SPL-Load-address-.patch > @@ -0,0 +1,36 @@ > +From 83d29d5e346083254e71fbe483cb14f6657b9965 Mon Sep 17 00:00:00 2001 > +From: Nishanth Menon > +Date: Tue, 29 Jun 2021 12:03:29 -0500 > +Subject: [PATCH] Revert "soc: am64x: Makefile: Move the SPL Load address to > + 0x70000000" > + > +This reverts commit e411dc16862b5bb2d8befb12496b03d7b01c87b2. > + > +Mainline is NOT ready for the change yet as of u-boot 2021.07 + v5.13, > +So, this patch reverts the SPL address change. > + > +This patch needs to be dropped once mainline u-boot and kernel have > +migrated over to newer releases. > + > +Upstream-Status: Not applicable Extra thanks for this! ^ > +Signed-off-by: Nishanth Menon > +--- > + soc/am64x/Makefile | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/soc/am64x/Makefile b/soc/am64x/Makefile > +index 45425428f9c6..e8747376f153 100644 > +--- a/soc/am64x/Makefile > ++++ b/soc/am64x/Makefile > +@@ -30,7 +30,7 @@ > + # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > + # > + > +-SBL_LOADADDDR ?= 0x70000000 > ++SBL_LOADADDDR ?= 0x70020000 > + COMBINED_SYSFW_BRDCFG_LOADADDR ?= 0x70000 > + LOADADDR ?= 0x44000 > + SCIFS = sci > +-- > +2.32.0 > + > diff --git a/recipes-bsp/ti-sci-fw/ti-sci-fw.inc b/recipes-bsp/ti-sci-fw/ti-sci-fw.inc > index 4004d93f47c9..503cd5ceadc6 100644 > --- a/recipes-bsp/ti-sci-fw/ti-sci-fw.inc > +++ b/recipes-bsp/ti-sci-fw/ti-sci-fw.inc > @@ -15,4 +15,12 @@ SRC_URI = " \ > git://git.ti.com/k3-image-gen/k3-image-gen.git;protocol=git;branch=master;destsuffix=imggen;name=imggen \ > " > > +# Mainline u_boot 2021.07 and upstream kernel v5.13 tag cannot use new SPL address > +# in K3-Imagegen > +SRC_URI += "\ > + ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', '\ > + file://0001-Revert-soc-am64x-Makefile-Move-the-SPL-Load-address-.patch;patchdir=../imggen \ > + ', '', d)} \ > +" > + > S = "${WORKDIR}/git" > -- > 2.32.0 > -- Regards, Denys Dmytriyenko PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964 Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964