ti-linux-fw: CI/CD Auto-Merger: cicd.dunfell.202304260757

Updated the value(s) for: K3_IMAGE_GEN_SRCREV TI_LINUX_FW_SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>
linux-ti-staging: CI/CD Auto-Merger: cicd.dunfell.202304122200
2026-04-20 11:42:57 +00:00 · 2023-04-26 07:58:01 -05:00 · 2023-04-12 22:00:38 -05:00 · 2023-04-12 22:00:38 -05:00 · 2023-04-02 18:00:50 -05:00 · 2023-03-31 17:15:02 -05:00
40 changed files with 371 additions and 73 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
@@ -12,6 +12,7 @@ KERNEL_DEVICETREE = " \
    ti/k3-am62a7-fpdlink-ov2312-0-3.dtbo \
    ti/k3-am62a7-fpdlink-sk-fusion.dtbo \
    ti/k3-am62a7-sk-csi2-imx219.dtbo \
+    ti/k3-am62a7-sk-ethernet-dc01.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 \
@@ -23,3 +24,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,7 +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-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,11 +8,18 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"

 TFA_K3_SYSTEM_SUSPEND = "1"

-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"
+# 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 GP, add a version for HS-SE
+# 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"
--- 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,30 @@ 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 \
+    ti/k3-j721e-common-proc-board-uarts.dtbo \
+    ti/k3-j7200-mcspi-loopback.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,8 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"

 KERNEL_DEVICETREE = " \
    ti/k3-j7200-common-proc-board.dtb \
+    ti/k3-j7200-mcspi-loopback.dtbo \
+    ti/k3-j7200-common-proc-board-uarts.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
@@ -17,6 +17,7 @@ KERNEL_DEVICETREE = " \
    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 \
@@ -35,10 +36,22 @@ KERNEL_DEVICETREE = " \
    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 \
+    ti/k3-j721s2-common-proc-board-uarts.dtbo \
+    ti/k3-j7200-mcspi-loopback.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
@@ -17,6 +17,7 @@ KERNEL_DEVICETREE = " \
    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 \
@@ -35,12 +36,23 @@ KERNEL_DEVICETREE = " \
    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 \
+    ti/k3-j784s4-evm-uarts.dtbo \
+    ti/k3-j7200-mcspi-loopback.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 ?= "9e339668d7d1bf5a5ac9109d33f89919eabe6daf"
+TI_LINUX_FW_SRCREV ?= "760434de173d1957823042b3c2daf0f45e1191cd"
 SRCREV = "${TI_LINUX_FW_SRCREV}"

 BRANCH ?= "ti-linux-firmware"

-K3_IMAGE_GEN_SRCREV ?= "64e7fb3c03f3d4e72a3517175707feff277690e9"
+K3_IMAGE_GEN_SRCREV ?= "184ab513e6acb161c5f77a593ef976f3a4d93cda"
 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,15 +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-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"

@@ -49,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
@@ -39,6 +39,10 @@ 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 = "977a26a29878425fc3ef6d914b9bfa22705d2dd0"
+SRCREV = "3a5205e9803809f18edc59a40fd9df470f98a00f"
--- 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 = "982f5c2f02f732b5829861218812904cd776773d"
+SRCREV = "1dd468d551fd786c410e88dadc1114505d057ebe"

 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 = "221424b9d0cea049e58d5ad93fcec93c90511744"
-PV = "5.10.162+git${SRCPV}"
+SRCREV = "e6bb059e69c106b73bfe2a10e729dbe5a5820916"
+PV = "5.10.168+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 = "73f2f2bba715b5cada420f2fb34bb43d185248f2"
-PV = "5.10.162+git${SRCPV}"
+SRCREV = "991c5ce91e43cb620f534dc9fe7b0ad21f4f4388"
+PV = "5.10.168+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-os_%.bbappend
+++ b/recipes-security/optee/optee-os_%.bbappend
@@ -1,5 +1,5 @@
 PV_ti-soc = "3.20.0+git${SRCPV}"
-SRCREV_ti-soc = "3bc3809afe372ca7e8216fc5d7a64e965bb4ad70"
+SRCREV_ti-soc = "8e74d47616a20eaa23ca692f4bbbf917a236ed94"
 SRC_URI_ti-soc = "git://github.com/OP-TEE/optee_os.git;protocol=https"

 DEPENDS_append_ti-soc = " python3-cryptography-native"
@@ -80,6 +80,10 @@ 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/secdev/ti-k3-secdev_git.bb
+++ b/recipes-ti/secdev/ti-k3-secdev_git.bb
@@ -14,7 +14,7 @@ COMPATIBLE_MACHINE_class-nativesdk = "(.*)"
 GIT_URI = "git://git.ti.com/git/security-development-tools/core-secdev-k3.git"
 GIT_PROTOCOL = "https"
 GIT_BRANCH = "master"
-GIT_SRCREV = "eb2c4d734487e5095b94cef3fd7213ee71d9e016"
+GIT_SRCREV = "bba9cabaeee96f7f287385188ff289b46769a4bf"

 SRC_URI = "${GIT_URI};protocol=${GIT_PROTOCOL};branch=${GIT_BRANCH}"
 SRCREV = "${GIT_SRCREV}"
--- a/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
+++ b/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
@@ -186,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() {

@@ -367,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() {
@@ -786,7 +802,7 @@ ALTERNATIVE_TARGET[j721s2-c71_1-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_e

 ALTERNATIVE_TARGET[j784s4-mcu-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_testb_mcu1_0_release_strip.xer5f"
 ALTERNATIVE_TARGET[j784s4-mcu-r5f0_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_1_release_strip.xer5f"
-ALTERNATIVE_TARGET[j784s4-main-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu2_0_release_strip.xer5f"
+ALTERNATIVE_TARGET[j784s4-main-r5f0_0-fw] = "${base_libdir}/firmware/ethfw/app_remoteswitchcfg_server_strip.xer5f"
 ALTERNATIVE_TARGET[j784s4-main-r5f0_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu2_1_release_strip.xer5f"
 ALTERNATIVE_TARGET[j784s4-main-r5f1_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu3_0_release_strip.xer5f"
 ALTERNATIVE_TARGET[j784s4-main-r5f1_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu3_1_release_strip.xer5f"
@@ -797,7 +813,7 @@ ALTERNATIVE_TARGET[j784s4-c71_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_
 ALTERNATIVE_TARGET[j784s4-c71_2-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c7x_3_release_strip.xe71"
 ALTERNATIVE_TARGET[j784s4-c71_3-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c7x_4_release_strip.xe71"

-ALTERNATIVE_TARGET[j784s4-main-r5f0_0-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu2_0_release_strip.xer5f.signed"
+ALTERNATIVE_TARGET[j784s4-main-r5f0_0-fw-sec] = "${base_libdir}/firmware/ethfw/app_remoteswitchcfg_server_strip.xer5f.signed"
 ALTERNATIVE_TARGET[j784s4-main-r5f0_1-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu2_1_release_strip.xer5f.signed"
 ALTERNATIVE_TARGET[j784s4-main-r5f1_0-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu3_0_release_strip.xer5f.signed"
 ALTERNATIVE_TARGET[j784s4-main-r5f1_1-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu3_1_release_strip.xer5f.signed"
Author	SHA1	Message	Date
LCPD Automation Script	86bafdd779	ti-linux-fw: CI/CD Auto-Merger: cicd.dunfell.202304260757 Updated the value(s) for: K3_IMAGE_GEN_SRCREV TI_LINUX_FW_SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-04-26 07:58:01 -05:00
LCPD Automation Script	443dfaf5ef	linux-ti-staging: CI/CD Auto-Merger: cicd.dunfell.202304122200 Updated the value(s) for: SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-04-12 22:00:38 -05:00
LCPD Automation Script	cc835e743e	linux-ti-staging-rt: CI/CD Auto-Merger: cicd.dunfell.202304122200 Updated the value(s) for: SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-04-12 22:00:38 -05:00
LCPD Automation Script	a5df298100	u-boot-ti-staging: CI/CD Auto-Merger: cicd.dunfell.202304021800 Updated the value(s) for: SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-04-02 18:00:50 -05:00
Aniket Limaye	cf4ac1f741	ti-rtos-firmware: j784s4: main-r5f0_0-fw should point to ethfw binary main-r5f0_0-fw was pointing to pdk-ipc binary, while it should be pointing to ethfw one for j784s4-evm, j784s4-hs-evm Signed-off-by: Aniket Limaye <a-limaye@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2023-03-31 17:15:02 -05:00
LCPD Automation Script	cecbf35e84	k3conf: CI/CD Auto-Merger: cicd.dunfell.202303310400 Updated the value(s) for: SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-03-31 04:00:33 -05:00
LCPD Automation Script	0792e88485	u-boot-ti-staging: CI/CD Auto-Merger: cicd.dunfell.202303310400 Updated the value(s) for: SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-03-31 04:00:33 -05:00
LCPD Automation Script	9f6913307a	ti-linux-fw: CI/CD Auto-Merger: cicd.dunfell.202303310400 Updated the value(s) for: TI_LINUX_FW_SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-03-31 04:00:33 -05:00
LCPD Automation Script	27ff52dd41	ti-k3-secdev: CI/CD Auto-Merger: cicd.dunfell.202303021800 Updated the value(s) for: GIT_SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-03-02 18:00:25 -06:00
LCPD Automation Script	e7fe9b9d92	linux-ti-staging-rt: CI/CD Auto-Merger: cicd.dunfell.202303021800 Updated the value(s) for: SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-03-02 18:00:25 -06:00
LCPD Automation Script	63f0b90fb2	u-boot-ti-staging: CI/CD Auto-Merger: cicd.dunfell.202303021800 Updated the value(s) for: SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-03-02 18:00:25 -06:00
LCPD Automation Script	cb6c0975e7	ti-linux-fw: CI/CD Auto-Merger: cicd.dunfell.202303021800 Updated the value(s) for: K3_IMAGE_GEN_SRCREV TI_LINUX_FW_SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-03-02 18:00:25 -06:00
Siddharth Vadapalli	19e607a197	conf: machine: am62axx: Add overlay for second CPSW3G Port The SK-Ethernet-DC01 Add-On Ethernet Card for AM62A-SK board supports RGMII mode. Add overlay to enable the second CPSW3G port in RGMII-RXID mode with the Add-On Ethernet Card. Signed-off-by: Siddharth Vadapalli <s-vadapalli@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2023-02-28 11:09:19 -06:00
Vaishnav Achath	5e045d8bba	conf: machine: j784s4-evm: Add MCSPI loopback overlay for J784S4 Add the MCSPI loopback overlay file for J784S4 EVM which helps users to enable MCU-MAIN MCSPI loopback applications, even though the overlay is named j7200-mcspi-loopback.dtbo, same can be used for testing on other J7 platforms as well. Signed-off-by: Vaishnav Achath <vaishnav.a@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2023-02-27 10:17:16 -06:00
Vaishnav Achath	05d12a32ed	conf: machine: j721s2-evm: Add MCSPI loopback overlay for J721S2 Add the MCSPI loopback overlay file for J721S2 EVM which helps users to enable MCU-MAIN MCSPI loopback applications, even though the overlay is named j7200-mcspi-loopback.dtbo, same can be used for testing on other J7 platforms as well. Signed-off-by: Vaishnav Achath <vaishnav.a@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2023-02-27 10:17:16 -06:00
Vaishnav Achath	1fb574f061	conf: machine: j7-evm: Add MCSPI loopback overlay for J721E Add the MCSPI loopback overlay file for J721E EVM which helps users to enable MCU-MAIN MCSPI loopback applications, even though the overlay is named j7200-mcspi-loopback.dtbo, same can be used for testing on other J7 platforms as well. Signed-off-by: Vaishnav Achath <vaishnav.a@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2023-02-27 10:17:16 -06:00
Bhavya Kapoor	bad1d112b7	conf: machine: j784s4-evm: Add uarts overlay for J784S4 Add device tree overlay for extending support for mcu_uart0 as well as wkup_uart0 for boards with J784S4 SoC. This overlay will mainly be used for the purpose of testing uart instances. Signed-off-by: Bhavya Kapoor <b-kapoor@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2023-02-27 10:17:16 -06:00
Bhavya Kapoor	6de102676b	conf: machine: j721s2-evm: Add uarts overlay for J721S2 Add device tree overlay for extending support for mcu_uart0 as well as wkup_uart0 for boards with J721S2 SoC. This overlay will mainly be used for the purpose of testing uart instances. Signed-off-by: Bhavya Kapoor <b-kapoor@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2023-02-27 10:17:16 -06:00
Bhavya Kapoor	e8703215d7	conf: machine: j7-evm: Add uarts overlay for J721E Add device tree overlay for extending support for mcu_uart0 as well as wkup_uart0 for boards with J721E SoC. This overlay will mainly be used for the purpose of testing uart instances. Signed-off-by: Bhavya Kapoor <b-kapoor@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2023-02-27 10:17:16 -06:00
Bhavya Kapoor	526a0f0a04	conf: machine: j7200-evm: Add uarts overlay for J7200 Add device tree overlay for extending support for mcu_uart0 as well as wkup_uart0 for boards with J7200 SoC. This overlay will mainly be used for the purpose of testing uart instances. Signed-off-by: Bhavya Kapoor <b-kapoor@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2023-02-27 10:17:16 -06:00
Ryan Eatmon	39e7dad122	Revert "ti-k3-secdev: CI/CD Auto-Merger: cicd.dunfell.202302231358" This reverts commit `7f773f3b5b`. An error in our CICD script picked an invalid hash. Rollback to the previous SRCREV.	2023-02-24 11:36:16 -06:00
LCPD Automation Script	45bdaf7da0	linux-ti-staging-rt: RC Auto-Merger: 08.06.00.007 Updated the value(s) for: SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-02-23 17:38:09 -06:00
LCPD Automation Script	7f773f3b5b	ti-k3-secdev: CI/CD Auto-Merger: cicd.dunfell.202302231358 Updated the value(s) for: GIT_SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-02-23 13:59:06 -06:00
LCPD Automation Script	a1ed6b88ee	linux-ti-staging: CI/CD Auto-Merger: cicd.dunfell.202302231358 Updated the value(s) for: SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-02-23 13:59:06 -06:00
LCPD Automation Script	b47e873e6e	linux-ti-staging-rt: CI/CD Auto-Merger: cicd.dunfell.202302231358 Updated the value(s) for: SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-02-23 13:59:06 -06:00
LCPD Automation Script	24972447d7	u-boot-ti-staging: CI/CD Auto-Merger: cicd.dunfell.202302231358 Updated the value(s) for: SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-02-23 13:59:06 -06:00
LCPD Automation Script	76f4bf2e8e	ti-linux-fw: CI/CD Auto-Merger: cicd.dunfell.202302231358 Updated the value(s) for: TI_LINUX_FW_SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-02-23 13:59:06 -06:00
LCPD Automation Script	3c0f682eb7	linux-ti-staging: CI/CD Auto-Merger: cicd.dunfell.202302230340 Updated the value(s) for: SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-02-23 03:40:22 -06:00
LCPD Automation Script	91a8682c32	linux-ti-staging-rt: CI/CD Auto-Merger: cicd.dunfell.202302230340 Updated the value(s) for: SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-02-23 03:40:22 -06:00
LCPD Automation Script	dbe929ce64	u-boot-ti-staging: CI/CD Auto-Merger: cicd.dunfell.202302230340 Updated the value(s) for: SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-02-23 03:40:22 -06:00
LCPD Automation Script	fd74f0cf2e	ti-linux-fw: CI/CD Auto-Merger: cicd.dunfell.202302230340 Updated the value(s) for: TI_LINUX_FW_SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-02-23 03:40:22 -06:00
Manorit Chawdhry	bf8c55cf0d	optee: fix the sha for 3.20 tag The SHA for optee_os had been of 3.20-rc1 tag instead of 3.20 tag which had been marked stable. Change the tag to 3.20. Fixes: `280e7b4b3a` ("optee: update optee components to 3.20 tag") Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2023-02-22 07:49:39 -06:00
LCPD Automation Script	f438d6a688	linux-ti-staging-rt: CI/CD Auto-Merger: cicd.dunfell.202302220400 Updated the value(s) for: SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-02-22 04:00:12 -06:00
LCPD Automation Script	2b8869bac6	linux-ti-staging: CI/CD Auto-Merger: cicd.dunfell.202302211800 Updated the value(s) for: PV SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-02-21 18:01:19 -06:00
LCPD Automation Script	b7085f60b6	linux-ti-staging-rt: CI/CD Auto-Merger: cicd.dunfell.202302211800 Updated the value(s) for: PV SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-02-21 18:01:19 -06:00
LCPD Automation Script	6c6706afe7	u-boot-ti-staging: CI/CD Auto-Merger: cicd.dunfell.202302211800 Updated the value(s) for: SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-02-21 18:01:19 -06:00
LCPD Automation Script	8ff139daba	ti-linux-fw: CI/CD Auto-Merger: cicd.dunfell.202302211800 Updated the value(s) for: TI_LINUX_FW_SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>	2023-02-21 18:01:19 -06:00
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