ti-sci-fw: k3-image-gen: Revert SPL address change for mainline
PATCH v2 1/1 ti-sci-fw: k3-image-gen: Revert SPL address change for mainline
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.
---
Changes since V1:
* Added empty ARAGO_BRAND in case someone is using non-arago based builds.
...-Makefile-Move-the-SPL-Load-address-.patch | 36 +++++++++++++++++++ recipes-bsp/ti-sci-fw/ti-sci-fw.inc | 11 ++++++ 2 files changed, 47 insertions(+) create mode 100644 recipes-bsp/ti-sci-fw/files/0001-Revert-soc-am64x-Makefile-Move-the-SPL-Load-address-.patch
recipes-bsp/ti-sci-fw/files/0001-Revert-soc-am64x-Makefile-Move-the-SPL-Load-address-.patch new file +36 -0
@@ -0,0 +1,36 @@ +From 83d29d5e346083254e71fbe483cb14f6657b9965 Mon Sep 17 00:00:00 2001 +From: Nishanth Menon <[email protected]> +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 +Signed-off-by: Nishanth Menon <[email protected]> +--- + 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 +
recipes-bsp/ti-sci-fw/ti-sci-fw.inc +11 -0
@@ -15,4 +15,15 @@ SRC_URI = " \ git://git.ti.com/k3-image-gen/k3-image-gen.git;protocol=git;branch=master;destsuffix=imggen;name=imggen \ " +# This is a protection in case the definition is not present in other distros. +ARAGO_BRAND ?= "" + +# 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"
Signature · 1 line
2.32.0
Quoted 12 lines · Nishanth Menon via lists.yoctoproject.org
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.
Quoted 7 lines
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.
Reported-by Tom Rini <[email protected]>Suggested-by Denys Dmytriyenko <[email protected]>Signed-off-by Nishanth Menon <[email protected]>
Quoted 77 lines
---
Changes since V1:
* Added emptyARAGO_BRANDin case someone is using non-arago based builds....-Makefile-Move-the-SPL-Load-address-.patch | 36 +++++++++++++++++++ recipes-bsp/ti-sci-fw/ti-sci-fw.inc | 11 ++++++ 2 files changed, 47 insertions(+) create mode 100644 recipes-bsp/ti-sci-fw/files/0001-Revert-soc-am64x-Makefile-Move-the-SPL-Load-address-.patchrecipes-bsp/ti-sci-fw/files/0001-Revert-soc-am64x-Makefile-Move-the-SPL-Load-address-.patch new file +36
-0@@ -0,0 +1,36 @@ +From 83d29d5e346083254e71fbe483cb14f6657b9965 Mon Sep 17 00:00:00 2001 +From: Nishanth Menon <[email protected]> +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 +Signed-off-by: Nishanth Menon <[email protected]> +--- + 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 +recipes-bsp/ti-sci-fw/ti-sci-fw.inc +11
-0@@ -15,4 +15,15 @@ SRC_URI = " \ git://git.ti.com/k3-image-gen/k3-image-gen.git;protocol=git;branch=master;destsuffix=imggen;name=imggen \ " +# This is a protection in case the definition is not present in other distros. +ARAGO_BRAND ?= "" + +# 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"Signature · 1 line
2.32.0
Signature · 4 lines
Regards, Denys Dmytriyenko <[email protected]> PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964 Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964