[master][PATCH 00/11] Sync up with Dunfell #3

[master][PATCH 00/11] Sync up with Dunfell #3

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@konsulko.com>

Keep master up to date with latest changes in Dunfell, adjust to the new
override syntax.

Nick Saulnier (1):
  pru-icss_git.bb: update to PSSP v6.0.1

Nishanth Menon (1):
  Revert "ti-sci-fw: k3-image-gen: Revert SPL address change for
    mainline"

Praneeth Bajjuri (2):
  linux-ti-staging: Bump linux version for 08.01.00.006
  u-boot-ti-staging: Bump u-boot version for 08.01.00.006

Ryan Eatmon (1):
  linux-ti-mainline: Bump kernel version to v5.15

Sidraya (2):
  viddec-test-app: Add the viddec-test-app recipe
  videnc-test-app: Add the videnc-test-app recipe

Yogesh Siraswar (4):
  vxd-dec-fw: Move firmware one folder up in target
  ti-sci-fw: Fix for k3-image-gen issue for combined boot images
  conf: j7200-hs: fix the wrong machine configuration included
  linux-ti-staging: block sa2ul for am64x hs and j7200 hs device

 conf/machine/j7200-hs-evm.conf                     |  2 +-
 recipes-bsp/pru/pru-icss_git.bb                    |  4 +-
 .../ti-img-encode-decode/viddec-test-app_1.0.0.bb  | 18 ++++++
 .../ti-img-encode-decode/videnc-test-app_1.0.0.bb  | 18 ++++++
 recipes-bsp/ti-img-encode-decode/vxd-dec-fw_git.bb |  4 +-
 recipes-bsp/ti-linux-fw/ti-linux-fw.inc            | 11 ----
 ...ip-signing-of-binaries-for-combined-boot-.patch | 64 ++++++++++++++++++++++
 ...am64x-Makefile-Move-the-SPL-Load-address-.patch | 36 ------------
 recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb             |  5 ++
 recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb    |  4 +-
 recipes-kernel/linux/linux-ti-mainline_git.bb      |  8 +--
 recipes-kernel/linux/linux-ti-staging-rt_5.10.bb   |  2 +-
 recipes-kernel/linux/linux-ti-staging_5.10.bb      |  8 ++-
 13 files changed, 124 insertions(+), 60 deletions(-)
 create mode 100644 recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb
 create mode 100644 recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb
 create mode 100644 recipes-bsp/ti-sci-fw/files/0001-Makefile-Skip-signing-of-binaries-for-combined-boot-.patch
 delete mode 100644 recipes-bsp/ti-sci-fw/files/0001-Revert-soc-am64x-Makefile-Move-the-SPL-Load-address-.patch

-- 
2.7.4

[master][PATCH 01/11] pru-icss_git.bb: update to PSSP v6.0.1

[Denys Dmytriyenko]

From: Nick Saulnier <nsaulnier@ti.com>

Found a bug in the PRU_ICSSG examples in PSSP v6.0.0, fixed in v6.0.1.

Signed-off-by: Nick Saulnier <nsaulnier@ti.com>
Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 recipes-bsp/pru/pru-icss_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-bsp/pru/pru-icss_git.bb b/recipes-bsp/pru/pru-icss_git.bb
index 8d550fd..b690291 100644
--- a/recipes-bsp/pru/pru-icss_git.bb
+++ b/recipes-bsp/pru/pru-icss_git.bb
@@ -8,9 +8,9 @@ inherit update-alternatives
 
 BRANCH = "master"
 SRC_URI = "git://git.ti.com/pru-software-support-package/pru-software-support-package.git;protocol=git;branch=${BRANCH}"
-SRCREV = "acd8479d7f3bdbb4536ceca3cd6803662babaa5a"
+SRCREV = "8eee431384b6a1a9c96ae91a8e99485176b4d2b3"
 
-PV = "6.0.0"
+PV = "6.0.1"
 PR = "r0"
 
 require recipes-ti/includes/ti-paths.inc
-- 
2.7.4

[master][PATCH 02/11] vxd-dec-fw: Move firmware one folder up in target

[Denys Dmytriyenko]

From: Yogesh Siraswar <yogeshs@ti.com>

The application expects the pvdec_full_bin.fw to be in /lib/fimware
directory.

Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 recipes-bsp/ti-img-encode-decode/vxd-dec-fw_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-bsp/ti-img-encode-decode/vxd-dec-fw_git.bb b/recipes-bsp/ti-img-encode-decode/vxd-dec-fw_git.bb
index 7a184be..3563cc7 100644
--- a/recipes-bsp/ti-img-encode-decode/vxd-dec-fw_git.bb
+++ b/recipes-bsp/ti-img-encode-decode/vxd-dec-fw_git.bb
@@ -17,8 +17,8 @@ S = "${WORKDIR}/git"
 TARGET = "pvdec_full_bin.fw"
 
 do_install() {
-        install -d ${D}${base_libdir}/firmware/ti-img
-        install -m 0644 ${S}/ti-img/${TARGET} ${D}${base_libdir}/firmware/ti-img/${TARGET}
+        install -d ${D}${base_libdir}/firmware
+        install -m 0644 ${S}/ti-img/${TARGET} ${D}${base_libdir}/firmware/${TARGET}
 }
 
 FILES:${PN} = "${base_libdir}/firmware"
-- 
2.7.4

[master][PATCH 03/11] viddec-test-app: Add the viddec-test-app recipe

[Denys Dmytriyenko]

From: Sidraya <sidraya.bj@pathpartnertech.com>

The viddec-test-app provides the video decoder test app
(tidec_decode) for j7-evm.

Signed-off-by: David Huang <d-huang@ti.com>
Signed-off-by: Angela Stegmaier <angelabaker@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Sidraya <sidraya.bj@pathpartnertech.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 .../ti-img-encode-decode/viddec-test-app_1.0.0.bb      | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb

diff --git a/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb b/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb
new file mode 100644
index 0000000..48a1753
--- /dev/null
+++ b/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb
@@ -0,0 +1,18 @@
+SUMMARY = "Test applications for TI DEC (v4l2 decoder for IMG D5520)"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://main.c;beginline=1;endline=14;md5=f17e17d664f72942124e4fcf06c178ee"
+
+DEPENDS = "libdrm ffmpeg"
+
+inherit autotools pkgconfig
+
+PR = "r1"
+SRCREV = "94a80c8c090dbfdc7fafd4e5bb78c2091e715af2"
+
+EXTRA_OEMAKE = "CC="${CC}""
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+BRANCH = "master"
+SRC_URI = "git://git.ti.com/jacinto7_multimedia/viddec-test-app.git;protocol=git;branch=${BRANCH}"
+
+S = "${WORKDIR}/git"
-- 
2.7.4

[master][PATCH 04/11] videnc-test-app: Add the videnc-test-app recipe

[Denys Dmytriyenko]

From: Sidraya <sidraya.bj@pathpartnertech.com>

The videnc-test-app provides the video encoder test app
(tienc_encode) for j7-evm.

Signed-off-by: David Huang <d-huang@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Sidraya <sidraya.bj@pathpartnertech.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 .../ti-img-encode-decode/videnc-test-app_1.0.0.bb      | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb

diff --git a/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb b/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb
new file mode 100644
index 0000000..3bb5d74
--- /dev/null
+++ b/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb
@@ -0,0 +1,18 @@
+SUMMARY = "Test applications for TI ENC (v4l2 encoder for IMG VXE384)"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://main.c;beginline=1;endline=14;md5=3545dd5bdf513840937d38c10b866605"
+
+DEPENDS = "libdrm"
+
+inherit autotools pkgconfig
+
+PR = "r0"
+SRCREV = "a5e7d820bea1be24f25a8369d4d4521c784f869a"
+
+EXTRA_OEMAKE = "CC="${CC}""
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+BRANCH = "master"
+SRC_URI = "git://git.ti.com/jacinto7_multimedia/videnc-test-app.git;protocol=git;branch=${BRANCH}"
+
+S = "${WORKDIR}/git"
-- 
2.7.4

[master][PATCH 05/11] linux-ti-staging: Bump linux version for 08.01.00.006

[Denys Dmytriyenko]

From: Praneeth Bajjuri <praneeth@ti.com>

Bump linux and rt-linux version to 08.01.00.006

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 recipes-kernel/linux/linux-ti-staging-rt_5.10.bb | 2 +-
 recipes-kernel/linux/linux-ti-staging_5.10.bb    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb b/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
index b4475e1..10325a8 100644
--- a/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
+++ b/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
@@ -6,5 +6,5 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-5.10:"
 
 BRANCH = "ti-rt-linux-5.10.y"
 
-SRCREV = "0c67d996db8f3c9149598bc98657ae28fee22208"
+SRCREV = "541ec9a6995c3dd881d6f0b63cc714a08ded457d"
 PV = "5.10.65+git${SRCPV}"
diff --git a/recipes-kernel/linux/linux-ti-staging_5.10.bb b/recipes-kernel/linux/linux-ti-staging_5.10.bb
index 2d160ab..368b74d 100644
--- a/recipes-kernel/linux/linux-ti-staging_5.10.bb
+++ b/recipes-kernel/linux/linux-ti-staging_5.10.bb
@@ -23,7 +23,7 @@ S = "${WORKDIR}/git"
 
 BRANCH = "ti-linux-5.10.y"
 
-SRCREV = "dfe78b39dc37d37666f04c788abcf7d72cca3e91"
+SRCREV = "dcc6bedb2c2bdb509709e4ae08303206e95ce6c2"
 PV = "5.10.65+git${SRCPV}"
 
 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
-- 
2.7.4

[master][PATCH 06/11] u-boot-ti-staging: Bump u-boot version for 08.01.00.006

[Denys Dmytriyenko]

From: Praneeth Bajjuri <praneeth@ti.com>

u-boot bump for 08.01.00.006 release

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb b/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
index f65d4fb..d304df8 100644
--- a/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
+++ b/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
@@ -2,8 +2,8 @@ require u-boot-ti.inc
 
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
 
-PR = "r15"
+PR = "r16"
 
 BRANCH = "ti-u-boot-2021.01"
 
-SRCREV = "d79399bcd770191618bfeb3840506a286a6498df"
+SRCREV = "15769936a559b1840f50b83f94ee0c636b245001"
-- 
2.7.4

[master][PATCH 07/11] ti-sci-fw: Fix for k3-image-gen issue for combined boot images

[Denys Dmytriyenko]

From: Yogesh Siraswar <yogeshs@ti.com>

This is temporary fix for combined boot images for KIG in meta-ti till
the patch is integrated.

Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 ...ip-signing-of-binaries-for-combined-boot-.patch | 64 ++++++++++++++++++++++
 recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb             |  5 ++
 2 files changed, 69 insertions(+)
 create mode 100644 recipes-bsp/ti-sci-fw/files/0001-Makefile-Skip-signing-of-binaries-for-combined-boot-.patch

diff --git a/recipes-bsp/ti-sci-fw/files/0001-Makefile-Skip-signing-of-binaries-for-combined-boot-.patch b/recipes-bsp/ti-sci-fw/files/0001-Makefile-Skip-signing-of-binaries-for-combined-boot-.patch
new file mode 100644
index 0000000..196f3d3
--- /dev/null
+++ b/recipes-bsp/ti-sci-fw/files/0001-Makefile-Skip-signing-of-binaries-for-combined-boot-.patch
@@ -0,0 +1,64 @@
+From 2efc79702a47f9cbbeecbb2f604577f1ec8c95ba Mon Sep 17 00:00:00 2001
+From: Yogesh Siraswar <yogeshs@ti.com>
+Date: Wed, 8 Dec 2021 17:50:19 -0600
+Subject: [KIG PATCH] Makefile: Skip signing of binaries for combined boot hs
+ images
+
+Combined sysfw binaries used in tiboot.bin do not require signed images.
+This fixes issues with AM64x HS and J7200 HS boot images
+
+Upstream-Status: Submitted
+Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
+---
+ Makefile           | 8 +++++++-
+ soc/am64x/Makefile | 1 +
+ soc/j7200/Makefile | 1 +
+ 3 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 47b3b20..ab465df 100644
+--- a/Makefile
++++ b/Makefile
+@@ -215,8 +215,14 @@ $(soc_objroot)/%.o: %.c
+ 	$(CROSS_COMPILE)gcc $(CFLAGS) -c -o $@-pre-validated $<
+ 	python3 ./scripts/sysfw_boardcfg_validator.py -b $@-pre-validated -i -o $@ -s $(SOC) -l $@.log
+ 
+-# On HS board configuration binaries must be signed
++# On HS board configuration binaries must be signed unless it is combined boot image
+ ifdef HS
++ifndef COMBINED_BOOT_IMAGE
++SIGN_BINARY=1
++endif
++endif
++
++ifdef SIGN_BINARY
+ %.bin.unsigned: %.o
+ 	$(CROSS_COMPILE)objcopy -S -O binary $< $@
+ %.bin: %.bin.unsigned
+diff --git a/soc/am64x/Makefile b/soc/am64x/Makefile
+index bfbe3e5..33ebbd0 100644
+--- a/soc/am64x/Makefile
++++ b/soc/am64x/Makefile
+@@ -31,6 +31,7 @@
+ #
+ 
+ SBL_LOADADDDR ?= 0x70000000
++COMBINED_BOOT_IMAGE = 1
+ COMBINED_SYSFW_BRDCFG_LOADADDR ?= 0x7b000
+ LOADADDR  ?= 0x44000
+ SCIFS = sci
+diff --git a/soc/j7200/Makefile b/soc/j7200/Makefile
+index 3b754f7..0baef51 100644
+--- a/soc/j7200/Makefile
++++ b/soc/j7200/Makefile
+@@ -31,6 +31,7 @@
+ #
+ 
+ SBL_LOADADDDR ?= 0x41c00000
++COMBINED_BOOT_IMAGE = 1
+ COMBINED_TIFS_BRDCFG_LOADADDR ?= 0x7f000
+ COMBINED_DM_BRDCFG_LOADADDR ?= 0x41c80000
+ LOADADDR ?= 0x40000
+-- 
+2.17.1
+
diff --git a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
index 59dd3ee..2dad0fe 100644
--- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
@@ -47,6 +47,11 @@ LD[unexport] = "1"
 
 do_configure[noexec] = "1"
 
+SRC_URI:append:j7200-hs-evm-k3r5 = " \
+	file://0001-Makefile-Skip-signing-of-binaries-for-combined-boot-.patch;patchdir=../imggen"
+SRC_URI:append:am64xx-hs-evm-k3r5 = " \
+	file://0001-Makefile-Skip-signing-of-binaries-for-combined-boot-.patch;patchdir=../imggen"
+
 EXTRA_OEMAKE = "\
     CROSS_COMPILE=${TARGET_PREFIX} SYSFW_DL_URL='' SYSFW_HS_DL_URL='' SYSFW_HS_INNER_CERT_DL_URL='' \
     SYSFW_PATH="${SYSFW_TISCI}" SOC=${SYSFW_SOC} CONFIG=${SYSFW_CONFIG} \
-- 
2.7.4

[master][PATCH 08/11] conf: j7200-hs: fix the wrong machine configuration included

[Denys Dmytriyenko]

From: Yogesh Siraswar <yogeshs@ti.com>

j7-evm instead of j7200-evm was included causing boot failure

Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 conf/machine/j7200-hs-evm.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/j7200-hs-evm.conf b/conf/machine/j7200-hs-evm.conf
index c55be00..a5bd637 100644
--- a/conf/machine/j7200-hs-evm.conf
+++ b/conf/machine/j7200-hs-evm.conf
@@ -2,7 +2,7 @@
 #@NAME: J7200 HS EVM
 #@DESCRIPTION: Machine configuration for the TI J7200 HS EVM
 
-require conf/machine/j7-evm.conf
+require conf/machine/j7200-evm.conf
 
 UBOOT_MACHINE = "j7200_hs_evm_a72_defconfig"
 
-- 
2.7.4

[master][PATCH 09/11] linux-ti-staging: block sa2ul for am64x hs and j7200 hs device

[Denys Dmytriyenko]

From: Yogesh Siraswar <yogeshs@ti.com>

SA2UL GP driver will not work for HS. Need SA2UL HS driver.
Till it is implemented blacklist sa2ul for am64xx hs and j7200 hs

Suggested-by: Denys Dmytriyenko <denis@denix.org>
Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 recipes-kernel/linux/linux-ti-staging_5.10.bb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/recipes-kernel/linux/linux-ti-staging_5.10.bb b/recipes-kernel/linux/linux-ti-staging_5.10.bb
index 368b74d..1a0ec5d 100644
--- a/recipes-kernel/linux/linux-ti-staging_5.10.bb
+++ b/recipes-kernel/linux/linux-ti-staging_5.10.bb
@@ -43,3 +43,9 @@ module_conf_ti_k3_r5_remoteproc = "softdep ti_k3_r5_remoteproc pre: virtio_rpmsg
 module_conf_ti_k3_dsp_remoteproc = "softdep ti_k3_dsp_remoteproc pre: virtio_rpmsg_bus"
 KERNEL_MODULE_PROBECONF += "rpmsg_client_sample ti_k3_r5_remoteproc ti_k3_dsp_remoteproc"
 KERNEL_MODULE_AUTOLOAD:append:j7 = " rpmsg_kdrv_switch"
+
+# Disable SA2UL for AM64x HS and J7200 HS
+module_conf_sa2ul:am64xx-hs-evm = "blacklist sa2ul"
+KERNEL_MODULE_PROBECONF:append:am64xx-hs-evm = " sa2ul"
+module_conf_sa2ul:j7200-hs-evm = "blacklist sa2ul"
+KERNEL_MODULE_PROBECONF:append:j7200-hs-evm = " sa2ul"
-- 
2.7.4

[master][PATCH 10/11] linux-ti-mainline: Bump kernel version to v5.15

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

This adds up numerous fixes for various k3 platforms.

While at it, bump the ti-upstream-tools repo as this sync up gives us:
config: audio_display: Update cdns-mhdp configs

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 recipes-kernel/linux/linux-ti-mainline_git.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/recipes-kernel/linux/linux-ti-mainline_git.bb b/recipes-kernel/linux/linux-ti-mainline_git.bb
index 9489ed6..6fe2107 100644
--- a/recipes-kernel/linux/linux-ti-mainline_git.bb
+++ b/recipes-kernel/linux/linux-ti-mainline_git.bb
@@ -20,9 +20,9 @@ S = "${WORKDIR}/git"
 BRANCH = "master"
 TOOLS_BRANCH = "master"
 
-# 5.13 Mainline version
-SRCREV = "62fb9874f5da54fdb243003b386128037319b219"
-PV = "5.13+git${SRCPV}"
+# 5.15 Mainline version
+SRCREV = "8bb7eca972ad531c9b149c0a51ab43a417385813"
+PV = "5.15+git${SRCPV}"
 
 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
 MACHINE_KERNEL_PR:append = "b"
@@ -36,7 +36,7 @@ SRC_URI += " \
     file://defconfig \
 "
 
-SRCREV_ti-upstream-tools = "c9b8150cb00a5beb7b7f3e42d0d817aa9392fabd"
+SRCREV_ti-upstream-tools = "0f60697843bba6f8d721b14da92b1652563ccb95"
 SRCREV_FORMAT = "linux"
 
 KERNEL_DEVICETREE = ""
-- 
2.7.4

[master][PATCH 11/11] Revert "ti-sci-fw: k3-image-gen: Revert SPL address change for mainline"

[Denys Dmytriyenko]

From: Nishanth Menon <nm@ti.com>

This reverts commit d5db41417295fe05a293f6d4d77a65ef6563f6ed.

We should'nt have to carry patches for u-boot or kernel, since the
upstream is now fixed since 5.14 kernel and u-boot 2021.10 tag onwards,
lets revert the patch to allow upstream to work with 5.15+ kernel and
2021.10 u-boot (from the already applied commit cae609388f19
"recipes-bsp: u-boot-ti-mainline: Update to v2021.10 release").

Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 recipes-bsp/ti-linux-fw/ti-linux-fw.inc            | 11 -------
 ...am64x-Makefile-Move-the-SPL-Load-address-.patch | 36 ----------------------
 2 files changed, 47 deletions(-)
 delete 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-linux-fw/ti-linux-fw.inc b/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
index d224f35..f160768 100644
--- a/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
+++ b/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
@@ -32,15 +32,4 @@ 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"
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
deleted file mode 100644
index 63a5796..0000000
--- a/recipes-bsp/ti-sci-fw/files/0001-Revert-soc-am64x-Makefile-Move-the-SPL-Load-address-.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 83d29d5e346083254e71fbe483cb14f6657b9965 Mon Sep 17 00:00:00 2001
-From: Nishanth Menon <nm@ti.com>
-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 <nm@ti.com>
----
- 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
-
-- 
2.7.4