linux-ti-staging-rt: RC Auto-Merger: 08.06.00.006

Updated the value(s) for: SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>
linux-ti-staging: CI/CD Auto-Merger: cicd.dunfell.202302151242
2026-01-12 01:20:20 +00:00 · 2023-02-16 08:55:47 -06:00 · 2023-02-15 12:42:28 -06:00 · 2023-02-15 12:42:28 -06:00 · 2023-02-15 12:42:28 -06:00 · 2023-02-15 12:42:28 -06:00
43 changed files with 455 additions and 82 deletions
--- a/conf/machine/am62axx-evm-k3r5-gp.conf
+++ b/conf/machine/am62axx-evm-k3r5-gp.conf
@@ -0,0 +1,19 @@
+#@TYPE: Machine
+#@NAME: AM62A GP EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM62A GP EVM (R5F core)
+
+require conf/machine/include/k3r5.inc
+
+SYSFW_SOC = "am62ax"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "gp"
+
+SYSFW_TIBOOT3_SYMLINK = ""
+SYSFW_SYMLINK = ""
+
+UBOOT_MACHINE = "am62ax_evm_r5_defconfig"
+
+SPL_BINARY = ""
+UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
+UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
+UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}"
--- a/conf/machine/am62axx-evm-k3r5-hs-fs.conf
+++ b/conf/machine/am62axx-evm-k3r5-hs-fs.conf
@@ -0,0 +1,14 @@
+#@TYPE: Machine
+#@NAME: AM62A HS-FS EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM62A HS-FS EVM (R5F core)
+
+# Booting HS-FS requires different SYSFW, the rest is handled at runtime
+
+require conf/machine/include/k3r5.inc
+SOC_FAMILY_append = ":k3r5-hs-fs"
+
+SYSFW_SOC = "am62ax"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+
+UBOOT_MACHINE = "am62ax_evm_r5_defconfig"
--- a/conf/machine/am62axx-evm-k3r5-hs-se.conf
+++ b/conf/machine/am62axx-evm-k3r5-hs-se.conf
@@ -0,0 +1,22 @@
+#@TYPE: Machine
+#@NAME: AM62A HS-SE EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM62A HS-SE EVM (R5F core)
+
+# Booting HS-SE requires different SYSFW, the rest is handled at runtime
+
+require conf/machine/include/k3r5.inc
+SOC_FAMILY_append = ":k3r5-hs-se"
+
+SYSFW_SOC = "am62ax"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs"
+
+SYSFW_TIBOOT3_SYMLINK = ""
+SYSFW_SYMLINK = ""
+
+UBOOT_MACHINE = "am62ax_evm_r5_defconfig"
+
+SPL_BINARY = ""
+UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
+UBOOT_IMAGE = "u-boot-r5spl-hs-se-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
+UBOOT_SYMLINK = "u-boot-r5spl-hs-se.${UBOOT_SUFFIX}"
--- a/conf/machine/am62axx-evm-k3r5.conf
+++ b/conf/machine/am62axx-evm-k3r5.conf
@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM62AXX EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM62Axx EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-SYSFW_SOC = "am62ax"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
-UBOOT_MACHINE = "am62ax_evm_r5_defconfig"
--- a/conf/machine/am62axx-evm.conf
+++ b/conf/machine/am62axx-evm.conf
@@ -23,3 +23,7 @@ KERNEL_DEVICETREE = " \
 "

 UBOOT_MACHINE = "am62ax_evm_a53_defconfig"
+
+SPL_BINARY = "tispl.bin_HS"
+UBOOT_BINARY = "u-boot.img_HS"
+UBOOT_SYMLINK = "u-boot.img"
--- a/conf/machine/am62xx-evm-k3r5-gp.conf
+++ b/conf/machine/am62xx-evm-k3r5-gp.conf
@@ -8,4 +8,11 @@ SYSFW_SOC = "am62x"
 SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "gp"

+SYSFW_TIBOOT3_SYMLINK = ""
+
 UBOOT_MACHINE = "am62x_evm_r5_defconfig"
+
+SPL_BINARY = ""
+UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
+UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
+UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}"
--- a/conf/machine/am62xx-evm-k3r5-hs-fs.conf
+++ b/conf/machine/am62xx-evm-k3r5-hs-fs.conf
@@ -0,0 +1,14 @@
+#@TYPE: Machine
+#@NAME: AM62xx HS-FS EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM62xx HS-FS EVM (R5F core)
+
+# Booting HS-FS requires different SYSFW, the rest is handled at runtime
+
+require conf/machine/include/k3r5.inc
+SOC_FAMILY_append = ":k3r5-hs-fs"
+
+SYSFW_SOC = "am62x"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+
+UBOOT_MACHINE = "am62x_evm_r5_defconfig"
--- a/conf/machine/am62xx-evm-k3r5-hs-se.conf
+++ b/conf/machine/am62xx-evm-k3r5-hs-se.conf
@@ -0,0 +1,21 @@
+#@TYPE: Machine
+#@NAME: AM62xx HS-SE EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM62xx HS-SE EVM (R5F core)
+
+# Booting HS-SE requires different SYSFW, the rest is handled at runtime
+
+require conf/machine/include/k3r5.inc
+SOC_FAMILY_append = ":k3r5-hs-se"
+
+SYSFW_SOC = "am62x"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs"
+
+SYSFW_TIBOOT3_SYMLINK = ""
+
+UBOOT_MACHINE = "am62x_evm_r5_defconfig"
+
+SPL_BINARY = ""
+UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
+UBOOT_IMAGE = "u-boot-r5spl-hs-se-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
+UBOOT_SYMLINK = "u-boot-r5spl-hs-se.${UBOOT_SUFFIX}"
--- a/conf/machine/am62xx-evm.conf
+++ b/conf/machine/am62xx-evm.conf
@@ -19,3 +19,7 @@ KERNEL_DEVICETREE = " \
 "

 UBOOT_MACHINE = "am62x_evm_a53_defconfig"
+
+SPL_BINARY = "tispl.bin_HS"
+UBOOT_BINARY = "u-boot.img_HS"
+UBOOT_SYMLINK = "u-boot.img"
--- a/conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf
+++ b/conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf
@@ -0,0 +1,14 @@
+#@TYPE: Machine
+#@NAME: AM62xx LPSK HS-FS EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM62xx LP HS-FS EVM (R5F core)
+
+# Booting HS-FS requires different SYSFW, the rest is handled at runtime
+
+require conf/machine/include/k3r5.inc
+SOC_FAMILY_append = ":k3r5-hs-fs"
+
+SYSFW_SOC = "am62x"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+
+UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"
--- a/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf
+++ b/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf
@@ -11,4 +11,11 @@ SYSFW_SOC = "am62x"
 SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "hs"

+SYSFW_TIBOOT3_SYMLINK = ""
+
 UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"
+
+SPL_BINARY = ""
+UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
+UBOOT_IMAGE = "u-boot-r5spl-hs-se-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
+UBOOT_SYMLINK = "u-boot-r5spl-hs-se.${UBOOT_SUFFIX}"
--- a/conf/machine/am62xx-lp-evm.conf
+++ b/conf/machine/am62xx-lp-evm.conf
@@ -11,6 +11,7 @@ KERNEL_DEVICETREE = " \
    ti/k3-am625-skeleton.dtb \
    ti/k3-am625-sk-lpmdemo.dtb \
    ti/k3-am625-sk-csi2-ov5640.dtbo \
+    ti/k3-am62x-lp-sk-oldi-panel.dtbo \
 "

 SPL_BINARY = "tispl.bin_HS"	
--- a/conf/machine/am65xx-hs-evm.conf
+++ b/conf/machine/am65xx-hs-evm.conf
@@ -6,14 +6,6 @@ require conf/machine/include/am65xx.inc

 UBOOT_MACHINE = "am65x_hs_evm_a53_defconfig"

-UBOOT_ENTRYPOINT =       "0x80080000"
-UBOOT_LOADADDRESS =      "0x80080000"
-UBOOT_RD_LOADADDRESS =   "0x84000000"
-UBOOT_RD_ENTRYPOINT =    "0x84000000"
-UBOOT_DTB_LOADADDRESS =  "0x83000000"
-UBOOT_DTBO_LOADADDRESS = "0x83080000"
-UBOOT_DTBO_OFFSET =      "0x00010000"
-
 SPL_BINARY = "tispl.bin_HS"
 UBOOT_BINARY = "u-boot.img_HS"
 UBOOT_SYMLINK = "u-boot.img"
--- a/conf/machine/include/am62axx.inc
+++ b/conf/machine/include/am62axx.inc
@@ -8,8 +8,22 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"

 TFA_K3_SYSTEM_SUSPEND = "1"

-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
+# Default tiboot3.bin on AM62A is for HS-FS
+BBMULTICONFIG = "k3r5-hs-fs"
+do_image_wic[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy"
+do_image_tar[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy"
+
+# Since default tiboot3.bin on AM62A is for HS-FS, add a version for GP
+BBMULTICONFIG += "k3r5-gp"
+IMAGE_BOOT_FILES += " tiboot3-am62ax-gp-evm.bin"
+do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
+do_image_tar[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
+
+# Since default tiboot3.bin on AM62A is for HS-FS, add a version for HS-SE
+BBMULTICONFIG += "k3r5-hs-se"
+IMAGE_BOOT_FILES += " tiboot3-am62ax-hs-evm.bin"
+do_image_wic[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy"
+do_image_tar[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy"

 TFA_BOARD = "lite"
 OPTEEMACHINE = "k3-am62x"
--- a/conf/machine/include/am62xx-lp.inc
+++ b/conf/machine/include/am62xx-lp.inc
@@ -8,8 +8,14 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"

 TFA_K3_SYSTEM_SUSPEND = "1"

-# Default tiboot3.bin on AM62x LP is for HS-SE
+# Default tiboot3.bin on AM62x LP is for HS-FS
+BBMULTICONFIG = "k3r5-hs-fs"
+do_image_wic[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy"
+do_image_tar[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy"
+
+# Since default tiboot3.bin on AM62x LP is for HS-FS, add a version for HS-SE
 BBMULTICONFIG += "k3r5-hs-se"
+IMAGE_BOOT_FILES += " tiboot3-am62x-hs-evm.bin"
 do_image_wic[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy"
 do_image_tar[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy"

--- a/conf/machine/include/am62xx.inc
+++ b/conf/machine/include/am62xx.inc
@@ -8,8 +8,22 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"

 TFA_K3_SYSTEM_SUSPEND = "1"

-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
+# Default tiboot3.bin on AM62x is for HS-FS
+BBMULTICONFIG = "k3r5-hs-fs"
+do_image_wic[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy"
+do_image_tar[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy"
+
+# Since default tiboot3.bin on AM62x is for HS-FS, add a version for GP
+BBMULTICONFIG += "k3r5-gp"
+IMAGE_BOOT_FILES += " tiboot3-am62x-gp-evm.bin"
+do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
+do_image_tar[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
+
+# Since default tiboot3.bin on AM62x is for HS-FS, add a version for HS-SE
+BBMULTICONFIG += "k3r5-hs-se"
+IMAGE_BOOT_FILES += " tiboot3-am62x-hs-evm.bin"
+do_image_wic[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy"
+do_image_tar[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy"

 TFA_BOARD = "lite"
 OPTEEMACHINE = "k3-am62x"
--- a/conf/machine/include/k3.inc
+++ b/conf/machine/include/k3.inc
@@ -21,6 +21,11 @@ KERNEL_CLASSES += "kernel-fitimage"
 UBOOT_ARCH = "arm"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"
+UBOOT_RD_LOADADDRESS = "0x84000000"
+UBOOT_RD_ENTRYPOINT = "0x84000000"
+UBOOT_DTB_LOADADDRESS = "0x83000000"
+UBOOT_DTBO_LOADADDRESS = "0x83080000"
+UBOOT_DTBO_OFFSET = "0x00010000"

 SPL_BINARY = "tispl.bin"
 SPL_BINARYNAME = "tispl.bin"
--- a/conf/machine/j7-evm.conf
+++ b/conf/machine/j7-evm.conf
@@ -16,7 +16,28 @@ KERNEL_DEVICETREE = " \
    ti/k3-j721e-common-proc-board.dtb \
    ti/k3-j721e-proc-board-tps65917.dtb \
    ti/k3-j721e-common-proc-board-infotainment.dtbo \
+    ti/k3-j721e-cpb-csi2-ov5640.dtbo \
+    ti/k3-j721e-fpdlink-cpb-fusion.dtbo \
+    ti/k3-j721e-fpdlink-imx390-cm-0-0.dtbo \
+    ti/k3-j721e-fpdlink-imx390-cm-0-1.dtbo \
+    ti/k3-j721e-fpdlink-imx390-cm-0-2.dtbo \
+    ti/k3-j721e-fpdlink-imx390-cm-0-3.dtbo \
+    ti/k3-j721e-fpdlink-imx390-cm-1-0.dtbo \
+    ti/k3-j721e-fpdlink-imx390-cm-1-1.dtbo \
+    ti/k3-j721e-fpdlink-imx390-cm-1-2.dtbo \
+    ti/k3-j721e-fpdlink-imx390-cm-1-3.dtbo \
+    ti/k3-j721e-fpdlink-imx390-rcm-0-0.dtbo \
+    ti/k3-j721e-fpdlink-imx390-rcm-0-1.dtbo \
+    ti/k3-j721e-fpdlink-imx390-rcm-0-2.dtbo \
+    ti/k3-j721e-fpdlink-imx390-rcm-0-3.dtbo \
+    ti/k3-j721e-fpdlink-imx390-rcm-1-0.dtbo \
+    ti/k3-j721e-fpdlink-imx390-rcm-1-1.dtbo \
+    ti/k3-j721e-fpdlink-imx390-rcm-1-2.dtbo \
+    ti/k3-j721e-fpdlink-imx390-rcm-1-3.dtbo \
    ti/k3-j721e-sk.dtb \
+    ti/k3-j721e-fpdlink-sk-fusion.dtbo \
+    ti/k3-j721e-sk-csi2-ov5640.dtbo \
+    ti/k3-j721e-sk-rpi-cam-imx219.dtbo \
 "

 UBOOT_MACHINE = "j721e_evm_a72_config"
--- a/conf/machine/j7-hs-evm.conf
+++ b/conf/machine/j7-hs-evm.conf
@@ -6,14 +6,6 @@ require conf/machine/j7-evm.conf

 UBOOT_MACHINE = "j721e_hs_evm_a72_defconfig"

-UBOOT_ENTRYPOINT =       "0x80080000"
-UBOOT_LOADADDRESS =      "0x80080000"
-UBOOT_RD_LOADADDRESS =   "0x84000000"
-UBOOT_RD_ENTRYPOINT =    "0x84000000"
-UBOOT_DTB_LOADADDRESS =  "0x83000000"
-UBOOT_DTBO_LOADADDRESS = "0x83080000"
-UBOOT_DTBO_OFFSET =      "0x00010000"
-
 SPL_BINARY = "tispl.bin_HS"
 UBOOT_BINARY = "u-boot.img_HS"
 UBOOT_SYMLINK = "u-boot.img"
--- a/conf/machine/j7200-evm.conf
+++ b/conf/machine/j7200-evm.conf
@@ -9,6 +9,7 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"

 KERNEL_DEVICETREE = " \
    ti/k3-j7200-common-proc-board.dtb \
+    ti/k3-j7200-mcspi-loopback.dtbo \
 "

 UBOOT_MACHINE = "j7200_evm_a72_config"
--- a/conf/machine/j7200-hs-evm.conf
+++ b/conf/machine/j7200-hs-evm.conf
@@ -6,14 +6,6 @@ require conf/machine/j7200-evm.conf

 UBOOT_MACHINE = "j7200_hs_evm_a72_defconfig"

-UBOOT_ENTRYPOINT =       "0x80080000"
-UBOOT_LOADADDRESS =      "0x80080000"
-UBOOT_RD_LOADADDRESS =   "0x84000000"
-UBOOT_RD_ENTRYPOINT =    "0x84000000"
-UBOOT_DTB_LOADADDRESS =  "0x83000000"
-UBOOT_DTBO_LOADADDRESS = "0x83080000"
-UBOOT_DTBO_OFFSET =      "0x00010000"
-
 SPL_BINARY = "tispl.bin_HS"
 UBOOT_BINARY = "u-boot.img_HS"
 UBOOT_SYMLINK = "u-boot.img"
--- a/conf/machine/j721s2-evm-k3r5-gp.conf
+++ b/conf/machine/j721s2-evm-k3r5-gp.conf
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@NAME: J721S2 GP EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI J721S2 GP EVM (R5F core)
+
+# Booting GP requires different SYSFW, the rest is handled at runtime
+
+require conf/machine/include/k3r5.inc
+SOC_FAMILY_append = ":k3r5-gp"
+
+SYSFW_SOC = "j721s2"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "gp"
+SYSFW_TIBOOT3_SYMLINK = "tiboot3.bin"
+
+UBOOT_MACHINE = "j721s2_evm_r5_defconfig"
+
+SPL_BINARY = ""
+UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
+UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
+UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}"
--- a/conf/machine/j721s2-evm-k3r5-sr1-hs-fs.conf
+++ b/conf/machine/j721s2-evm-k3r5-sr1-hs-fs.conf
@@ -0,0 +1,15 @@
+#@TYPE: Machine
+#@NAME: J721S2 HS-FS EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI J721S2 HS-FS EVM (R5F core)
+
+# Booting HS-FS requires different SYSFW, the rest is handled at runtime
+
+require conf/machine/include/k3r5.inc
+SOC_FAMILY_append = ":k3r5-sr1-hs-fs"
+
+SYSFW_SOC = "j721s2"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+SYSFW_TIBOOT3_SYMLINK = ""
+
+UBOOT_MACHINE = "j721s2_evm_r5_defconfig"
--- a/conf/machine/j721s2-evm.conf
+++ b/conf/machine/j721s2-evm.conf
@@ -14,14 +14,42 @@ OPTEE_K3_USART = "0x8"

 KERNEL_DEVICETREE = " \
    ti/k3-am68-sk-base-board.dtb \
-    ti/k3-am68-sk-bb-csi2-ov5640.dtb \
+    ti/k3-am68-sk-bb-csi2-ov5640.dtbo \
    ti/k3-am68-sk-bb-rpi-cam-imx219.dtbo \
+    ti/k3-am68-sk-fpdlink-fusion.dtbo \
+    ti/k3-am68-sk-rpi-hdr-ehrpwm.dtbo \
    ti/k3-am68-sk-som-ddr_mem_carveout.dtbo \
+    ti/k3-j721e-fpdlink-imx390-cm-0-0.dtbo \
+    ti/k3-j721e-fpdlink-imx390-cm-0-1.dtbo \
+    ti/k3-j721e-fpdlink-imx390-cm-0-2.dtbo \
+    ti/k3-j721e-fpdlink-imx390-cm-0-3.dtbo \
+    ti/k3-j721e-fpdlink-imx390-cm-1-0.dtbo \
+    ti/k3-j721e-fpdlink-imx390-cm-1-1.dtbo \
+    ti/k3-j721e-fpdlink-imx390-cm-1-2.dtbo \
+    ti/k3-j721e-fpdlink-imx390-cm-1-3.dtbo \
+    ti/k3-j721e-fpdlink-imx390-rcm-0-0.dtbo \
+    ti/k3-j721e-fpdlink-imx390-rcm-0-1.dtbo \
+    ti/k3-j721e-fpdlink-imx390-rcm-0-2.dtbo \
+    ti/k3-j721e-fpdlink-imx390-rcm-0-3.dtbo \
+    ti/k3-j721e-fpdlink-imx390-rcm-1-0.dtbo \
+    ti/k3-j721e-fpdlink-imx390-rcm-1-1.dtbo \
+    ti/k3-j721e-fpdlink-imx390-rcm-1-2.dtbo \
+    ti/k3-j721e-fpdlink-imx390-rcm-1-3.dtbo \
    ti/k3-j721s2-common-proc-board.dtb \
+    ti/k3-j721s2-cpb-csi2-ov5640.dtbo \
+    ti/k3-j721s2-fpdlink-cpb-fusion.dtbo \
    ti/k3-j721s2-gesi-exp-board.dtbo \
 "

 UBOOT_MACHINE = "j721s2_evm_a72_defconfig"

-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
+# Default tiboot3.bin on J721S2 is for GP
+BBMULTICONFIG = "k3r5-gp"
+do_image_wic[mcdepends] = "mc::k3r5-gp:ti-sci-fw:do_deploy"
+do_image_tar[mcdepends] = "mc::k3r5-gp:ti-sci-fw:do_deploy"
+
+# Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-FS
+BBMULTICONFIG += "k3r5-sr1-hs-fs"
+IMAGE_BOOT_FILES += " tiboot3-j721s2-hs-fs-evm.bin"
+do_image_wic[mcdepends] += "mc::k3r5-sr1-hs-fs:ti-sci-fw:do_deploy"
+do_image_tar[mcdepends] += "mc::k3r5-sr1-hs-fs:ti-sci-fw:do_deploy"
--- a/conf/machine/j721s2-hs-evm.conf
+++ b/conf/machine/j721s2-hs-evm.conf
@@ -2,17 +2,25 @@
 #@NAME: J721S2 HS EVM
 #@DESCRIPTION: Machine configuration for the TI J721S2 HS EVM

-require conf/machine/j721s2-evm.conf
+require conf/machine/include/j7.inc
+
+MACHINE_FEATURES += "gpu"
+
+SERIAL_CONSOLES = "115200;ttyS2"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
+TFA_K3_USART = "0x8"
+OPTEEMACHINE = "k3-j784s4"
+OPTEE_K3_USART = "0x8"
+
+KERNEL_DEVICETREE = " \
+    ti/k3-j721s2-common-proc-board.dtb \
+    ti/k3-j721s2-gesi-exp-board.dtbo \
+"

 UBOOT_MACHINE = "j721s2_hs_evm_a72_defconfig"

-UBOOT_ENTRYPOINT =       "0x80080000"
-UBOOT_LOADADDRESS =      "0x80080000"
-UBOOT_RD_LOADADDRESS =   "0x84000000"
-UBOOT_RD_ENTRYPOINT =    "0x84000000"
-UBOOT_DTB_LOADADDRESS =  "0x83000000"
-UBOOT_DTBO_LOADADDRESS = "0x83080000"
-UBOOT_DTBO_OFFSET =      "0x00010000"
+do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
+do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"

 SPL_BINARY = "tispl.bin_HS"
 UBOOT_BINARY = "u-boot.img_HS"
--- a/conf/machine/j784s4-evm-k3r5-gp.conf
+++ b/conf/machine/j784s4-evm-k3r5-gp.conf
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@NAME: J784S4 GP EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI J784S4 GP EVM (R5F core)
+
+# Booting GP requires different SYSFW, the rest is handled at runtime
+
+require conf/machine/include/k3r5.inc
+SOC_FAMILY_append = ":k3r5-gp"
+
+SYSFW_SOC = "j784s4"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "gp"
+SYSFW_TIBOOT3_SYMLINK = "tiboot3.bin"
+
+UBOOT_MACHINE = "j784s4_evm_r5_defconfig"
+
+SPL_BINARY = ""
+UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
+UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
+UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}"
--- a/conf/machine/j784s4-evm-k3r5-sr1-hs-fs.conf
+++ b/conf/machine/j784s4-evm-k3r5-sr1-hs-fs.conf
@@ -0,0 +1,16 @@
+#@TYPE: Machine
+#@NAME: J784S4 HS-FS EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI J784S4 HS-FS EVM (R5F core)
+
+# Booting HS-FS requires different SYSFW, the rest is handled at runtime
+
+require conf/machine/include/k3r5.inc
+SOC_FAMILY_append = ":k3r5-sr1-hs-fs"
+
+SYSFW_SOC = "j784s4"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+SYSFW_TIBOOT3_SYMLINK = ""
+SYSFW_SYMLINK = ""
+
+UBOOT_MACHINE = "j784s4_evm_r5_defconfig"
--- a/conf/machine/j784s4-evm.conf
+++ b/conf/machine/j784s4-evm.conf
@@ -13,13 +13,44 @@ OPTEEMACHINE = "k3-j784s4"
 OPTEE_K3_USART = "0x8"

 KERNEL_DEVICETREE = " \
+    ti/k3-am69-sk.dtb \
+    ti/k3-am69-sk-csi2-ov5640.dtbo \
+    ti/k3-am69-sk-ddr-mem-carveout.dtbo \
+    ti/k3-am69-sk-fpdlink-fusion.dtbo \
+    ti/k3-am69-sk-rpi-hdr-ehrpwm.dtbo \
+    ti/k3-am69-sk-rpi-cam-imx219.dtbo \
+    ti/k3-j721e-fpdlink-imx390-cm-0-0.dtbo \
+    ti/k3-j721e-fpdlink-imx390-cm-0-1.dtbo \
+    ti/k3-j721e-fpdlink-imx390-cm-0-2.dtbo \
+    ti/k3-j721e-fpdlink-imx390-cm-0-3.dtbo \
+    ti/k3-j721e-fpdlink-imx390-cm-1-0.dtbo \
+    ti/k3-j721e-fpdlink-imx390-cm-1-1.dtbo \
+    ti/k3-j721e-fpdlink-imx390-cm-1-2.dtbo \
+    ti/k3-j721e-fpdlink-imx390-cm-1-3.dtbo \
+    ti/k3-j721e-fpdlink-imx390-rcm-0-0.dtbo \
+    ti/k3-j721e-fpdlink-imx390-rcm-0-1.dtbo \
+    ti/k3-j721e-fpdlink-imx390-rcm-0-2.dtbo \
+    ti/k3-j721e-fpdlink-imx390-rcm-0-3.dtbo \
+    ti/k3-j721e-fpdlink-imx390-rcm-1-0.dtbo \
+    ti/k3-j721e-fpdlink-imx390-rcm-1-1.dtbo \
+    ti/k3-j721e-fpdlink-imx390-rcm-1-2.dtbo \
+    ti/k3-j721e-fpdlink-imx390-rcm-1-3.dtbo \
    ti/k3-j784s4-evm.dtb \
+    ti/k3-j784s4-evm-csi2-ov5640.dtbo \
+    ti/k3-j784s4-fpdlink-fusion.dtbo \
 "

 UBOOT_MACHINE = "j784s4_evm_a72_defconfig"

-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
+# Default tiboot3.bin on J784S4 is for GP
+BBMULTICONFIG = "k3r5-gp"
+do_image_wic[mcdepends] = "mc::k3r5-gp:ti-sci-fw:do_deploy"
+do_image_tar[mcdepends] = "mc::k3r5-gp:ti-sci-fw:do_deploy"
+
+# Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-FS
+BBMULTICONFIG += "k3r5-sr1-hs-fs"
+IMAGE_BOOT_FILES += " tiboot3-j784s4-hs-fs-evm.bin"
+do_image_wic[mcdepends] += "mc::k3r5-sr1-hs-fs:ti-sci-fw:do_deploy"
+do_image_tar[mcdepends] += "mc::k3r5-sr1-hs-fs:ti-sci-fw:do_deploy"

 TFA_BOARD = "j784s4"
-
--- a/conf/machine/j784s4-hs-evm.conf
+++ b/conf/machine/j784s4-hs-evm.conf
@@ -2,10 +2,27 @@
 #@NAME: J784S4 HS EVM
 #@DESCRIPTION: Machine configuration for the TI J784S4 HS EVM

-require conf/machine/j784s4-evm.conf
+require conf/machine/include/j7.inc
+
+MACHINE_FEATURES += "gpu"
+
+SERIAL_CONSOLES = "115200;ttyS2"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
+TFA_K3_USART = "0x8"
+OPTEEMACHINE = "k3-j784s4"
+OPTEE_K3_USART = "0x8"
+
+KERNEL_DEVICETREE = " \
+    ti/k3-j784s4-evm.dtb \
+"

 UBOOT_MACHINE = "j784s4_evm_a72_defconfig"

+do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
+do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
+
+TFA_BOARD = "j784s4"
+
 SPL_BINARY = "tispl.bin_HS"
 UBOOT_BINARY = "u-boot.img_HS"
 UBOOT_SYMLINK = "u-boot.img"
--- a/conf/multiconfig/k3r5-hs-fs.conf
+++ b/conf/multiconfig/k3r5-hs-fs.conf
@@ -0,0 +1,3 @@
+require k3r5.conf
+
+MACHINE_append = "-hs-fs"
--- a/conf/multiconfig/k3r5-sr1-hs-fs.conf
+++ b/conf/multiconfig/k3r5-sr1-hs-fs.conf
@@ -0,0 +1,3 @@
+require k3r5-sr1.conf
+
+MACHINE_append = "-hs-fs"
--- a/conf/multiconfig/k3r5-sr1.conf
+++ b/conf/multiconfig/k3r5-sr1.conf
@@ -0,0 +1,3 @@
+require k3r5.conf
+
+MACHINE_append = "-sr1"
--- a/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
+++ b/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
@@ -20,12 +20,12 @@ IMG_DEC_FW_VERSION = "1.0"
 CNM_WAVE521_FW_VERSION = "1.0.00"
 TIFS_LPM_STUB_FW_VERSION = "08.03.02"

-TI_LINUX_FW_SRCREV ?= "54f54f37192bdb95f08d9e7fcc64659a98f6b6c4"
+TI_LINUX_FW_SRCREV ?= "340194800a581baf976360386dfc7b5acab8d948"
 SRCREV = "${TI_LINUX_FW_SRCREV}"

 BRANCH ?= "ti-linux-firmware"

-K3_IMAGE_GEN_SRCREV ?= "2308bfb01e7bd3e03514cb33f06180dd9bb79121"
+K3_IMAGE_GEN_SRCREV ?= "ffae8800a5c81c149835ed1aa5e2fbbe65a49c0d"
 SRCREV_imggen = "${K3_IMAGE_GEN_SRCREV}"
 SRCREV_FORMAT = "imggen"

--- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
@@ -33,14 +33,21 @@ SYSFW_PREFIX_j7-hs-evm-k3r5 = "fs"
 SYSFW_PREFIX_j7-hs-evm-k3r5-sr1-1 = "fs"
 SYSFW_PREFIX_j7200-evm-k3r5 = "fs"
 SYSFW_PREFIX_j7200-hs-evm-k3r5 = "fs"
-SYSFW_PREFIX_j721s2-evm-k3r5 = "fs"
+SYSFW_PREFIX_j721s2-evm-k3r5-gp = "fs"
+SYSFW_PREFIX_j721s2-evm-k3r5-sr1-hs-fs = "fs"
 SYSFW_PREFIX_j721s2-hs-evm-k3r5 = "fs"
-SYSFW_PREFIX_j784s4-evm-k3r5 = "fs"
+SYSFW_PREFIX_j784s4-evm-k3r5-gp = "fs"
+SYSFW_PREFIX_j784s4-evm-k3r5-sr1-hs-fs = "fs"
 SYSFW_PREFIX_j784s4-hs-evm-k3r5 = "fs"
-SYSFW_PREFIX_am62xx-evm-k3r5 = "fs"
+SYSFW_PREFIX_am62xx-evm-k3r5-gp = "fs"
+SYSFW_PREFIX_am62xx-evm-k3r5-hs-se = "fs"
+SYSFW_PREFIX_am62xx-evm-k3r5-hs-fs = "fs"
 SYSFW_PREFIX_am62xx-lp-evm-k3r5 = "fs"
 SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-se = "fs"
-SYSFW_PREFIX_am62axx-evm-k3r5 = "fs"
+SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-fs = "fs"
+SYSFW_PREFIX_am62axx-evm-k3r5-gp = "fs"
+SYSFW_PREFIX_am62axx-evm-k3r5-hs-fs = "fs"
+SYSFW_PREFIX_am62axx-evm-k3r5-hs-se = "fs"

 SYSFW_TISCI = "${S}/ti-sysfw/ti-${SYSFW_PREFIX}-firmware-${SYSFW_SOC}-*.bin"

@@ -48,10 +55,26 @@ SYSFW_TIBOOT3 = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.bin"
 SYSFW_TIBOOT3_SYMLINK ?= "tiboot3.bin"

 SYSFW_BINARY = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
-SYSFW_VBINARY = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
-SYSFW_IMAGE = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
+SYSFW_VBINARY = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb"
+SYSFW_IMAGE = "sysfw-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb"
 SYSFW_SYMLINK ?= "sysfw.itb"

+SYSFW_VBINARY_am65xx-evm-k3r5 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
+SYSFW_VBINARY_am65xx-evm-k3r5-sr2 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
+SYSFW_VBINARY_am65xx-hs-evm-k3r5 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
+SYSFW_VBINARY_am65xx-hs-evm-k3r5-sr2 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
+SYSFW_VBINARY_j7-evm-k3r5 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
+SYSFW_VBINARY_j7-hs-evm-k3r5 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
+SYSFW_VBINARY_j7-hs-evm-k3r5-sr1-1 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
+
+SYSFW_IMAGE_am65xx-evm-k3r5 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
+SYSFW_IMAGE_am65xx-evm-k3r5-sr2 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
+SYSFW_IMAGE_am65xx-hs-evm-k3r5 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
+SYSFW_IMAGE_am65xx-hs-evm-k3r5-sr2 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
+SYSFW_IMAGE_j7-evm-k3r5 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
+SYSFW_IMAGE_j7-hs-evm-k3r5 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
+SYSFW_IMAGE_j7-hs-evm-k3r5-sr1-1 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
+
 CFLAGS[unexport] = "1"
 LDFLAGS[unexport] = "1"
 AS[unexport] = "1"
--- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
+++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
@@ -31,10 +31,18 @@ do_compile_append_am64xx-evm() {
 	tfa_sign_k3hs
 }

+do_compile_append_am62xx-evm() {
+        tfa_sign_k3hs
+}
+
 do_compile_append_am62xx-lp-evm() {
        tfa_sign_k3hs
 }

+do_compile_append_am62axx-evm() {
+        tfa_sign_k3hs
+}
+
 do_compile_append_j7-hs-evm() {
 	tfa_sign_k3hs
 }
--- a/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
+++ b/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
@@ -6,4 +6,4 @@ PR = "r33"

 BRANCH = "ti-u-boot-2021.01"

-SRCREV = "b5ae22b98fe0de5108c0ff60bdb4844558a14a8f"
+SRCREV = "62a9e513448d700cbc3d775f497f94ba63851c8e"
--- a/recipes-devtools/k3conf/k3conf_git.bb
+++ b/recipes-devtools/k3conf/k3conf_git.bb
@@ -8,7 +8,7 @@ PV = "0.2+git${SRCPV}"
 COMPATIBLE_MACHINE = "k3"

 BRANCH ?= "master"
-SRCREV = "48cb8e8d7dc962229a9f318cd512b4ddeec5cdc5"
+SRCREV = "982f5c2f02f732b5829861218812904cd776773d"

 SRC_URI = "git://git.ti.com/git/k3conf/k3conf.git;protocol=https;branch=${BRANCH}"

--- 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 = "80820e92639d729730d00c1ef65346c4eef0f9fb"
-PV = "5.10.158+git${SRCPV}"
+SRCREV = "02a1d48fd7af03f93bdf4ca06415618caa11bec2"
+PV = "5.10.162+git${SRCPV}"
--- a/recipes-kernel/linux/linux-ti-staging_5.10.bb
+++ b/recipes-kernel/linux/linux-ti-staging_5.10.bb
@@ -25,8 +25,8 @@ S = "${WORKDIR}/git"

 BRANCH = "ti-linux-5.10.y"

-SRCREV = "06bd1d157b9b43163c1a2184e4a0c92f98656dd0"
-PV = "5.10.158+git${SRCPV}"
+SRCREV = "76b3e88d569210a51399e8d8c8babd995af29d11"
+PV = "5.10.162+git${SRCPV}"

 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
 MACHINE_KERNEL_PR_append = "b"
--- a/recipes-security/optee/optee-client_%.bbappend
+++ b/recipes-security/optee/optee-client_%.bbappend
@@ -1,4 +1,7 @@
-PV_ti-soc = "3.19.0+git${SRCPV}"
-SRCREV_ti-soc = "140bf463046071d3ca5ebbde3fb21ee0854e1951"
+PV_ti-soc = "3.20.0+git${SRCPV}"
+SRCREV_ti-soc = "dd2d39b49975d2ada7870fe2b7f5a84d0d3860dc"

-DEPENDS_append_ti-soc = "pkgconfig util-linux"
+inherit pkgconfig
+DEPENDS_append_ti-soc = "util-linux"
+
+EXTRA_OEMAKE_append_ti-soc = " PKG_CONFIG=pkg-config"
--- a/recipes-security/optee/optee-examples_%.bbappend
+++ b/recipes-security/optee/optee-examples_%.bbappend
@@ -1,5 +1,5 @@
-PV_ti-soc = "3.19.0+git${SRCPV}"
-SRCREV_ti-soc = "f301ee9df2129c0db683e726c91dc2cefe4cdb65"
+PV_ti-soc = "3.20.0+git${SRCPV}"
+SRCREV_ti-soc = "a98d01e1b9168eaed96bcd0bac0df67c44a81081"
 SRC_URI_ti-soc = "git://github.com/linaro-swg/optee_examples.git;protocol=https"

 DEPENDS_append_ti-soc = " python3-cryptography-native"
--- a/recipes-security/optee/optee-os_%.bbappend
+++ b/recipes-security/optee/optee-os_%.bbappend
@@ -1,5 +1,5 @@
-PV_ti-soc = "3.19.0+git${SRCPV}"
-SRCREV_ti-soc = "d6c5d0037b46f46caf71d67d7825d4b722cbcddf"
+PV_ti-soc = "3.20.0+git${SRCPV}"
+SRCREV_ti-soc = "3bc3809afe372ca7e8216fc5d7a64e965bb4ad70"
 SRC_URI_ti-soc = "git://github.com/OP-TEE/optee_os.git;protocol=https"

 DEPENDS_append_ti-soc = " python3-cryptography-native"
@@ -72,10 +72,18 @@ do_compile_append_am64xx-evm() {
    optee_sign_k3hs
 }

+do_compile_append_am62xx-evm() {
+    optee_sign_k3hs
+}
+
 do_compile_append_am62xx-lp-evm() {
    optee_sign_k3hs
 }

+do_compile_append_am62axx-evm() {
+    optee_sign_k3hs
+}
+
 do_compile_append_j7-hs-evm() {
    optee_sign_k3hs
 }
--- a/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
+++ b/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
@@ -37,11 +37,14 @@ CLEANBROKEN = "1"
 PR = "${INC_PR}.0"

 # Secure Build
+include recipes-ti/includes/ti-paths.inc
 DEPENDS += "openssl-native"

 FILES_${PN} += "${base_libdir}"

-TI_SECURE_DEV_PKG ?= ""
+DEPENDS_append = "${@ '' if d.getVar('TI_SECURE_DEV_PKG_K3') else ' ti-k3-secdev-native' }"
+TI_SECURE_DEV_PKG = "${@ d.getVar('TI_SECURE_DEV_PKG_K3') or d.getVar('TI_K3_SECDEV_INSTALL_DIR') }"
+export TI_SECURE_DEV_PKG

 RTOS_ETH_FW_DIR = "${S}/ti-eth/${PLAT_SFX}"
 RTOS_DM_FW_DIR = "${S}/ti-dm/${PLAT_SFX}"
@@ -57,7 +60,6 @@ DM_FIRMWARE = "ipc_echo_testb_mcu1_0_release_strip.xer5f"

 # J7 HS support
 do_install_prepend_j7-hs-evm() {
-        export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
        ( cd ${RTOS_DM_FW_DIR}; \
                mv ${DM_FIRMWARE} ${DM_FIRMWARE}.unsigned; \
                ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${DM_FIRMWARE}.unsigned ${DM_FIRMWARE}; \
@@ -88,7 +90,6 @@ do_install_prepend_j7-hs-evm() {

 # J7 HS support
 do_install_prepend_j7200-hs-evm() {
-        export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
        ( cd ${RTOS_DM_FW_DIR}; \
                mv ${DM_FIRMWARE} ${DM_FIRMWARE}.unsigned; \
                ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${DM_FIRMWARE}.unsigned ${DM_FIRMWARE}; \
@@ -109,7 +110,6 @@ do_install_prepend_j7200-hs-evm() {

 # J7 HS support
 do_install_prepend_j721s2-hs-evm() {
-        export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
        ( cd ${RTOS_DM_FW_DIR}; \
                mv ${DM_FIRMWARE} ${DM_FIRMWARE}.unsigned; \
                ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${DM_FIRMWARE}.unsigned ${DM_FIRMWARE}; \
@@ -133,7 +133,6 @@ do_install_prepend_j721s2-hs-evm() {

 # J784S4 support
 do_install_prepend_j784s4-hs-evm() {
-        export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
        ( cd ${RTOS_DM_FW_DIR}; \
                mv ${DM_FIRMWARE} ${DM_FIRMWARE}.unsigned; \
                ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${DM_FIRMWARE}.unsigned ${DM_FIRMWARE}; \
@@ -176,7 +175,6 @@ do_install_prepend_am64xx() {

 # AM62Q HS-SE support
 do_install_prepend_am62xx() {
-        export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
        ( cd ${RTOS_DM_FW_DIR}; \
                mv ${DM_FIRMWARE} ${DM_FIRMWARE}.unsigned; \
                ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${DM_FIRMWARE}.unsigned ${DM_FIRMWARE}; \
@@ -188,6 +186,20 @@ do_install_prepend_am62xx() {
        )
 }

+do_install_prepend_am62axx-evm() {
+        export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
+        ( cd ${RTOS_DM_FW_DIR}; \
+                mv ${DM_FIRMWARE} ${DM_FIRMWARE}.unsigned; \
+                ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${DM_FIRMWARE}.unsigned ${DM_FIRMWARE}; \
+        )
+        ( cd ${RTOS_IPC_FW_DIR}; \
+                ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh am62a-mcu-r5f0_0-fw \
+                    am62a-mcu-r5f0_0-fw.signed; \
+                ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_c7x_1_release_strip.xe71 \
+                    ipc_echo_test_c7x_1_release_strip.xe71.signed; \
+        )
+}
+
 #Install all R5 & DSP ipc echo test binaries in lib/firmware/pdk-ipc, with softlinks up a level
 do_install() {

@@ -369,8 +381,10 @@ do_install_am62axx() {
    install -d ${LEGACY_IPC_FW_DIR}
    # DM+IPC Firmware
    install -m 0644 ${RTOS_IPC_FW_DIR}/am62a-mcu-r5f0_0-fw ${LEGACY_IPC_FW_DIR}
+    install -m 0644 ${RTOS_IPC_FW_DIR}/am62a-mcu-r5f0_0-fw.signed ${LEGACY_IPC_FW_DIR}
    install -m 0644 ${RTOS_DM_FW_DIR}/ipc_echo_testb_mcu1_0_release_strip.xer5f ${LEGACY_DM_FW_DIR}
    install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c7x_1_release_strip.xe71 ${LEGACY_IPC_FW_DIR}
+    install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c7x_1_release_strip.xe71.signed ${LEGACY_IPC_FW_DIR}
 }

 do_deploy() {
Author	SHA1	Message	Date
LCPD Automation Script	01d7bc0f14	linux-ti-staging-rt: RC Auto-Merger: 08.06.00.006 Updated the value(s) for: SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-02-16 08:55:47 -06:00
LCPD Automation Script	6a2c0c71f8	linux-ti-staging: CI/CD Auto-Merger: cicd.dunfell.202302151242 Updated the value(s) for: SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-02-15 12:42:28 -06:00
LCPD Automation Script	8e5d76def4	linux-ti-staging-rt: CI/CD Auto-Merger: cicd.dunfell.202302151242 Updated the value(s) for: SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-02-15 12:42:28 -06:00
LCPD Automation Script	1cbbd0c3fb	u-boot-ti-staging: CI/CD Auto-Merger: cicd.dunfell.202302151242 Updated the value(s) for: SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-02-15 12:42:28 -06:00
LCPD Automation Script	f30d6650a6	ti-linux-fw: CI/CD Auto-Merger: cicd.dunfell.202302151242 Updated the value(s) for: K3_IMAGE_GEN_SRCREV TI_LINUX_FW_SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-02-15 12:42:28 -06:00
Vaishnav Achath	3eb5785957	conf: machine: j784s4-evm: Add camera overlays for J784S4 EVM Add the following overlay files on J784S4 EVM: 1. Fusion board (For FPDLink-III cameras) 2. OV5640 camera module Signed-off-by: Vaishnav Achath <vaishnav.a@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2023-02-15 07:44:00 -06:00
Vaishnav Achath	795b91f8b5	conf: machine: j721s2-evm: Add camera overlays for J721S2 EVM Add the following overlay files on J721S2 EVM: 1. Fusion board (For FPDLink-III cameras) 2. OV5640 camera module Signed-off-by: Vaishnav Achath <vaishnav.a@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2023-02-15 07:44:00 -06:00
Vaishnav Achath	403821d255	conf: machine: j7-evm: Add camera overlays for J721E EVM Add the following overlay files on J721E EVM: 1. Fusion board (For FPDLink-III cameras) 2. IMX390 FPDLink camera module 3. IMX219 RPi-compatible camera module Signed-off-by: Vaishnav Achath <vaishnav.a@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2023-02-15 07:44:00 -06:00
Vaishnav Achath	6d43948103	conf: machine: j7200-evm: Add MCSPI loopback overlay for J7200 Add the MCSPI loopback overlay file for J7200 EVM which helps users to enable MCU-MAIN MCSPI loopback applications. Signed-off-by: Vaishnav Achath <vaishnav.a@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2023-02-15 07:44:00 -06:00
Dasnavis Sabiya	69506ed1c6	conf: machine: j784s4: Add ehrpwm overlay for am69-sk The AM69 SK has PWM output pins connected to its RPi header. Add overlay file to enable PWM pins. Signed-off-by: Dasnavis Sabiya <sabiya.d@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2023-02-15 07:43:02 -06:00
Dasnavis	c51d326243	conf: machine: j784s4-evm: Add support for J784S4 HS-FS Add the basic J784S4 HS-FS configuration. * Add configurations to support both HS-FS and GP keeping GP as default. * Add ti-sci-firmware overrides for HS-FS. * Remove evm conf file inclusion in hs-evm conf. * Add j784s4 hs-evm specific config to hs-evm conf. Signed-off-by: Dasnavis Sabiya <sabiya.d@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2023-02-15 07:41:55 -06:00
Sai Sree Kartheek Adivi	2bf12f5449	am62axx-evm: Add AM62A HS-FS evm configuration Lets add the basic AM62A configuration - Add machine conf for AM62A. - The wic images will boot on AM62A HS-FS devices by default. The sysfw image for GP and HS-SE will be packaged in the wic image as tiboot3-am62ax-gp-evm.bin and tiboot3-am62ax-hs-evm.bin respectively. - Add ti-sci-firmware overrides. - Sign ATF, OPTEE and RTOS Firmware. Signed-off-by: Chirag Shilwant <c-shilwant@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2023-02-14 07:45:02 -06:00
Sinthu Raja	937b57b6d6	conf: machine: j721s2-evm: Add support for J721S2 HS-FS Add the basic J721S2 HS-FS configuration. - Add configurations to support both HS-FS and GP keeping GP as default. - Add ti-sci-firmware overrides for HS-FS. - Remove evm conf file inclusion in hs-evm conf. - Add j721s2 hs-evm specific config to hs-evm conf. Signed-off-by: Aniket Limaye <a-limaye@ti.com> Signed-off-by: Sinthu Raja <sinthu.raja@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2023-02-14 07:42:25 -06:00
Ryan Eatmon	0853939164	ti-sci-fw: Add SYSFW_SUFFIX to sysfw.itb files With the advent of using multiconfigs to build all of the versions of the machines (gp, hs-se, hs-fs, etc...) the sysfw.itb has become a point of contention for do_deploy. To resolve the duplicate file copy errors from bitbake we need to uniquify the sysfw.itb file names. So, let's do the same thing we do with the tiboot3.bin file and add the SYSFW_SUFFIX into the name. Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2023-02-14 07:40:31 -06:00
Chirag Shilwant	84af651b06	am62xx-lp-evm: Add AM62x LP HS-FS evm configuration Lets add the basic AM62x LP HS-FS configuration - Add machine conf for AM62x LP HS-FS. - The wic images will boot on AM62x LP HS-FS devices by default. The sysfw image for HS-SE will be packaged in the wic image as tiboot3-am62x-hs-evm.bin. - Add ti-sci-firmware overrides. Signed-off-by: Chirag Shilwant <c-shilwant@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2023-02-13 13:10:38 -06:00
Chirag Shilwant	a80c069160	am62xx-evm: Add AM62x HS-FS evm configuration Lets add the basic AM62x HS-FS configuration - Add machine conf for AM62x HS-FS. - The wic images will boot on AM62x HS-FS devices by default. The sysfw image for GP and HS-SE will be packaged in the wic image as tiboot3-am62x-gp-evm.bin and tiboot3-am62x-hs-evm.bin respectively. - Add ti-sci-firmware overrides. Signed-off-by: Chirag Shilwant <c-shilwant@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2023-02-13 13:10:38 -06:00
LCPD Automation Script	3f029434bc	linux-ti-staging: CI/CD Auto-Merger: cicd.dunfell.202302130400 Updated the value(s) for: SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-02-13 04:00:23 -06:00
LCPD Automation Script	ad99c31ba7	linux-ti-staging-rt: CI/CD Auto-Merger: cicd.dunfell.202302130400 Updated the value(s) for: SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-02-13 04:00:23 -06:00
LCPD Automation Script	73e35f7294	ti-linux-fw: CI/CD Auto-Merger: cicd.dunfell.202302130400 Updated the value(s) for: K3_IMAGE_GEN_SRCREV TI_LINUX_FW_SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-02-13 04:00:23 -06:00
Aradhya Bhatia	5e69ad2791	conf: machine: am62xx-lp-evm: Add OLDI Panel overlay Add the Microtips OLDI Panel DT overlay for AM62 LP SK. Signed-off-by: Aradhya Bhatia <a-bhatia1@ti.com> Reviewed-by: Praneeth Bajjuri <praneeth@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2023-02-10 12:17:41 -06:00
Sinthu Raja	295309d446	conf: machine: k3: Define RD, DTB and DTBO load address for FIT image K3 platforms include the FIT image-based kernel by default. The bootloader loads the kernel and DTB from the FIT image. The DTB/DTBOs are added to the FIT image but the load address is not included in the image section of each DTB/DTBO. This load address is determined by the LOADADDRESS macros in the kernel-fitmage class. Hence, define the RD/DTB/DTBOs LOADADDRESS and OFFSET macros in the K3 common include, and remove those macros defined in the K3 board specific config files. Signed-off-by: Sinthu Raja <sinthu.raja@ti.com> Reviewed-by: Andrew Davis <afd@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2023-02-10 12:17:12 -06:00
Sinthu Raja	ac12229cdf	conf: machine: j721s2: Add ehrpwm overlay for am68-sk The AM68 SK has PWM output pins connected to its RPi headers. Add overlay file to enable PWM pins. Signed-off-by: Sinthu Raja <sinthu.raja@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2023-02-10 12:14:54 -06:00
LCPD Automation Script	6aade6d4b5	linux-ti-staging-rt: RC Auto-Merger: 08.06.00.005 Updated the value(s) for: SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-02-09 20:12:08 -06:00
LCPD Automation Script	f1f975551e	linux-ti-staging: CI/CD Auto-Merger: cicd.dunfell.202302091706 Updated the value(s) for: SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-02-09 17:07:23 -06:00
LCPD Automation Script	85998d3037	linux-ti-staging-rt: CI/CD Auto-Merger: cicd.dunfell.202302091706 Updated the value(s) for: SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-02-09 17:07:23 -06:00
LCPD Automation Script	6ad6cfd0a1	u-boot-ti-staging: CI/CD Auto-Merger: cicd.dunfell.202302091706 Updated the value(s) for: SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-02-09 17:07:23 -06:00
LCPD Automation Script	118b9223e5	ti-linux-fw: CI/CD Auto-Merger: cicd.dunfell.202302091706 Updated the value(s) for: K3_IMAGE_GEN_SRCREV TI_LINUX_FW_SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-02-09 17:07:23 -06:00
Ryan Eatmon	b61b2a2220	ti-rtos-firmware: Use ti-k3-secdev if TI_SECURE_DEV_PKG_K3 not defined Use ti-k3-secdev native package to provide secure-binary-image.sh script when it is not passed on as an environment variable. This fixes and issue with AM64xx which is always HS but should not require TI_SECURE_DEV_PKG when building for HS-FS platforms. This is backported from a patch for kirkstone. [1] [1] https://lists.yoctoproject.org/g/meta-ti/topic/master_kirkstone_patch_1_8/96819771 Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2023-02-08 15:20:27 -06:00
Manorit Chawdhry	280e7b4b3a	optee: update optee components to 3.20 tag OPTEE tests is not being upgraded due to a newer python dependency for the build Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2023-02-08 08:41:56 -06:00
LCPD Automation Script	7ba50af81b	linux-ti-staging: CI/CD Auto-Merger: cicd.dunfell.202302070400 Updated the value(s) for: SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-02-07 04:00:43 -06:00
LCPD Automation Script	083c33af3e	linux-ti-staging-rt: CI/CD Auto-Merger: cicd.dunfell.202302070400 Updated the value(s) for: SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-02-07 04:00:43 -06:00
LCPD Automation Script	4dc0ef22e5	ti-linux-fw: CI/CD Auto-Merger: cicd.dunfell.202302070400 Updated the value(s) for: K3_IMAGE_GEN_SRCREV TI_LINUX_FW_SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-02-07 04:00:43 -06:00
Dasnavis Sabiya	044def14c5	conf: machine: j784s4: Add FPDLink overlays for AM69 SK Add the overlay files for AM69 SK: 1. Fusion board (For FPDLink-III cameras). 2. IMX390 FPDLink-III camera module that includes both the CM and RCM type of modules. Signed-off-by: Dasnavis Sabiya <sabiya.d@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2023-02-06 08:28:20 -06:00
LCPD Automation Script	20f0742da3	linux-ti-staging-rt: RC Auto-Merger: 08.06.00.004 Updated the value(s) for: SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-02-03 15:49:48 -06:00
Ryan Eatmon	4aa8ed586b	optee: Revert "optee: update optee components to 3.20 tag" This reverts commit `9a007a3fea`. We ran into some build failures on the older legacy platforms due to this change and so are reverting this while we investigate.	2023-02-03 15:46:43 -06:00
LCPD Automation Script	c05a99c590	linux-ti-staging: CI/CD Auto-Merger: cicd.dunfell.202302030400 Updated the value(s) for: PV SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-02-03 04:00:27 -06:00
LCPD Automation Script	d5b221919f	linux-ti-staging-rt: CI/CD Auto-Merger: cicd.dunfell.202302030400 Updated the value(s) for: PV SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-02-03 04:00:27 -06:00
LCPD Automation Script	bb2959b462	u-boot-ti-staging: CI/CD Auto-Merger: cicd.dunfell.202302030400 Updated the value(s) for: SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-02-03 04:00:27 -06:00
LCPD Automation Script	b0ccdfaccd	ti-linux-fw: CI/CD Auto-Merger: cicd.dunfell.202302030400 Updated the value(s) for: K3_IMAGE_GEN_SRCREV TI_LINUX_FW_SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-02-03 04:00:27 -06:00
Manorit Chawdhry	9a007a3fea	optee: update optee components to 3.20 tag OPTEE tests is not being upgraded due to a newer python dependency for the build Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2023-02-01 10:47:16 -06:00
Chirag Shilwant	ca662c2221	machine: Add AM62x HS-SE evm configuration Lets add the basic AM62x HS-SE configuration. - Add machine conf for AM62x HS-SE. - The wic images will boot on AM62x GP devices by default. To boot on AM62x HS-SE, simply switch out the SYSFW image: $ cd /mnt/sd-card/boot $ mv tiboot3-am62x-hs-evm.bin tiboot3.bin - Add ti-sci-firmware overrides. - Add support to sign ATF and OPTEE. Signed-off-by: Chirag Shilwant <c-shilwant@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2023-01-30 10:33:34 -06:00
Sinthu Raja	0988872f39	conf: machine: j721s2: Add FPDLink overlays for am68-sk Add the overlay files, over AM68 SK, for the following: 1. Fusion board (For FPDLink-III cameras). 2. IMX390 FPDLink-III camera module which includes both the CM and RCM type of modules. Signed-off-by: Sinthu Raja <sinthu.raja@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2023-01-27 08:34:39 -06:00
Sinthu Raja	7aa2b3927e	conf: machine: j721s2: Fix DTB overlay extension for OV5640 The extension for OV5640 overlay is incorrect. Therefore, update the correct extension to build the overlay with .dtbo Fixes: `f67e9805` ("conf: machine: j721s2: Add AM68 SK specific dtb and dtbo to KERNEL_DEVICETREE") Signed-off-by: Sinthu Raja <sinthu.raja@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2023-01-27 08:26:53 -06:00
Bryan Brattlof	610eaaeaac	k3conf update SRCREV to add am62ax support update the SHA of k3conf to pickup am62ax support Signed-off-by: Bryan Brattlof <bb@ti.com> Reviewed-by: Praneeth Bajjuri <praneeth@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2023-01-27 08:25:50 -06:00
Dasnavis Sabiya	a9be91a02a	conf: machine: j784s4: Add AM69 SK specific dtb and dtbo to KERNEL_DEVICETREE AM69 Starter Kit is a single board designed based on TI's AM69 SOC providing advanced system integration in automotive ADAS applications, autonomous mobile robot and edge AI applications. Add support for the same to include the board dtb file into the root filesystem. Add DT overlays support for the following features on AM69 SK: * Add DTBO entry to support OV5640 camera * Add DTBO entry to support RPi(IMX219) camera * Add DTBO entry for the DDR memory carveout. [1]:https://www.ti.com/lit/zip/spruj52 Signed-off-by: Dasnavis Sabiya <sabiya.d@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2023-01-27 08:25:50 -06:00