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>
optee: Revert "optee: update optee components to 3.20 tag"
2026-01-12 01:20:20 +00:00 · 2023-02-03 15:49:48 -06:00 · 2023-02-03 15:46:43 -06:00 · 2023-02-03 04:00:27 -06:00 · 2023-02-03 04:00:27 -06:00 · 2023-02-03 04:00:27 -06:00
14 changed files with 77 additions and 12 deletions
--- a/conf/machine/am62xx-evm-k3r5-gp.conf
+++ b/conf/machine/am62xx-evm-k3r5-gp.conf
@@ -9,3 +9,6 @@ SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "gp"

 UBOOT_MACHINE = "am62x_evm_r5_defconfig"
+
+UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
+UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
--- 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/include/am62xx.inc
+++ b/conf/machine/include/am62xx.inc
@@ -8,8 +8,15 @@ 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"
+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 AM62x is for GP, 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/j721s2-evm.conf
+++ b/conf/machine/j721s2-evm.conf
@@ -14,9 +14,26 @@ 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-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-gesi-exp-board.dtbo \
 "
--- a/conf/machine/j784s4-evm.conf
+++ b/conf/machine/j784s4-evm.conf
@@ -13,6 +13,10 @@ 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-rpi-cam-imx219.dtbo \
    ti/k3-j784s4-evm.dtb \
 "

--- 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 ?= "e13f60459c72a315ff63d9800e8abb0d88bf45fc"
 SRCREV = "${TI_LINUX_FW_SRCREV}"

 BRANCH ?= "ti-linux-firmware"

-K3_IMAGE_GEN_SRCREV ?= "2308bfb01e7bd3e03514cb33f06180dd9bb79121"
+K3_IMAGE_GEN_SRCREV ?= "69250070a328f7a658a3d5cb4b8ca8f81947e8ac"
 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
@@ -37,7 +37,8 @@ SYSFW_PREFIX_j721s2-evm-k3r5 = "fs"
 SYSFW_PREFIX_j721s2-hs-evm-k3r5 = "fs"
 SYSFW_PREFIX_j784s4-evm-k3r5 = "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-lp-evm-k3r5 = "fs"
 SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-se = "fs"
 SYSFW_PREFIX_am62axx-evm-k3r5 = "fs"
--- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
+++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
@@ -31,6 +31,10 @@ 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
 }
--- 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 = "072a9b409c15bfd1e0de99b2b0e7c06f850a32df"
--- 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 = "d77d037d679dbfc9594856ccf2f08e7c808b9e93"
+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 = "2927372e2c7cc3782c07b1896757962bc346d4c5"
+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-os_%.bbappend
+++ b/recipes-security/optee/optee-os_%.bbappend
@@ -72,6 +72,10 @@ 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
 }
Author	SHA1	Message	Date
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