CI/CD Auto-Merger: cicd.master.202403130100

Updated the value(s) for: u-boot-ti-staging_2024.04: SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>
ipc: ti-rpmsg-char: Update library to 0.6.6
2026-04-20 19:53:43 +00:00 · 2024-03-13 01:00:53 -05:00 · 2024-03-12 08:59:35 -05:00 · 2024-03-12 01:00:45 -05:00 · 2024-03-08 01:01:13 -06:00 · 2024-02-29 09:02:52 -06:00
82 changed files with 548 additions and 568 deletions
--- a/meta-ti-bsp/conf/layer.conf
+++ b/meta-ti-bsp/conf/layer.conf
@@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "meta-ti-bsp"
 BBFILE_PATTERN_meta-ti-bsp := "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-ti-bsp = "6"

-LAYERSERIES_COMPAT_meta-ti-bsp = "kirkstone langdale mickledore nanbield"
+LAYERSERIES_COMPAT_meta-ti-bsp = "kirkstone langdale mickledore nanbield scarthgap"

 LICENSE_PATH += "${LAYERDIR}/licenses"

--- a/meta-ti-bsp/conf/machine/am62axx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62axx-evm.conf
@@ -8,6 +8,7 @@ KERNEL_DEVICETREE_PREFIX = " \
    ti/k3-am62a7 \
    ti/k3-am62x-sk \
    ti/k3-fpdlink \
+    ti/k3-v3link \
 "

 KERNEL_DEVICETREE = " \
--- a/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf
@@ -3,6 +3,7 @@
 #@DESCRIPTION: Machine configuration for the TI AM62Px EVM (R5F core)

 require conf/machine/include/k3r5.inc
+require conf/machine/include/ti-extras.inc

 SYSFW_SOC = "am62px"
 SYSFW_CONFIG = "evm"
--- a/meta-ti-bsp/conf/machine/am62pxx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62pxx-evm.conf
@@ -3,6 +3,7 @@
 #@DESCRIPTION: Machine configuration for the TI AM62PX EVM

 require conf/machine/include/am62pxx.inc
+require conf/machine/include/ti-extras.inc

 KERNEL_DEVICETREE_PREFIX = " \
    ti/k3-am62p5 \
@@ -15,3 +16,10 @@ KERNEL_DEVICETREE = " \
 "

 UBOOT_MACHINE = "am62px_evm_a53_defconfig"
+
+# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build
+# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc
+# under meta-ti-bsp/recipes-bsp/u-boot/ for more details.
+# For AM62P tisdk-display-cluster image, splash screen is handled by SBL.
+# Hence, disable the A53 based splash screen using the am62px_evm_prune_splashscreen.config fragment present in ti-u-boot tree
+UBOOT_CONFIG_FRAGMENTS = "${@oe.utils.conditional('DISPLAY_CLUSTER_ENABLE', '1', 'am62px_evm_prune_splashscreen.config', '', d)}"
--- a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf
@@ -3,6 +3,7 @@
 #@DESCRIPTION: Machine configuration for the TI AM62xx LP GP EVM (R5F core)

 require conf/machine/include/k3r5.inc
+require conf/machine/include/ti-extras.inc

 SYSFW_SOC = "am62x"
 SYSFW_CONFIG = "evm"
--- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
@@ -3,13 +3,14 @@
 #@DESCRIPTION: Machine configuration for the TI AM62XX LP EVM

 require conf/machine/include/am62xx.inc
+require conf/machine/include/ti-extras.inc

 KERNEL_DEVICETREE_PREFIX = " \
    ti/k3-am62-lp \
    ti/k3-am625-sk \
    ti/k3-am62x-sk-hdmi \
+    ti/k3-am62x-sk-lpm \
    ti/k3-am62x-sk-mcan \
-    ti/k3-am62x-sk-mcu \
 "

 KERNEL_DEVICETREE = " \
--- a/meta-ti-bsp/conf/machine/beagle-x15.conf
+++ b/meta-ti-bsp/conf/machine/beagle-x15.conf
@@ -9,9 +9,11 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
 KERNEL_DEVICETREE_PREFIX = "am57xx-beagle-x15"

 KERNEL_DEVICETREE = " \
-    am57xx-beagle-x15.dtb \
-    am57xx-beagle-x15-revb1.dtb \
-    am57xx-beagle-x15-revc.dtb \
+am57xx-beagle-x15.dtb \
+am57xx-beagle-x15-revb1.dtb \
+am57xx-beagle-x15-revc.dtb \
+am57xx-idk-lcd-osd101t2045.dtbo \
+am57xx-idk-lcd-osd101t2587.dtbo \
 "

 MACHINE_GUI_CLASS = "bigscreen"
--- a/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf
@@ -15,3 +15,9 @@ UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
 UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"

 UBOOT_MACHINE = "j721e_evm_r5_defconfig"
+
+
+# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build
+# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc
+# under meta-ti-bsp/recipes-bsp/u-boot/ for more details.
+UBOOT_CONFIG_FRAGMENTS = "j721e_beagleboneai64_r5.config"
--- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
+++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
@@ -6,21 +6,29 @@ require conf/machine/include/j721e.inc

 UBOOT_MACHINE = "j721e_evm_a72_config"

+
+# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build
+# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc
+# under meta-ti-bsp/recipes-bsp/u-boot/ for more details.
+UBOOT_CONFIG_FRAGMENTS = "j721e_beagleboneai64_a72.config"
+
 PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"

 KERNEL_DEVICETREE = " \
 ti/k3-j721e-beagleboneai64.dtb \
 ti/k3-j721e-common-proc-board.dtb \
+ti/k3-j721e-beagleboneai64-dsi-rpi-7inch-panel.dtbo \
 ti/k3-j721e-evm-csi2-ov5640.dtbo \
 ti/k3-j721e-evm-fusion.dtbo \
 ti/k3-j721e-evm-gesi-exp-board.dtbo \
+ti/k3-j721e-evm-pcie0-ep.dtbo \
 ti/k3-j721e-evm-quad-port-eth-exp.dtbo \
 ti/k3-j721e-evm-virt-mac-client.dtbo \
+ti/k3-j721e-sk.dtb \
 ti/k3-j721e-sk-csi2-ov5640.dtbo \
 ti/k3-j721e-sk-csi2-rpi-imx219.dtbo \
 ti/k3-j721e-sk-fusion.dtbo \
 ti/k3-j721e-sk-rpi-hdr-ehrpwm.dtbo \
-ti/k3-j721e-sk.dtb \
 "

 MACHINE_GUI_CLASS = "bigscreen"
--- a/meta-ti-bsp/conf/machine/beaglebone.conf
+++ b/meta-ti-bsp/conf/machine/beaglebone.conf
@@ -9,12 +9,57 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
 KERNEL_DEVICETREE_PREFIX = "am335x-bone"

 KERNEL_DEVICETREE = " \
-    am335x-bone.dtb \
-    am335x-boneblue.dtb \
-    am335x-boneblack.dtb \
-    am335x-boneblack-wireless.dtb \
-    am335x-bonegreen.dtb \
-    am335x-bonegreen-wireless.dtb \
+am335x-bone.dtb \
+am335x-boneblack.dtb \
+am335x-boneblack-pps.dtb \
+am335x-boneblack-uboot.dtb \
+am335x-boneblack-uboot-univ.dtb \
+am335x-boneblack-wireless.dtb \
+am335x-boneblue.dtb \
+am335x-bonegreen.dtb \
+am335x-bonegreen-gateway.dtb \
+am335x-bonegreen-wireless.dtb \
+am335x-bonegreen-wireless-uboot-univ.dtb \
+am335x-pocketbeagle.dtb \
+am335x-sancloud-bbe.dtb \
+am335x-sancloud-bbe-extended-wifi.dtb \
+am335x-sancloud-bbe-lite.dtb \
+"
+
+# Extra DT overlays/capes
+KERNEL_DEVICETREE += " \
+AM335X-PRU-UIO-00A0.dtbo \
+BB-ADC-00A0.dtbo \
+BB-BBBW-WL1835-00A0.dtbo \
+BB-BBGG-WL1835-00A0.dtbo \
+BB-BBGW-WL1835-00A0.dtbo \
+BB-BONE-4D5R-01-00A1.dtbo \
+BB-BONE-eMMC1-01-00A0.dtbo \
+BB-BONE-LCD4-01-00A1.dtbo \
+BB-BONE-NH7C-01-A0.dtbo \
+BB-CAPE-DISP-CT4-00A0.dtbo \
+BB-HDMI-TDA998x-00A0.dtbo \
+BB-I2C1-MCP7940X-00A0.dtbo \
+BB-I2C1-RTC-DS3231.dtbo \
+BB-I2C1-RTC-PCF8563.dtbo \
+BB-I2C2-BME680.dtbo \
+BB-I2C2-MPU6050.dtbo \
+BB-LCD-ADAFRUIT-24-SPI1-00A0.dtbo \
+BB-NHDMI-TDA998x-00A0.dtbo \
+BBORG_COMMS-00A2.dtbo \
+BBORG_FAN-A000.dtbo \
+BBORG_RELAY-00A2.dtbo \
+BB-SPIDEV0-00A0.dtbo \
+BB-SPIDEV1-00A0.dtbo \
+BB-UART1-00A0.dtbo \
+BB-UART2-00A0.dtbo \
+BB-UART4-00A0.dtbo \
+BB-W1-P9.12-00A0.dtbo \
+BONE-ADC.dtbo \
+M-BB-BBG-00A0.dtbo \
+M-BB-BBGG-00A0.dtbo \
+PB-MIKROBUS-0.dtbo \
+PB-MIKROBUS-1.dtbo \
 "

 MACHINE_GUI_CLASS = "bigscreen"
--- a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
@@ -12,3 +12,8 @@ SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "gp"

 UBOOT_MACHINE = "am62x_evm_r5_defconfig"
+
+# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build
+# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc
+# under meta-ti-bsp/recipes-bsp/u-boot/ for more details.
+UBOOT_CONFIG_FRAGMENTS = "am625_beagleplay_r5.config"
--- a/meta-ti-bsp/conf/machine/beagleplay.conf
+++ b/meta-ti-bsp/conf/machine/beagleplay.conf
@@ -19,6 +19,11 @@ OPTEEMACHINE = "k3-am62x"

 UBOOT_MACHINE = "am62x_evm_a53_defconfig"

+# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build
+# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc
+# under meta-ti-bsp/recipes-bsp/u-boot/ for more details.
+UBOOT_CONFIG_FRAGMENTS = "am625_beagleplay_a53.config"
+
 PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
 PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
@@ -27,17 +32,24 @@ KERNEL_DEVICETREE = " \
 ti/k3-am625-beagleplay.dtb \
 ti/k3-am625-beagleplay-csi2-ov5640.dtbo \
 ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \
+ti/k3-am625-beagleplay-lincolntech-lcd185-panel.dtbo \
 ti/k3-am625-sk.dtb \
-ti/k3-am625-sk-csi2-ov5640.dtbo \
-ti/k3-am625-sk-csi2-tevi-ov5640.dtbo \
 ti/k3-am625-sk-dmtimer-pwm.dtbo \
 ti/k3-am625-sk-ecap-capture.dtbo \
-ti/k3-am625-sk-hdmi-audio.dtbo \
-ti/k3-am625-sk-mcan.dtbo \
+ti/k3-am625-sk-lincolntech-lcd185-panel.dtbo \
 ti/k3-am625-sk-mcspi-loopback.dtbo \
-ti/k3-am625-sk-mcu-gpio-wakeup.dtbo \
 ti/k3-am625-sk-microtips-mf101hie-panel.dtbo \
-ti/k3-am625-sk-rpi-hdr-pwm.dtbo \
+ti/k3-am625-sk-microtips-mf103hie-lcd2.dtbo \
+ti/k3-am625-sk-pwm.dtbo \
+ti/k3-am625-sk-rpi-hdr-ehrpwm.dtbo \
+ti/k3-am62x-sk-csi2-imx219.dtbo \
+ti/k3-am62x-sk-csi2-ov5640.dtbo \
+ti/k3-am62x-sk-csi2-tevi-ov5640.dtbo \
+ti/k3-am62x-sk-csi2-v3link-fusion.dtbo \
+ti/k3-am62x-sk-eqep.dtbo \
+ti/k3-am62x-sk-hdmi-audio.dtbo \
+ti/k3-am62x-sk-lpm-wkup-sources.dtbo \
+ti/k3-am62x-sk-mcan.dtbo \
 "

 MACHINE_GUI_CLASS = "bigscreen"
--- a/meta-ti-bsp/conf/machine/include/am62pxx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62pxx.inc
@@ -17,3 +17,6 @@ OPTEEMACHINE = "k3-am62x"
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cnm-wave-fw"

 SERIAL_CONSOLES = "115200;ttyS2"
+
+# Bitmap image tarball for early splashscreen
+IMAGE_BOOT_FILES += "ti_logo_414x97_32bpp.bmp.gz"
--- a/meta-ti-bsp/conf/machine/include/j722s.inc
+++ b/meta-ti-bsp/conf/machine/include/j722s.inc
@@ -0,0 +1,19 @@
+require conf/machine/include/k3.inc
+SOC_FAMILY:append = ":j722s"
+
+MACHINE_FEATURES += "screen gpu"
+
+require conf/machine/include/mesa-pvr.inc
+PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
+
+# Default tiboot3.bin on J722S is for HS-FS
+IMAGE_BOOT_FILES += "tiboot3-j722s-hs-fs-evm.bin"
+
+TFA_BOARD = "lite"
+TFA_K3_SYSTEM_SUSPEND = "1"
+
+OPTEEMACHINE = "k3-am62x"
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cnm-wave-fw"
+
+SERIAL_CONSOLES = "115200;ttyS2"
--- a/meta-ti-bsp/conf/machine/j722s-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/j722s-evm-k3r5.conf
@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: J722S EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI J722S EVM (R5F core)
+
+require conf/machine/include/k3r5.inc
+
+SYSFW_SOC = "j722s"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+
+UBOOT_MACHINE = "j722s_evm_r5_defconfig"
--- a/meta-ti-bsp/conf/machine/j722s-evm.conf
+++ b/meta-ti-bsp/conf/machine/j722s-evm.conf
@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: J722S EVM
+#@DESCRIPTION: Machine configuration for the TI J722S EVM
+
+require conf/machine/include/j722s.inc
+
+KERNEL_DEVICETREE_PREFIX = "ti/k3-j722s"
+
+KERNEL_DEVICETREE = ""
+
+UBOOT_MACHINE = "j722s_evm_a53_defconfig"
--- a/meta-ti-bsp/conf/multiconfig/k3r5.conf
+++ b/meta-ti-bsp/conf/multiconfig/k3r5.conf
@@ -4,6 +4,7 @@ DEPLOY_DIR_IMAGE:k3r5 = "${TI_COMMON_DEPLOY}/images/${MAINMACHINE}"

 MACHINE:append = "-k3r5"
 TCLIBC = "baremetal"
-TMPDIR:append = "-k3r5"
+TI_TMPDIR_APPEND ?= "-k3r5"
+TMPDIR:append = "${TI_TMPDIR_APPEND}"

 SDKPKGSUFFIX = "k3r5-nativesdk"
--- a/meta-ti-bsp/recipes-bsp/cmem/cmem.inc
+++ b/meta-ti-bsp/recipes-bsp/cmem/cmem.inc
@@ -7,7 +7,7 @@ BRANCH = "master"
 # This corresponds to version 4.20.00.01
 SRCREV = "86269258a48e0a9008dd9d5ebfae9da7ce843393"

-PV = "4.20.00.01+git${SRCPV}"
+PV = "4.20.00.01+git"

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

--- a/meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.cnm;md5=93b67e6bac7f8fec22b96b8ad0a1a9d0"
 PV = "${CNM_WAVE521_FW_VERSION}"
 PR = "${INC_PR}.1"

-COMPATIBLE_MACHINE = "j721s2|j784s4|am62axx|am62pxx"
+COMPATIBLE_MACHINE = "j721s2|j784s4|j722s|am62axx|am62pxx"

 PACKAGE_ARCH = "${MACHINE_ARCH}"

--- a/meta-ti-bsp/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb
@@ -3,7 +3,7 @@ SUMMARY = "R5 PSDK CPSW9G Ethernet Switch Firmware"
 LICENSE = "TI-TFL"
 LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=04ad0a015d4bb63c2b9e7b112debf3db"

-PV = "6.2+git${SRCPV}"
+PV = "6.2+git"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

 inherit update-alternatives
--- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-build-kbuild-Makefile.template-use-SECONDARY.patch
+++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-build-kbuild-Makefile.template-use-SECONDARY.patch
@@ -1,35 +0,0 @@
-From 738dfc1b33a83e9995ed7f65ec41ebe2fc6a90ed Mon Sep 17 00:00:00 2001
-From: Ryan Eatmon <reatmon@ti.com>
-Date: Wed, 1 Nov 2023 10:04:29 -0500
-Subject: [PATCH] build: kbuild: Makefile.template: use SECONDARY
-
-For some reason on master we are seeing an error:
-
-| make[5]: *** .NOTINTERMEDIATE and .SECONDARY are mutually exclusive.  Stop.
-
-Flip this back to .SECONDARY to fix this build issue.
-
-Signed-off-by: Ryan Eatmon <reatmon@ti.com>
-
-Upstream-Status: Pending
-
---
- build/linux/kbuild/Makefile.template | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/build/linux/kbuild/Makefile.template b/build/linux/kbuild/Makefile.template
-index aa19d66..31e37fb 100644
--- a/build/linux/kbuild/Makefile.template
-+++ b/build/linux/kbuild/Makefile.template
-@@ -54,7 +54,7 @@
- 
- include $(OUT)/config_kernel.mk
- 
-.NOTINTERMEDIATE:
-+.SECONDARY:
- 
- define symlink-source-file
- @if [ ! -e $(dir $@) ]; then mkdir -p $(dir $@); fi
-- 
-2.17.1
-
--- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb
+++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb
@@ -12,25 +12,24 @@ PR = "${MACHINE_KERNEL_PR}"

 PACKAGE_ARCH = "${MACHINE_ARCH}"

-COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx|am62pxx"
+COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx|am62pxx|j722s"

 DEPENDS = "virtual/kernel"

-BRANCH = "linuxws/kirkstone/k6.1/${PV}"
+BRANCH = "linuxws/scarthgap/k6.6/${PV}"

 SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-driver.git;protocol=https;branch=${BRANCH}"

-SRC_URI:append = " file://0001-build-kbuild-Makefile.template-use-SECONDARY.patch"
-
 S = "${WORKDIR}/git"

-SRCREV = "778aa5d1e104f36c7f7c1f50e99f8499cbbdadbb"
+SRCREV = "2f409b4dd2540e896b54bff02219d4fc51129b81"

 TARGET_PRODUCT:j721e = "j721e_linux"
 TARGET_PRODUCT:j721s2 = "j721s2_linux"
 TARGET_PRODUCT:j784s4 = "j784s4_linux"
 TARGET_PRODUCT:am62xx = "am62_linux"
 TARGET_PRODUCT:am62pxx = "am62p_linux"
+TARGET_PRODUCT:j722s = "j722s_linux"
 PVR_BUILD = "release"
 PVR_WS = "lws-generic"

--- a/meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb
@@ -25,6 +25,7 @@ PLAT_SFX:j721e = "j721e"
 PLAT_SFX:j7200 = "j7200"
 PLAT_SFX:j721s2 = "j721s2"
 PLAT_SFX:j784s4 = "j784s4"
+PLAT_SFX:j722s = "j722s"
 PLAT_SFX:am65xx = "am65xx"
 PLAT_SFX:am64xx = "am64xx"
 PLAT_SFX:am62xx = "am62xx"
@@ -42,6 +43,7 @@ DM_FW_LIST:j721e =   "${DM_FIRMWARE}"
 DM_FW_LIST:j7200 =   "${DM_FIRMWARE}"
 DM_FW_LIST:j721s2 =  "${DM_FIRMWARE}"
 DM_FW_LIST:j784s4 =  "${DM_FIRMWARE}"
+DM_FW_LIST:j722s =   "${DM_FIRMWARE}"
 DM_FW_LIST:am65xx =  ""
 DM_FW_LIST:am64xx =  ""
 DM_FW_LIST:am62xx =  "${DM_FIRMWARE}"
@@ -83,6 +85,7 @@ ALTERNATIVE:${PN}:j721e   = "j7-mcu-r5f0_0-fw"
 ALTERNATIVE:${PN}:j7200   = "j7200-mcu-r5f0_0-fw"
 ALTERNATIVE:${PN}:j721s2  = "j721s2-mcu-r5f0_0-fw"
 ALTERNATIVE:${PN}:j784s4  = "j784s4-mcu-r5f0_0-fw"
+ALTERNATIVE:${PN}:j722s   = "j722s-wkup-r5f0_0-fw"

 # Set up link names for the firmwares
 ALTERNATIVE_LINK_NAME[am62-main-r5f0_0-fw]  = "${nonarch_base_libdir}/firmware/am62-main-r5f0_0-fw"
@@ -92,6 +95,7 @@ ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_0-fw]     = "${nonarch_base_libdir}/firmware/j
 ALTERNATIVE_LINK_NAME[j7200-mcu-r5f0_0-fw]  = "${nonarch_base_libdir}/firmware/j7200-mcu-r5f0_0-fw"
 ALTERNATIVE_LINK_NAME[j721s2-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j721s2-mcu-r5f0_0-fw"
 ALTERNATIVE_LINK_NAME[j784s4-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j784s4-mcu-r5f0_0-fw"
+ALTERNATIVE_LINK_NAME[j722s-wkup-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j722s-wkup-r5f0_0-fw"

 # Create the firmware alternatives
 ALTERNATIVE_TARGET[am62-main-r5f0_0-fw]  = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}"
@@ -101,6 +105,7 @@ ALTERNATIVE_TARGET[j7-mcu-r5f0_0-fw]     = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}"
 ALTERNATIVE_TARGET[j7200-mcu-r5f0_0-fw]  = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}"
 ALTERNATIVE_TARGET[j721s2-mcu-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}"
 ALTERNATIVE_TARGET[j784s4-mcu-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}"
+ALTERNATIVE_TARGET[j722s-wkup-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}"

 ALTERNATIVE_PRIORITY = "10"

--- a/meta-ti-bsp/recipes-bsp/ti-eth-fw/ti-eth-fw.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-eth-fw/ti-eth-fw.bb
@@ -24,6 +24,7 @@ PLAT_SFX:j721e = "j721e"
 PLAT_SFX:j7200 = "j7200"
 PLAT_SFX:j721s2 = "j721s2"
 PLAT_SFX:j784s4 = "j784s4"
+PLAT_SFX:j722s = "j722s"
 PLAT_SFX:am65xx = "am65xx"
 PLAT_SFX:am64xx = "am64xx"
 PLAT_SFX:am62xx = "am62xx"
@@ -41,10 +42,11 @@ ETH_FW_LIST:j721e =   "${ETH_FW}"
 ETH_FW_LIST:j7200 =   "${ETH_FW}"
 ETH_FW_LIST:j721s2 =  ""
 ETH_FW_LIST:j784s4 =  "${ETH_FW}"
+ETH_FW_LIST:j722s =   ""
 ETH_FW_LIST:am65xx =  ""
 ETH_FW_LIST:am64xx =  ""
 ETH_FW_LIST:am62xx =  ""
-ETH_FW_LIST:am62pxx =  ""
+ETH_FW_LIST:am62pxx = ""
 ETH_FW_LIST:am62axx = ""

 do_install() {
--- a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
+++ b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
@@ -9,15 +9,15 @@ INC_PR = "r4"
 # Firmware versions
 CORESDK_RTOS_VERSION = "08.02.00.04"
 PRUETH_FW_AM65X_VERSION = "08.00.00.20"
-PRUETH_FW_AM65X_SR2_VERSION = "02.02.12.05"
+PRUETH_FW_AM65X_SR2_VERSION = "02.02.12.08"
 GOODIX_FW_VERSION = "1.0.0.0"
 CADENCE_MHDP_FW_VERSION = "2.1.0"
 IMG_DEC_FW_VERSION = "1.0"
 CNM_WAVE521_FW_VERSION = "1.0.3"
-TI_DM_FW_VERSION = "09.01.02"
-TI_SYSFW_VERSION = "09.01.06"
+TI_DM_FW_VERSION = "09.02.04"
+TI_SYSFW_VERSION = "09.02.05"

-TI_LINUX_FW_SRCREV ?= "a2d8865df39e9021001fcf06e5daaeab81ba608c"
+TI_LINUX_FW_SRCREV ?= "1ab38f4882f0b257377dbd22bbf544b046d7faac"
 SRCREV = "${TI_LINUX_FW_SRCREV}"

 BRANCH ?= "ti-linux-firmware"
--- a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
+++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
@@ -1,5 +1,5 @@
-PV:k3 = "2.9+git${SRCPV}"
-SRCREV_tfa:k3 = "d7a7135d32a8c7da004c0c19b75bd4e2813f9759"
+PV:k3 = "2.10+git"
+SRCREV_tfa:k3 = "00f1ec6b8740ccd403e641131e294aabacf2a48b"
 SRC_URI:k3 = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master"
 COMPATIBLE_MACHINE:k3 = "k3"
 TFA_BUILD_TARGET:k3 = "all"
--- a/meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc
+++ b/meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc
@@ -1,7 +1,7 @@

 # This will have priority over generic uboot path

-COMPATIBLE_MACHINE = "am62xx"
+COMPATIBLE_MACHINE = "am62xx|am62pxx"

 BRANCH = "ti-u-boot-2023.04"
 BRANCH:tie-jailhouse = "ti-u-boot-2023.04-jailhouse"
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb
@@ -8,10 +8,10 @@ PV = "2023.04"

 UBOOT_GIT_URI = "git://github.com/beagleboard/u-boot.git"
 UBOOT_GIT_PROTOCOL = "https"
-BRANCH = "v2023.04-ti-09.00.00.011"
-SRCREV = "4b8f8be8870f03d92a2b01d0d30ab912118adc82"
+BRANCH = "v2023.04-ti-09.01.00.008"
+SRCREV = "b0d717b732ee28e446baf94522b3491e590f7fbb"

-BRANCH:beagleplay = "v2023.04-ti-09.00.00.011-BeaglePlay"
-BRANCH:beagleplay-k3r5 = "v2023.04-ti-09.00.00.011-BeaglePlay"
-SRCREV:beagleplay = "10afea462ea1113701f6f0f8853fdff985aa275d"
-SRCREV:beagleplay-k3r5 = "10afea462ea1113701f6f0f8853fdff985aa275d"
+BRANCH:beagleplay = "v2023.04-ti-09.01.00.008-BeaglePlay"
+BRANCH:beagleplay-k3r5 = "v2023.04-ti-09.01.00.008-BeaglePlay"
+SRCREV:beagleplay = "43791d945f4e5c25bcc19b9c778e8f9d194dc16e"
+SRCREV:beagleplay-k3r5 = "43791d945f4e5c25bcc19b9c778e8f9d194dc16e"
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-mainline_git.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-mainline_git.bb
@@ -2,7 +2,7 @@ require u-boot-ti.inc

 PR = "r0"

-PV = "2023.10"
+PV = "2024.01"

 # For the un-initiated:
 # The actual URL you'd use with a git clone for example would be:
@@ -13,4 +13,4 @@ PV = "2023.10"
 # b) and we want git fetcher to use https protocol, hence GIT_PROTOCOL as https
 UBOOT_GIT_URI = "git://source.denx.de/u-boot/u-boot.git"
 UBOOT_GIT_PROTOCOL = "https"
-SRCREV = "4459ed60cb1e0562bc5b40405e2b4b9bbf766d57"
+SRCREV = "866ca972d6c3cabeaf6dbac431e8e08bb30b3c8e"
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb
@@ -6,14 +6,4 @@ PR = "r0"

 BRANCH = "ti-u-boot-2023.04"

-SRCREV = "8c121e6e3c7fd7be6e727ddd41880c202fb6e223"
-
-do_install:append:am62xx() {
-	install -d ${D}/boot
-	install -m 0644 ${S}/tools/logos/ti_logo_414x97_32bpp.bmp.gz ${D}/boot
-}
-
-do_deploy:append:am62xx() {
-	install -d ${DEPLOYDIR}
-	install -m 0644 ${S}/tools/logos/ti_logo_414x97_32bpp.bmp.gz ${DEPLOYDIR}
-}
+SRCREV = "dbb6e4280dfa53faaa1c04f5ddd22f9f068d0428"
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.04.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.04.bb
@@ -0,0 +1,11 @@
+require u-boot-ti.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+include ${@ 'recipes-bsp/u-boot/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''}
+
+PR = "r0"
+
+BRANCH = "ti-u-boot-2024.04"
+
+SRCREV = "f3c979dd0053c082d2df170446923e7ce5edbc2d"
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
@@ -1,6 +1,9 @@
-# UBOOT_LOCALVERSION can be set to add a tag to the end of the
-# U-boot version string.  such as the commit id
-UBOOT_LOCALVERSION = "-g${@d.getVar('SRCPV', True).replace('AUTOINC+','')[:10]}"
+do_compile:prepend () {
+    scm_version=$(printf '%s%s' -ti-g $(git -C ${S} rev-parse --verify HEAD 2>/dev/null | cut -c1-12))
+
+    echo ${scm_version} > ${B}/.scmversion
+    echo ${scm_version} > ${S}/.scmversion
+}

 UBOOT_SUFFIX ?= "img"
 SPL_BINARY ?= "MLO"
@@ -21,13 +24,13 @@ UBOOT_GIT_URI ?= "git://git.ti.com/git/ti-u-boot/ti-u-boot.git"
 UBOOT_GIT_PROTOCOL = "https"
 SRC_URI = "${UBOOT_GIT_URI};protocol=${UBOOT_GIT_PROTOCOL};branch=${BRANCH}"

-PV:append = "+git${SRCPV}"
+PV:append = "+git"

 # u-boot needs devtree compiler to parse dts files
 DEPENDS += "dtc-native bc-native flex-native bison-native python3-setuptools-native"

 # u-boot needs these for binman
-DEPENDS += "python3-pyelftools-native python3-pyyaml-native python3-jsonschema-native"
+DEPENDS += "python3-pyelftools-native python3-pyyaml-native python3-jsonschema-native python3-yamllint-native"

 # SYSFW/TIFS Firmware
 DEPENDS:append:k3 = " ti-sci-fw"
@@ -40,6 +43,7 @@ PLAT_SFX:j721e = "j721e"
 PLAT_SFX:j7200 = "j7200"
 PLAT_SFX:j721s2 = "j721s2"
 PLAT_SFX:j784s4 = "j784s4"
+PLAT_SFX:j722s = "j722s"
 PLAT_SFX:am65xx = "am65xx"
 PLAT_SFX:am64xx = "am64xx"
 PLAT_SFX:am62xx = "am62xx"
@@ -55,6 +59,7 @@ PACKAGECONFIG:append:j721e = " dm"
 PACKAGECONFIG:append:j7200 = " dm"
 PACKAGECONFIG:append:j721s2 = " dm"
 PACKAGECONFIG:append:j784s4 = " dm"
+PACKAGECONFIG:append:j722s = " dm"
 PACKAGECONFIG:append:am62xx = " dm"
 PACKAGECONFIG:append:am62axx = " dm"
 PACKAGECONFIG:append:am62pxx = " dm"
@@ -329,4 +334,24 @@ do_deploy:append () {
 	rm ${DEPLOYDIR}/${PN}-initial-env-${MACHINE}-${PV}-${PR} || true
 }

+do_install:append:am62xx() {
+	install -d ${D}/boot
+	install -m 0644 ${S}/tools/logos/ti_logo_414x97_32bpp.bmp.gz ${D}/boot
+}
+
+do_deploy:append:am62xx() {
+	install -d ${DEPLOYDIR}
+	install -m 0644 ${S}/tools/logos/ti_logo_414x97_32bpp.bmp.gz ${DEPLOYDIR}
+}
+
+do_install:append:am62pxx() {
+	install -d ${D}/boot
+	install -m 0644 ${S}/tools/logos/ti_logo_414x97_32bpp.bmp.gz ${D}/boot
+}
+
+do_deploy:append:am62pxx() {
+	install -d ${DEPLOYDIR}
+	install -m 0644 ${S}/tools/logos/ti_logo_414x97_32bpp.bmp.gz ${DEPLOYDIR}
+}
+
 TOOLCHAIN = "gcc"
--- a/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb
+++ b/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb
@@ -5,12 +5,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a56bddef00b39fb0f45488fdc4ce108f"

 inherit cmake

-PV = "0.3+git${SRCPV}"
+PV = "0.3+git"

 COMPATIBLE_MACHINE = "k3"

 BRANCH ?= "master"
-SRCREV = "de06befe878be061a40540d2127d4273320b35bc"
+SRCREV = "85a7433202aafafbccea8a7b2491f4df8b1ecd80"

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

--- a/meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend
+++ b/meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend
@@ -1 +0,0 @@
-require ${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-driver ti-sgx-ddk-km', 'pvr-cairo.inc', '', d)}
--- a/meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc
+++ b/meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc
@@ -1,5 +0,0 @@
-# This is required since cairo expects the opengl distro feature to refer to
-# the desktop version of OpenGL. Imagination drivers only provide OpenGLES.
-
-PACKAGECONFIG:remove = "opengl"
-PACKAGECONFIG:append = " glesv2"
--- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb
+++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb
@@ -23,13 +23,13 @@ SRC_URI = " \

 S = "${WORKDIR}/git"

-SRCREV = "7c9522a4147836064f582278e4f7115735c16868"
-
 PACKAGECONFIG:append = " \
    ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-driver', 'pvr', '', d)} \
    ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-sgx-ddk-km', 'sgx', '', d)} \
 "

+SRCREV = "1be98ba80452ebe38546a7fca26b5a70f2629083"
+
 PVR_DISPLAY_CONTROLLER_ALIAS ??= "tidss"
 PACKAGECONFIG[pvr] = "-Dgallium-pvr-alias=${PVR_DISPLAY_CONTROLLER_ALIAS},"
 PACKAGECONFIG[sgx] = "-Dgallium-sgx-alias=${PVR_DISPLAY_CONTROLLER_ALIAS},"
--- a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb
+++ b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb
@@ -8,13 +8,13 @@ inherit bin_package
 INHIBIT_DEFAULT_DEPS = ""

 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx|am62pxx"
+COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx|am62pxx|j722s"

-PR = "r2"
+PR = "r3"

-BRANCH = "linuxws/kirkstone/k6.1/${PV}"
+BRANCH = "linuxws/scarthgap/k6.6/${PV}"
 SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-umlibs.git;protocol=https;branch=${BRANCH}"
-SRCREV = "d0543929cc6fe53959a64c60285896e2c14ed314"
+SRCREV = "0b9e64254269be2fa95c4f3e1dd925d6e4d58199"
 S = "${WORKDIR}/git/targetfs/${TARGET_PRODUCT}/${PVR_WS}/${PVR_BUILD}"

 TARGET_PRODUCT:j721e = "j721e_linux"
@@ -22,6 +22,7 @@ TARGET_PRODUCT:j721s2 = "j721s2_linux"
 TARGET_PRODUCT:j784s4 = "j784s4_linux"
 TARGET_PRODUCT:am62xx = "am62_linux"
 TARGET_PRODUCT:am62pxx = "am62p_linux"
+TARGET_PRODUCT:j722s = "j722s_linux"
 PVR_BUILD = "release"
 PVR_WS = "lws-generic"

@@ -32,7 +33,7 @@ RDEPENDS:${PN} = " \
 "

 PACKAGECONFIG ?= " \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'vulkan x11 wayland', 'vulkan', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'vulkan wayland', 'vulkan', '', d)} \
    ${@bb.utils.filter('DISTRO_FEATURES', 'opengl opencl', d)} \
 "

@@ -88,7 +89,6 @@ PACKAGES = " \
    ${@bb.utils.contains('PACKAGECONFIG', 'opencl', d.getVar('OPENCL_PACKAGES'), '', d)} \
    ${PN}-tools \
    ${PN}-firmware \
-    ${PN}-dev \
    ${PN} \
 "

@@ -121,7 +121,7 @@ RDEPENDS:libgles2-rogue += "mesa-megadriver"

 # vulkan specific shared objects and configs
 FILES:libvk-rogue = "${libdir}/libVK_IMG.so* ${datadir}/vulkan"
-RDEPENDS:libvk-rogue += "vulkan-loader libx11-xcb wayland libdrm"
+RDEPENDS:libvk-rogue += "vulkan-loader wayland libdrm"

 # opencl specific shared objects and configs
 FILES:libopencl-rogue = "${libdir}/libPVROCL.so* ${sysconfdir}/OpenCL"
--- a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb
@@ -19,21 +19,17 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}"

 S = "${WORKDIR}/git"

-# 6.1.33 version for 32-bit
-SRCREV:armv7a = "feb1c153a9693d44dec5772d134bd2c7986ff95d"
-PV:armv7a = "6.1.33+git${SRCPV}"
-BRANCH:armv7a = "v6.1.33-ti-r7"
+# 6.1.69 version for 32-bit
+SRCREV:armv7a = "a1f26a19581970f76220c68c438981796ce5b767"
+PV:armv7a = "6.1.69+git"
+BRANCH:armv7a = "v6.1.69-ti-r22"

-# 6.1.46 version for 64-bit
-SRCREV:aarch64 = "0a1e93a38c699fdd3c629d57f5cd015f90ab0d36"
-PV:aarch64 = "6.1.46+git${SRCPV}"
-BRANCH:aarch64 = "v6.1.46-ti-arm64-r9"
+# 6.1.69 version for 64-bit
+SRCREV:aarch64 = "bc76b5d278271f66a6faeb2d09cb09fc6c57dd3c"
+PV:aarch64 = "6.1.69+git"
+BRANCH:aarch64 = "v6.1.69-ti-arm64-r24"

-SRC_URI = "git://github.com/beagleboard/linux.git;protocol=https;branch=${BRANCH} \
-           file://defconfig \
-"
-
-FILES:${KERNEL_PACKAGE_NAME}-devicetree += " \
-    /${KERNEL_DTBDEST}/*/overlays/*.dtb \
-    /${KERNEL_DTBDEST}/*/overlays/*.dtbo \
+SRC_URI = " \
+    git://github.com/beagleboard/linux.git;protocol=https;branch=${BRANCH} \
+    file://defconfig \
 "
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb
@@ -16,7 +16,7 @@ S = "${WORKDIR}/git"

 # 6.6 Mainline version
 SRCREV = "ffc253263a1375a65fa6c9f62a893e9767fbebfa"
-PV = "6.6+git${SRCPV}"
+PV = "6.6+git"

 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
 MACHINE_KERNEL_PR:append = "b"
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb
@@ -16,7 +16,7 @@ S = "${WORKDIR}/git"

 # 6.6.0-rc3+ version
 SRCREV = "6465e260f48790807eef06b583b38ca9789b6072"
-PV = "6.6.0-rc3+git${SRCPV}"
+PV = "6.6.0-rc3+git"

 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git;protocol=https;branch=master"

--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=multi_v7_defconfig
+config-fragment=kernel/configs/ti_multi_v7_prune.config
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/k3/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/k3/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=defconfig
+config-fragment=kernel/configs/ti_arm64_prune.config
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/omapl138/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/omapl138/defconfig
@@ -0,0 +1 @@
+use-kernel-config=davinci_all_defconfig
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/ti33x/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/ti33x/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=multi_v7_defconfig
+config-fragment=kernel/configs/ti_multi_v7_prune.config kernel/configs/no_smp.config
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/ti43x/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/ti43x/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=multi_v7_defconfig
+config-fragment=kernel/configs/ti_multi_v7_prune.config kernel/configs/no_smp.config
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=multi_v7_defconfig
+config-fragment=kernel/configs/ti_multi_v7_prune.config kernel/configs/ti_rt.config
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/k3/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/k3/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=defconfig
+config-fragment=kernel/configs/ti_arm64_prune.config kernel/configs/ti_rt.config
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/omapl138/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/omapl138/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=davinci_all_defconfig
+config-fragment=kernel/configs/ti_rt.config
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/ti33x/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/ti33x/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=multi_v7_defconfig
+config-fragment=kernel/configs/ti_multi_v7_prune.config kernel/configs/ti_rt.config kernel/configs/no_smp.config
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/ti43x/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/ti43x/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=multi_v7_defconfig
+config-fragment=kernel/configs/ti_multi_v7_prune.config kernel/configs/ti_rt.config kernel/configs/no_smp.config
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb
@@ -1,13 +1,15 @@
 require linux-ti-staging_6.1.bb

+KERNEL_LOCALVERSION:append = "-rt"
+
 # Look in the generic major.minor directory for files
 # This will have priority over generic non-rt path
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:"

 BRANCH = "ti-rt-linux-6.1.y"

-SRCREV = "2f5db0e70b5e1ea128754128ff87560ff0c7ffbb"
+SRCREV = "31dc6b6f9309afec8555a584ff1ea5e3f18a30e9"

 include ${@ 'recipes-kernel/linux/ti-extras-rt.inc' if d.getVar('TI_EXTRAS') else ''}

-PV = "6.1.46+git${SRCPV}"
+PV = "6.1.80+git${SRCPV}"
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.6.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.6.bb
@@ -0,0 +1,17 @@
+require linux-ti-staging_6.6.bb
+
+DEFAULT_PREFERENCE = "-1"
+
+KERNEL_LOCALVERSION:append = "-rt"
+
+# Look in the generic major.minor directory for files
+# This will have priority over generic non-rt path
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.6:"
+
+BRANCH = "ti-rt-linux-6.6.y"
+
+SRCREV = "280ec6b126cf337d787b398b5717f55599ecb91f"
+
+include ${@ 'recipes-kernel/linux/ti-extras-rt.inc' if d.getVar('TI_EXTRAS') else ''}
+
+PV = "6.6.20+git${SRCPV}"
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=multi_v7_defconfig
+config-fragment=kernel/configs/ti_multi_v7_prune.config
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/k3/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/k3/defconfig
@@ -0,0 +1,2 @@
+use-kernel-config=defconfig
+config-fragment=kernel/configs/ti_arm64_prune.config
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/omapl138/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/omapl138/defconfig
@@ -0,0 +1 @@
+use-kernel-config=davinci_all_defconfig
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.6.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.6.bb
@@ -0,0 +1,7 @@
+require linux-ti-staging_6.6.bb
+
+DEFAULT_PREFERENCE = "-1"
+
+# Look in the generic major.minor directory for files
+# This will have priority over generic non-rt path
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.6:"
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb
@@ -23,8 +23,8 @@ S = "${WORKDIR}/git"

 BRANCH ?= "ti-linux-6.1.y"

-SRCREV ?= "3db9a45004a01caba21d64b397814abadcc841b0"
-PV = "6.1.46+git${SRCPV}"
+SRCREV ?= "a6174d6c4ff531039c677079321888a9a3f9951c"
+PV = "6.1.80+git${SRCPV}"

 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
 MACHINE_KERNEL_PR:append = "b"
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb
@@ -0,0 +1,44 @@
+SECTION = "kernel"
+SUMMARY = "Linux kernel for TI devices"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
+
+inherit ti-secdev
+inherit kernel
+
+DEFAULT_PREFERENCE = "-1"
+
+require recipes-kernel/linux/setup-defconfig.inc
+require recipes-kernel/linux/ti-kernel.inc
+include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''}
+include ${@ 'recipes-kernel/linux/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''}
+
+DEPENDS += "gmp-native libmpc-native"
+
+# Look in the generic major.minor directory for files
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.6:"
+
+KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \
+		      ${EXTRA_DTC_ARGS}"
+
+S = "${WORKDIR}/git"
+
+BRANCH ?= "ti-linux-6.6.y"
+
+SRCREV ?= "83b86d0fb4afa43229844c77df29890de5d7b8d1"
+PV = "6.6.20+git${SRCPV}"
+
+# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
+MACHINE_KERNEL_PR:append = "b"
+PR = "${MACHINE_KERNEL_PR}"
+
+KERNEL_GIT_URI ?= "git://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git"
+KERNEL_GIT_PROTOCOL = "https"
+SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \
+            file://defconfig"
+
+# Special configuration for remoteproc/rpmsg IPC modules
+module_conf_rpmsg_client_sample = "blacklist rpmsg_client_sample"
+module_conf_ti_k3_r5_remoteproc = "softdep ti_k3_r5_remoteproc pre: virtio_rpmsg_bus"
+module_conf_ti_k3_dsp_remoteproc = "softdep ti_k3_dsp_remoteproc pre: virtio_rpmsg_bus"
+KERNEL_MODULE_PROBECONF += "rpmsg_client_sample ti_k3_r5_remoteproc ti_k3_dsp_remoteproc"
--- a/meta-ti-bsp/recipes-kernel/linux/setup-defconfig.inc
+++ b/meta-ti-bsp/recipes-kernel/linux/setup-defconfig.inc
@@ -1,6 +1,4 @@
-# KERNEL_LOCALVERSION can be set to add a tag to the end of the
-# kernel version string.  such as the commit id
-KERNEL_LOCALVERSION = "-g${@d.getVar('SRCPV', True).replace('AUTOINC+','')[:10]}"
+KERNEL_LOCALVERSION = "-ti"

 # Check the defconfig file and see if it points to an in kernel
 # defconfig that should be used, or if it is a complete config file
@@ -13,8 +11,10 @@ do_configure() {
    # tree config
    cp ${WORKDIR}/defconfig ${B}/.config

-    echo ${KERNEL_LOCALVERSION} > ${B}/.scmversion
-    echo ${KERNEL_LOCALVERSION} > ${S}/.scmversion
+    scm_version=$(printf '%s%s' -g $(git -C ${S} rev-parse --verify HEAD 2>/dev/null | cut -c1-12))
+
+    echo ${scm_version} > ${B}/.scmversion
+    echo ${scm_version} > ${S}/.scmversion

    # Zero, when using "tisdk" configs, pass control to defconfig_builder
    config=`cat ${B}/.config | grep use-tisdk-config | cut -d= -f2`
--- a/meta-ti-bsp/recipes-kernel/linux/ti-extras-rt.inc
+++ b/meta-ti-bsp/recipes-kernel/linux/ti-extras-rt.inc
@@ -2,7 +2,7 @@
 # Use different commit, repo and branch for TI extras build
 # This will have priority over generic rt path

-COMPATIBLE_MACHINE = "am62xx"
+COMPATIBLE_MACHINE = "am62xx|am62pxx"

 BRANCH = "ti-rt-linux-6.1.y"
 BRANCH:tie-jailhouse = "ti-rt-linux-6.1.y-jailhouse"
--- a/meta-ti-bsp/recipes-kernel/linux/ti-extras.inc
+++ b/meta-ti-bsp/recipes-kernel/linux/ti-extras.inc
@@ -2,7 +2,7 @@
 # Use different commit, repo and branch for TI extras build
 # This will have priority over generic rt path

-COMPATIBLE_MACHINE = "am62xx"
+COMPATIBLE_MACHINE = "am62xx|am62pxx"

 BRANCH = "ti-linux-6.1.y"
 BRANCH:tie-jailhouse = "ti-linux-6.1.y-jailhouse"
--- a/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc
+++ b/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc
@@ -1,2 +1,2 @@
-PV = "4.0.0+git${SRCPV}"
-SRCREV = "acb0885c117e73cb6c5c9b1dd9054cb3f93507ee"
+PV = "4.1.0+git"
+SRCREV = "f7e4ced15d1fefd073bbfc484fe0e1f74afe96c2"
--- a/meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc
+++ b/meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc
@@ -1,2 +1,2 @@
-PV = "4.0.0+git${SRCPV}"
+PV = "4.0.0+git"
 SRCREV = "378dc0db2d5dd279f58a3b6cb3f78ffd6b165035"
--- a/meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc
+++ b/meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc
@@ -8,6 +8,7 @@ EXTRA_OEMAKE:append:k3 = "${@ ' CFG_CONSOLE_UART='+ d.getVar('OPTEE_K3_USART') i
 EXTRA_OEMAKE:append:am62xx = " CFG_TEE_CORE_LOG_LEVEL=1"
 EXTRA_OEMAKE:append:am62pxx = " CFG_WITH_SOFTWARE_PRNG=y CFG_TEE_CORE_LOG_LEVEL=1"
 EXTRA_OEMAKE:append:am62axx = " CFG_TEE_CORE_LOG_LEVEL=1"
+EXTRA_OEMAKE:append:j722s = " CFG_WITH_SOFTWARE_PRNG=y CFG_TEE_CORE_LOG_LEVEL=1"

 do_compile:append:k3() {
    cp ${B}/core/tee-pager_v2.bin ${B}/bl32.bin
--- a/meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc
+++ b/meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc
@@ -1,5 +1,5 @@
-PV = "4.0.0+git${SRCPV}"
-SRCREV = "2a5b1d1232f582056184367fb58a425ac7478ec6"
+PV = "4.1.0+git"
+SRCREV = "012cdca49db398693903e05c42a254a3a0c0d8f2"

 # Fixes for pointing to 4.0.0 before upstream meta-arm
 FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os-4.0.0:"
--- a/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc
+++ b/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc
@@ -1,5 +1,5 @@
-PV = "4.0.0+git${SRCPV}"
-SRCREV = "1c3d6be5eaa6174e3dbabf60928d15628e39b994"
+PV = "4.1.0+git"
+SRCREV = "2e1e7a9c9d659585566a75fc8802f4758c42bcb2"

 # Fixes for pointing to 4.0.0 before upstream meta-arm
 SRC_URI:remove = "file://0001-xtest-regression_1000-remove-unneeded-stat.h-include.patch"
--- a/meta-ti-bsp/recipes-ti/ipc/ti-rpmsg-char.inc
+++ b/meta-ti-bsp/recipes-ti/ipc/ti-rpmsg-char.inc
@@ -7,10 +7,10 @@ PROTOCOL = "https"
 BRANCH = "master"
 SRC_URI = "git://git.ti.com/git/rpmsg/ti-rpmsg-char.git;protocol=${PROTOCOL};branch=${BRANCH};"

-# 0.6.3 release
-SRCREV = "369ed24324c28c683d52637bb0cc7784b74c1385"
+# 0.6.6 release
+SRCREV = "55a6f4032246631a309f8608af5e822024664b59"

-PV = "0.6.3+git${SRCPV}"
+PV = "0.6.6+git"

 S = "${WORKDIR}/git"

--- a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
+++ b/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
@@ -16,6 +16,7 @@ PLAT_SFX:j721e = "j721e"
 PLAT_SFX:j7200 = "j7200"
 PLAT_SFX:j721s2 = "j721s2"
 PLAT_SFX:j784s4 = "j784s4"
+PLAT_SFX:j722s = "j722s"
 PLAT_SFX:am65xx = "am65xx"
 PLAT_SFX:am64xx = "am64xx"
 PLAT_SFX:am62xx = "am62xx"
@@ -54,12 +55,13 @@ IPC_FW_LIST = ""
 IPC_FW_LIST:am65xx =  "${MCU_1_0_FW} ${MCU_1_1_FW}"
 IPC_FW_LIST:am64xx =  "${MCU_1_0_FW} ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW} ${MCU_3_0_FW}"
 IPC_FW_LIST:am62xx =  "                            ${MCU_2_0_FW}"
-IPC_FW_LIST:am62pxx =  "                            ${MCU_2_0_FW}"
+IPC_FW_LIST:am62pxx = "                            ${MCU_2_0_FW}"
 IPC_FW_LIST:am62axx = "                            ${MCU_2_0_FW}                                                                                               ${C7X_1_FW}"
 IPC_FW_LIST:j721e =   "              ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW} ${MCU_3_0_FW} ${MCU_3_1_FW}                             ${C66_1_FW} ${C66_2_FW} ${C7X_1_FW}"
 IPC_FW_LIST:j7200 =   "              ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW}"
 IPC_FW_LIST:j721s2 =  "              ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW} ${MCU_3_0_FW} ${MCU_3_1_FW}                                                     ${C7X_1_FW} ${C7X_2_FW}"
 IPC_FW_LIST:j784s4 =  "              ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW} ${MCU_3_0_FW} ${MCU_3_1_FW} ${MCU_4_0_FW} ${MCU_4_1_FW}                         ${C7X_1_FW} ${C7X_2_FW} ${C7X_3_FW} ${C7X_4_FW}"
+IPC_FW_LIST:j722s =   "                            ${MCU_2_0_FW}               ${MCU_3_0_FW}                                                                   ${C7X_1_FW} ${C7X_2_FW}"

 # Update the am64xx ipc binaries to be consistent with other platforms
 do_install:prepend:am64xx() {
@@ -178,6 +180,13 @@ ALTERNATIVE:${PN}:j784s4 = "\
                    j784s4-c71_3-fw         j784s4-c71_3-fw-sec \
                    "

+ALTERNATIVE:${PN}:j722s = "\
+                    j722s-mcu-r5f0_0-fw   j722s-mcu-r5f0_0-fw-sec \
+                    j722s-main-r5f0_0-fw  j722s-main-r5f0_0-fw-sec \
+                    j722s-c71_0-fw        j722s-c71_0-fw-sec \
+                    j722s-c71_1-fw        j722s-c71_1-fw-sec \
+                    "
+
 # Set up link names for the firmwares

 ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_0-fw]     = "${nonarch_base_libdir}/firmware/am65x-mcu-r5f0_0-fw"
@@ -271,6 +280,15 @@ ALTERNATIVE_LINK_NAME[j784s4-c71_2-fw-sec] = "${nonarch_base_libdir}/firmware/j7
 ALTERNATIVE_LINK_NAME[j784s4-c71_3-fw]     = "${nonarch_base_libdir}/firmware/j784s4-c71_3-fw"
 ALTERNATIVE_LINK_NAME[j784s4-c71_3-fw-sec] = "${nonarch_base_libdir}/firmware/j784s4-c71_3-fw-sec"

+ALTERNATIVE_LINK_NAME[j722s-mcu-r5f0_0-fw]     = "${nonarch_base_libdir}/firmware/j722s-mcu-r5f0_0-fw"
+ALTERNATIVE_LINK_NAME[j722s-mcu-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/j722s-mcu-r5f0_0-fw-sec"
+ALTERNATIVE_LINK_NAME[j722s-main-r5f0_0-fw]     = "${nonarch_base_libdir}/firmware/j722s-main-r5f0_0-fw"
+ALTERNATIVE_LINK_NAME[j722s-main-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/j722s-main-r5f0_0-fw-sec"
+ALTERNATIVE_LINK_NAME[j722s-c71_0-fw]     = "${nonarch_base_libdir}/firmware/j722s-c71_0-fw"
+ALTERNATIVE_LINK_NAME[j722s-c71_0-fw-sec] = "${nonarch_base_libdir}/firmware/j722s-c71_0-fw-sec"
+ALTERNATIVE_LINK_NAME[j722s-c71_1-fw]     = "${nonarch_base_libdir}/firmware/j722s-c71_1-fw"
+ALTERNATIVE_LINK_NAME[j722s-c71_1-fw-sec] = "${nonarch_base_libdir}/firmware/j722s-c71_1-fw-sec"
+
 # Create the firmware alternatives

 ALTERNATIVE_TARGET[am65x-mcu-r5f0_0-fw]     = "${INSTALL_IPC_FW_DIR}/${MCU_1_0_FW}"
@@ -364,4 +382,13 @@ ALTERNATIVE_TARGET[j784s4-c71_2-fw-sec] = "${INSTALL_IPC_FW_DIR}/${C7X_3_FW}.sig
 ALTERNATIVE_TARGET[j784s4-c71_3-fw]     = "${INSTALL_IPC_FW_DIR}/${C7X_4_FW}"
 ALTERNATIVE_TARGET[j784s4-c71_3-fw-sec] = "${INSTALL_IPC_FW_DIR}/${C7X_4_FW}.signed"

+ALTERNATIVE_TARGET[j722s-mcu-r5f0_0-fw]     = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}"
+ALTERNATIVE_TARGET[j722s-mcu-r5f0_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}.signed"
+ALTERNATIVE_TARGET[j722s-main-r5f0_0-fw]     = "${INSTALL_IPC_FW_DIR}/${MCU_3_0_FW}"
+ALTERNATIVE_TARGET[j722s-main-r5f0_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_3_0_FW}.signed"
+ALTERNATIVE_TARGET[j722s-c71_0-fw]     = "${INSTALL_IPC_FW_DIR}/${C7X_1_FW}"
+ALTERNATIVE_TARGET[j722s-c71_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${C7X_1_FW}.signed"
+ALTERNATIVE_TARGET[j722s-c71_1-fw]     = "${INSTALL_IPC_FW_DIR}/${C7X_2_FW}"
+ALTERNATIVE_TARGET[j722s-c71_1-fw-sec] = "${INSTALL_IPC_FW_DIR}/${C7X_2_FW}.signed"
+
 ALTERNATIVE_PRIORITY = "10"
--- a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb
+++ b/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb
@@ -24,7 +24,7 @@ TI_RTOS_METADATA_DIR ?= "${PLAT_SFX}"
 TI_RTOS_METADATA_FILE ?= "${S}${TI_RTOS_METADATA_DIR}/metadata.inc"
 TI_RTOS_METADATA_FILE:am64xx ?= "${S}${TI_RTOS_METADATA_DIR}/mcusdk_metadata.inc"

-PV = "1.0.0+git${SRCPV}"
+PV = "1.0.0+git"

 S = "${WORKDIR}/git"

--- a/meta-ti-extras/conf/layer.conf
+++ b/meta-ti-extras/conf/layer.conf
@@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "meta-ti-extras"
 BBFILE_PATTERN_meta-ti-extras := "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-ti-extras = "6"

-LAYERSERIES_COMPAT_meta-ti-extras = "kirkstone langdale mickledore nanbield"
+LAYERSERIES_COMPAT_meta-ti-extras = "kirkstone langdale mickledore nanbield scarthgap"

 LICENSE_PATH += "${LAYERDIR}/licenses"

--- a/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv/0001-Support-Linux-kernels-v5.15.patch
+++ b/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv/0001-Support-Linux-kernels-v5.15.patch
@@ -8,7 +8,7 @@ put_tty_driver was removed and write_room return type has changed.
 Function tty_driver_kref_put has been around a while, so no need
 to do a kernel version check.

-Upstream-Status: Pending
+Upstream-Status: Inactive-Upstream
 Signed-off-by: Andrew Davis <afd@ti.com>
 ---
 kernel_module/gdbproxy-mod/gdbserverproxy.c | 6 +++++-
--- a/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv/0002-Support-Linux-kernels-v6.6.patch
+++ b/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv/0002-Support-Linux-kernels-v6.6.patch
@@ -0,0 +1,31 @@
+From: Ryan Eatmon <reatmon@ti.com>
+Date: Wed, 08 Feb 2024 10:43:00 -0500
+Subject: [PATCH] Support Linux kernels v6.6+
+
+gdb_write arg changed from int to unsigned int
+
+Upstream-Status: Inactive-Upstream
+
+Signed-off-by: Ryan Eatmon <reatmon@ti.com>
+---
+ kernel_module/gdbproxy-mod/gdbserverproxy.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/kernel_module/gdbproxy-mod/gdbserverproxy.c b/kernel_module/gdbproxy-mod/gdbserverproxy.c
+index 418b6db..4b1c676 100644
+--- a/kernel_module/gdbproxy-mod/gdbserverproxy.c
+++ b/kernel_module/gdbproxy-mod/gdbserverproxy.c
+@@ -496,8 +496,13 @@ static void gdb_close(struct tty_struct *tty, struct file *filp)
+  * 
+  *
+  */
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,6,0))
+static int gdb_write(struct tty_struct *tty,
+        const unsigned char *buf, unsigned int count)
+#else
+ static int gdb_write(struct tty_struct *tty,
+         const unsigned char *buf, int count)
+#endif
+ {
+      struct dsp_session *dsp = tty->driver_data;
+      int ret = 0;
--- a/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb
+++ b/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb
@@ -7,7 +7,10 @@ MACHINE_KERNEL_PR:append = "b"
 PR = "${MACHINE_KERNEL_PR}"
 PV:append = "+git${SRCPV}"

-SRC_URI:append = " file://0001-Support-Linux-kernels-v5.15.patch;patchdir=../.."
+SRC_URI:append = "\
+    file://0001-Support-Linux-kernels-v5.15.patch;patchdir=../.. \
+    file://0002-Support-Linux-kernels-v6.6.patch;patchdir=../.. \
+"

 S = "${WORKDIR}/git/kernel_module/gdbproxy-mod"

--- a/meta-ti-extras/recipes-ti/jailhouse/files/0001-configs-arm64-k3-am625-sk-Add-crypto-memory-region.patch
+++ b/meta-ti-extras/recipes-ti/jailhouse/files/0001-configs-arm64-k3-am625-sk-Add-crypto-memory-region.patch
@@ -1,52 +0,0 @@
-From 723ca87d25c1f8bac68d2608dbc3b5e8caba69ca Mon Sep 17 00:00:00 2001
-From: Andreas Dannenberg <dannenberg@ti.com>
-Date: Mon, 12 Sep 2022 13:22:04 -0500
-Subject: [PATCH] configs: arm64: k3-am625-sk: Add crypto memory region
-
-Add the memory region for the AM62x crypto accelerator to the device-
-specific config file. This fixes a runtime exception when the kernel
-accesses that memory region:
-
-<snip>
-Unhandled data read at 0x40910010(4)
-
-FATAL: unhandled trap (exception class 0x24)
-<snip>
-
-Upstream-Status: Submitted [jailhouse-dev@googlegroups.com]
-
-Signed-off-by: Andreas Dannenberg <dannenberg@ti.com>
-Signed-off-by: Paresh Bhagat <p-bhagat@ti.com>
---
- configs/arm64/k3-am625-sk.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/configs/arm64/k3-am625-sk.c b/configs/arm64/k3-am625-sk.c
-index 2e5c3aef..4b0b8043 100644
--- a/configs/arm64/k3-am625-sk.c
-+++ b/configs/arm64/k3-am625-sk.c
-@@ -18,7 +18,7 @@
- struct {
-	struct jailhouse_system header;
-	__u64 cpus[1];
-	struct jailhouse_memory mem_regions[31];
-+	struct jailhouse_memory mem_regions[32];
-	struct jailhouse_irqchip irqchips[5];
-	struct jailhouse_pci_device pci_devices[2];
- } __attribute__((packed)) config = {
-@@ -231,6 +231,13 @@ struct {
-			.flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
-				JAILHOUSE_MEM_IO,
-		},
-+		/* CRYPTO */ {
-+			.phys_start = 0x40900000,
-+			.virt_start = 0x40900000,
-+			.size = 0x0030000,
-+			.flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
-+				JAILHOUSE_MEM_IO,
-+		},
-		/* First Wake Up Domain */ {
-			.phys_start = 0x2b000000,
-			.virt_start = 0x2b000000,
--
-2.34.1
--- a/meta-ti-extras/recipes-ti/jailhouse/files/0001-configs-k3-use-intx-for-bar_mask.patch
+++ b/meta-ti-extras/recipes-ti/jailhouse/files/0001-configs-k3-use-intx-for-bar_mask.patch
@@ -1,72 +0,0 @@
-From 84ea5e9f65fc8082d520267258784cae32c8b499 Mon Sep 17 00:00:00 2001
-From: Ricardo Salveti <ricardo@foundries.io>
-Date: Wed, 1 Mar 2023 22:14:35 -0300
-Subject: [PATCH] configs/k3: use intx for bar_mask
-
-Fixes pci probe failure:
-
-[   46.795840] pci 0001:00:00.0: BAR 0: no space for [mem size 0x00010000]
-[   46.802516] pci 0001:00:00.0: BAR 0: failed to assign [mem size 0x00010000]
-[   46.809512] pci 0001:00:01.0: BAR 0: no space for [mem size 0x00010000]
-[   46.816158] pci 0001:00:01.0: BAR 0: failed to assign [mem size 0x00010000]
-
-Upstream-Status: Pending
-
-Signed-off-by: Ricardo Salveti <ricardo@foundries.io>
-
-This patch was imported from foundriesio/meta-lmp
-(https://github.com/foundriesio/meta-lmp) as of commit id
-70d419bfd54a99d3591e5a22622fc67f7de82b94.
-
-Signed-off-by: Paresh Bhagat <p-bhagat@ti.com>
---
- configs/arm64/k3-am625-sk-linux-demo.c | 4 ++--
- configs/arm64/k3-am625-sk.c            | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configs/arm64/k3-am625-sk-linux-demo.c b/configs/arm64/k3-am625-sk-linux-demo.c
-index 6dac8859..dcc5f026 100644
--- a/configs/arm64/k3-am625-sk-linux-demo.c
-+++ b/configs/arm64/k3-am625-sk-linux-demo.c
-@@ -197,7 +197,7 @@ struct {
-		/* 00:00.0 */ {
-			.type = JAILHOUSE_PCI_TYPE_IVSHMEM,
-			.bdf = 0 << 3,
-			.bar_mask = JAILHOUSE_IVSHMEM_BAR_MASK_INTX_64K,
-+			.bar_mask = JAILHOUSE_IVSHMEM_BAR_MASK_INTX,
-			.shmem_regions_start = 0,
-			.shmem_dev_id = 2,
-			.shmem_peers = 3,
-@@ -206,7 +206,7 @@ struct {
-		/* 00:01.0 */ {
-			.type = JAILHOUSE_PCI_TYPE_IVSHMEM,
-			.bdf = 1 << 3,
-			.bar_mask = JAILHOUSE_IVSHMEM_BAR_MASK_INTX_64K,
-+			.bar_mask = JAILHOUSE_IVSHMEM_BAR_MASK_INTX,
-			.shmem_regions_start = 5,
-			.shmem_dev_id = 1,
-			.shmem_peers = 2,
-diff --git a/configs/arm64/k3-am625-sk.c b/configs/arm64/k3-am625-sk.c
-index 69ab12a4..dcea42e0 100644
--- a/configs/arm64/k3-am625-sk.c
-+++ b/configs/arm64/k3-am625-sk.c
-@@ -325,7 +325,7 @@ struct {
-			.type = JAILHOUSE_PCI_TYPE_IVSHMEM,
-			.domain = 1,
-			.bdf = 0 << 3,
-			.bar_mask = JAILHOUSE_IVSHMEM_BAR_MASK_INTX_64K,
-+			.bar_mask = JAILHOUSE_IVSHMEM_BAR_MASK_INTX,
-			.shmem_regions_start = 0,
-			.shmem_dev_id = 0,
-			.shmem_peers = 3,
-@@ -335,7 +335,7 @@ struct {
-			.type = JAILHOUSE_PCI_TYPE_IVSHMEM,
-			.domain = 1,
-			.bdf = 1 << 3,
-			.bar_mask = JAILHOUSE_IVSHMEM_BAR_MASK_INTX_64K,
-+			.bar_mask = JAILHOUSE_IVSHMEM_BAR_MASK_INTX,
-			.shmem_regions_start = 5,
-			.shmem_dev_id = 0,
-			.shmem_peers = 2,
--
-2.34.1
--- a/meta-ti-extras/recipes-ti/jailhouse/files/0002-configs-arm64-k3-am625-sk-Switch-inmate-boot-console.patch
+++ b/meta-ti-extras/recipes-ti/jailhouse/files/0002-configs-arm64-k3-am625-sk-Switch-inmate-boot-console.patch
@@ -1,62 +0,0 @@
-From dbc02104bb469f68034b84f293583df413b8ca56 Mon Sep 17 00:00:00 2001
-From: Andreas Dannenberg <dannenberg@ti.com>
-Date: Mon, 12 Sep 2022 16:08:12 -0500
-Subject: [PATCH] configs: arm64: k3-am625-sk: Switch inmate boot console alias
- to serial3
-
-Traditionally the serial3 DTS alias is used for the 2nd main-domain UART
-on K3 devices so go ahead and update the alias and its usage accordingly
-for better consistency.
-
-While at it also do a minor cleanup of the UART's DTS node to use the
-TISCI standard definitions as used in the corresponding Kernel DTS files.
-
-Upstream-Status: Submitted [jailhouse-dev@googlegroups.com]
-
-Signed-off-by: Andreas Dannenberg <dannenberg@ti.com>
-Signed-off-by: Paresh Bhagat <p-bhagat@ti.com>
---
- configs/arm64/dts/inmate-k3-am625-sk.dts | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/configs/arm64/dts/inmate-k3-am625-sk.dts b/configs/arm64/dts/inmate-k3-am625-sk.dts
-index c1455073..8e1bebb8 100644
--- a/configs/arm64/dts/inmate-k3-am625-sk.dts
-+++ b/configs/arm64/dts/inmate-k3-am625-sk.dts
-@@ -1,6 +1,7 @@
- /dts-v1/;
-
- #include <dt-bindings/interrupt-controller/arm-gic.h>
-+#include <dt-bindings/soc/ti,sci_pm_domain.h>
-
- / {
-	model = "Texas Instruments AM625 Inmate Model";
-@@ -10,11 +11,11 @@
-	#size-cells = <2>;
-
-	aliases {
-		serial1 = &main_uart1;
-+		serial3 = &main_uart1;
-	};
-
-	chosen {
-		stdout-path = "serial1:115200n8";
-+		stdout-path = "serial3:115200n8";
-	};
-
-	memory@e0000000 {
-@@ -91,9 +92,9 @@
-			compatible = "ti,am64-uart", "ti,am654-uart";
-			reg = <0x00 0x02810000 0x00 0x100>;
-			interrupts = <GIC_SPI 179 IRQ_TYPE_LEVEL_HIGH>;
-			power-domains = <&k3_pds 152 1>;
-			current-speed = <115200>;
-			clock-frequency = <48000000>;
-+			power-domains = <&k3_pds 152 TI_SCI_PD_EXCLUSIVE>;
-+			clocks = <&k3_clks 152 0>;
-+			clock-names = "fclk";
-		};
-
-		pci@76000000 {
--
-2.34.1
--- a/meta-ti-extras/recipes-ti/jailhouse/files/0003-configs-arm64-k3-am625-sk-Add-VTM-memory-region.patch
+++ b/meta-ti-extras/recipes-ti/jailhouse/files/0003-configs-arm64-k3-am625-sk-Add-VTM-memory-region.patch
@@ -1,53 +0,0 @@
-From 9c9bba78b5635531fc8946914233af8c8ac8a6f3 Mon Sep 17 00:00:00 2001
-From: Andreas Dannenberg <dannenberg@ti.com>
-Date: Fri, 4 Nov 2022 12:58:48 -0500
-Subject: [PATCH] configs: arm64: k3-am625-sk: Add VTM memory region
-
-Add the memory region for VTM to the device-specific config
-file. This fixes a runtime exception when the kernel accesses
-that memory region:
-
-<snip>
-Unhandled data read at 0xb00308(4)
-
-FATAL: unhandled trap (exception class 0x24)
-<snip>
-
-Upstream-Status: Submitted [jailhouse-dev@googlegroups.com]
-
-written by: Ricardo Salveti <ricardo@foundries.io>
-Signed-off-by: Andreas Dannenberg <dannenberg@ti.com>
-Signed-off-by: Paresh Bhagat <p-bhagat@ti.com>
---
- configs/arm64/k3-am625-sk.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/configs/arm64/k3-am625-sk.c b/configs/arm64/k3-am625-sk.c
-index 4b0b8043..fac4eaa6 100644
--- a/configs/arm64/k3-am625-sk.c
-+++ b/configs/arm64/k3-am625-sk.c
-@@ -18,7 +18,7 @@
- struct {
-	struct jailhouse_system header;
-	__u64 cpus[1];
-	struct jailhouse_memory mem_regions[32];
-+	struct jailhouse_memory mem_regions[33];
-	struct jailhouse_irqchip irqchips[5];
-	struct jailhouse_pci_device pci_devices[2];
- } __attribute__((packed)) config = {
-@@ -154,6 +154,13 @@ struct {
-			.flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
-				JAILHOUSE_MEM_IO,
-		},
-+		/* Wake Up Domain VTM0 */ {
-+			.phys_start = 0x00b00000,
-+			.virt_start = 0x00b00000,
-+			.size = 0x00001000,
-+			.flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
-+				JAILHOUSE_MEM_IO,
-+		},
-		/* First peripheral window, 1 of 2 */ {
-			.phys_start = 0x01000000,
-			.virt_start = 0x01000000,
--
-2.34.1
--- a/meta-ti-extras/recipes-ti/jailhouse/files/0004-configs-arm64-k3-am625-sk-Add-GPMC-memory-region.patch
+++ b/meta-ti-extras/recipes-ti/jailhouse/files/0004-configs-arm64-k3-am625-sk-Add-GPMC-memory-region.patch
@@ -1,51 +0,0 @@
-From c0e85959637a1de61170d1025e1bac8da283ddb9 Mon Sep 17 00:00:00 2001
-From: Andreas Dannenberg <dannenberg@ti.com>
-Date: Thu, 19 Jan 2023 09:43:55 -0600
-Subject: [PATCH] configs: arm64: k3-am625-sk: Add GPMC memory region
-
-Add the memory region for GPMC, used by the AM62Q NAND card.
-
-Upstream-Status: Submitted [jailhouse-dev@googlegroups.com]
-
-Signed-off-by: Andreas Dannenberg <dannenberg@ti.com>
-Signed-off-by: Paresh Bhagat <p-bhagat@ti.com>
---
- configs/arm64/k3-am625-sk.c | 16 +++++++++++++++-
- 1 file changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/configs/arm64/k3-am625-sk.c b/configs/arm64/k3-am625-sk.c
-index fac4eaa6..10b5a8f3 100644
--- a/configs/arm64/k3-am625-sk.c
-+++ b/configs/arm64/k3-am625-sk.c
-@@ -18,7 +18,7 @@
- struct {
-	struct jailhouse_system header;
-	__u64 cpus[1];
-	struct jailhouse_memory mem_regions[33];
-+	struct jailhouse_memory mem_regions[35];
-	struct jailhouse_irqchip irqchips[5];
-	struct jailhouse_pci_device pci_devices[2];
- } __attribute__((packed)) config = {
-@@ -231,6 +231,20 @@ struct {
-			.flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
-				JAILHOUSE_MEM_IO,
-		},
-+		/* GPMC */ {
-+			.phys_start = 0x3b000000,
-+			.virt_start = 0x3b000000,
-+			.size = 0x00001000,
-+			.flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
-+				JAILHOUSE_MEM_IO,
-+		},
-+		/* GPMC */ {
-+			.phys_start = 0x50000000,
-+			.virt_start = 0x50000000,
-+			.size = 0x08000000,
-+			.flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
-+				JAILHOUSE_MEM_IO,
-+		},
-		/* CPSW */ {
-			.phys_start = 0x08000000,
-			.virt_start = 0x08000000,
--
-2.34.1
--- a/meta-ti-extras/recipes-ti/jailhouse/jailhouse-arch.inc
+++ b/meta-ti-extras/recipes-ti/jailhouse/jailhouse-arch.inc
@@ -1,22 +0,0 @@
-# Set jailhouse architecture JH_ARCH variable
-#
-# return value must match one of architectures supported by jailhouse
-#
-valid_jh_archs = "x86 arm"
-
-def map_jh_arch(a, d):
-    import re
-
-    valid_jh_archs = d.getVar('valid_jh_archs', True).split()
-
-    if   re.match('(i.86|athlon|x86.64)$', a):  return 'x86'
-    elif re.match('armeb$', a):                 return 'arm'
-    elif re.match('aarch64$', a):               return 'arm64'
-    elif re.match('aarch64_be$', a):            return 'arm64'
-    elif a in valid_jh_archs:                   return a
-    else:
-        bb.error("cannot map '%s' to a jailhouse supported architecture" % a)
-
-export JH_ARCH = "${@map_jh_arch(d.getVar('TARGET_ARCH', True), d)}"
-
-COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
--- a/meta-ti-extras/recipes-ti/jailhouse/jailhouse-inmate.bb
+++ b/meta-ti-extras/recipes-ti/jailhouse/jailhouse-inmate.bb
@@ -0,0 +1,12 @@
+require ti-jailhouse.inc
+
+do_install() {
+
+	install -d ${D}${bindir}
+	install -m 0755 ${TOOLS_SRC_DIR}/demos/ivshmem-demo ${D}${bindir}
+
+}
+
+FILES:${PN} = " \
+    ${bindir}/ivshmem-demo \
+"
--- a/meta-ti-extras/recipes-ti/jailhouse/jailhouse_git.bb
+++ b/meta-ti-extras/recipes-ti/jailhouse/jailhouse_git.bb
@@ -1,107 +1,41 @@
-SUMMARY = "Linux-based partitioning hypervisor"
-DESCRIPTION = "Jailhouse is a partitioning Hypervisor based on Linux. It is able to run bare-metal applications or (adapted) \
-operating systems besides Linux. For this purpose, it configures CPU and device virtualization features of the hardware \
-platform in a way that none of these domains, called 'cells' here, can interfere with each other in an unacceptable way."
-HOMEPAGE = "https://github.com/siemens/jailhouse"
-SECTION = "jailhouse"
-LICENSE = "GPL-2.0-only & BSD-2-Clause"
+require ti-jailhouse.inc

-LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \
-"
-
-COMPATIBLE_MACHINE = "am62xx"
-
-TARGET_CC_ARCH += "${LDFLAGS}"
-
-PV = "0.12+git${SRCPV}"
-SRCREV = "e57d1eff6d55aeed5f977fe4e2acfb6ccbdd7560"
-BRANCH = "master"
-
-SRC_URI = " \
-    git://git.ti.com/git/jailhouse/ti-jailhouse.git;protocol=https;branch=${BRANCH} \
-    file://0001-configs-arm64-k3-am625-sk-Add-crypto-memory-region.patch \
-    file://0002-configs-arm64-k3-am625-sk-Switch-inmate-boot-console.patch \
-    file://0003-configs-arm64-k3-am625-sk-Add-VTM-memory-region.patch \
-    file://0001-configs-k3-use-intx-for-bar_mask.patch \
-    file://0004-configs-arm64-k3-am625-sk-Add-GPMC-memory-region.patch \
-"
-
-DEPENDS = "virtual/kernel dtc-native python3-mako-native python3-mako make-native"
 RDEPENDS:${PN} += "\
-	python3-curses\
-	python3-datetime\
-	python3-mmap\
+        python3-curses\
+        python3-datetime\
+        python3-mmap\
 "

-require jailhouse-arch.inc
-inherit module python3native bash-completion deploy setuptools3
-
-S = "${WORKDIR}/git"
-B = "${S}"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(ti-soc)"
-
-JH_DATADIR ?= "${datadir}/jailhouse"
-JH_EXEC_DIR ?= "${libexecdir}/jailhouse"
-CELL_DIR ?= "${JH_DATADIR}/cells"
-CELLCONF_DIR ?= "${JH_DATADIR}/configs"
-INMATES_DIR ?= "${JH_DATADIR}/inmates"
-
 JH_CELL_FILES ?= "*.cell"
 JH_CELL_FILES:k3 ?= "k3-*.cell"
+JH_CELL_FILES:am62xx ?= "k3-am625-*.cell"
+JH_CELL_FILES:am62pxx ?= "k3-am62p5-*.cell"

 JH_INMATE_DTB ?= ""
 JH_INMATE_DTB:am62xx ?= "inmate-k3-am625-sk.dtb"
 JH_INMATE_DTB:am65xx ?= "inmate-k3-am654-idk.dtb"
+JH_INMATE_DTB:am62pxx ?= "inmate-k3-am62p5-sk.dtb"
 JH_INMATE_DTB:j7 ?= "inmate-k3-j721e-evm.dtb"
 JH_INMATE_DTB:j7200-evm ?= "inmate-k3-j7200-evm.dtb"

 JH_LINUX_DEMO_CELL ?= ""
 JH_LINUX_DEMO_CELL:am62xx ?= "k3-am625-sk-linux-demo.cell"
 JH_LINUX_DEMO_CELL:am65xx ?= "k3-am654-idk-linux-demo.cell"
+JH_LINUX_DEMO_CELL:am62pxx ?= "k3-am62p5-sk-linux-demo.cell"
 JH_LINUX_DEMO_CELL:j7 ?= "k3-j721e-evm-linux-demo.cell"
 JH_LINUX_DEMO_CELL:j7200-evm ?= "k3-j7200-evm-linux-demo.cell"

-JH_SYSCONFIG_CELL ?= ""
-JH_SYSCONFIG_CELL:am62xx ?= "k3-am625-sk.cell"
-JH_SYSCONFIG_CELL:am65xx ?= "k3-am654-idk.cell"
-JH_SYSCONFIG_CELL:j7 ?= "k3-j721e-evm.cell"
-JH_SYSCONFIG_CELL:j7200-evm ?= "k3-j7200-evm.cell"
-
 INITRAMFS_IMAGE ?= ""
 JH_RAMFS_IMAGE ?= "${INITRAMFS_IMAGE}"

 JH_CMDLINE ?= ""
 JH_CMDLINE:am62xx ?= "console=ttyS3,115200n8 earlycon=ns16550a,mmio32,0x02810000"
+JH_CMDLINE:am62pxx ?= "console=ttyS1,115200n8"
 JH_CMDLINE:am65xx ?= "console=ttyS1,115200n8"
 JH_CMDLINE:j7 ?= "console=ttyS3,115200n8"
 JH_CMDLINE:j7200-evm ?= "console=ttyS3,115200n8"

-do_configure() {
-	if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ];
-	then
-		cp ${STAGING_DIR_HOST}/${CELLCONF_DIR}/*.c ${S}/configs/
-	fi
-}
-
-USER_SPACE_CFLAGS = '${CFLAGS} -DLIBEXECDIR=\\\"${libexecdir}\\\" \
-                    -DJAILHOUSE_VERSION=\\\"$JAILHOUSE_VERSION\\\" \
-                    -Wall -Wextra -Wmissing-declarations -Wmissing-prototypes -Werror \
-                    -I../driver'
-
-TOOLS_SRC_DIR = "${S}/tools"
-
-EXTRA_OEMAKE = "ARCH=${JH_ARCH} CROSS_COMPILE=${TARGET_PREFIX} CC="${CC}" KDIR=${STAGING_KERNEL_BUILDDIR}"
-
-do_compile() {
-	oe_runmake V=1
-}
-
 do_install() {
-	# Install pyjailhouse python modules needed by the tools
-	# distutils3_do_install

 	# We want to install the python tools, but we do not want to use pip...
 	# At least with v0.10, we can work around this with
@@ -148,10 +82,12 @@ do_install() {
 		chmod +x ${D}${JH_DATADIR}/linux-demo.sh
 	fi

+	rm ${D}${JH_DATADIR}/root-cell-config.c.tmpl
+	rm ${D}${JH_DATADIR}/jailhouse-config-collect.tmpl
 }

 PACKAGE_BEFORE_PN = "kernel-module-jailhouse pyjailhouse ${PN}-tools"
-FILES:${PN} = "${base_libdir}/firmware ${libexecdir} ${sbindir} ${JH_DATADIR} /boot"
+
 FILES:pyjailhouse = "${PYTHON_SITEPACKAGES_DIR}"
 FILES:${PN}-tools = "${libexecdir}/${BPN}/${BPN}-*"

@@ -180,32 +116,11 @@ python __anonymous () {
        d.appendVar('RDEPENDS_${PN}', ' ' + cell)
 }

-
 FILES:${PN} = " \
-    /boot \
+    /boot/* \
    /usr/libexec \
-    /usr/sbin/ivshmem-demo \
-    /usr/sbin/jailhouse \
-    /usr/libexec/jailhouse \
-    /usr/libexec/jailhouse/jailhouse-config-check \
-    /usr/libexec/jailhouse/jailhouse-config-collect \
-    /usr/libexec/jailhouse/jailhouse-hardware-check \
-    /usr/libexec/jailhouse/jailhouse-cell-stats \
-    /usr/libexec/jailhouse/linux-loader.bin \
-    /usr/libexec/jailhouse/jailhouse-cell-linux \
-    /usr/libexec/jailhouse/jailhouse-config-create \
-    /usr/share/jailhouse \
-    /usr/share/jailhouse/linux-demo.sh \
-    /usr/share/jailhouse/inmate-k3-am625-sk.dtb \
-    /usr/share/jailhouse/inmates \
-    /usr/share/jailhouse/cells \
-    /usr/share/jailhouse/inmates/gic-demo.bin \
-    /usr/share/jailhouse/inmates/ivshmem-demo.bin \
-    /usr/share/jailhouse/inmates/uart-demo.bin \
-    /usr/share/jailhouse/cells/k3-am625-sk.cell \
-    /usr/share/jailhouse/cells/k3-am625-sk-inmate-demo.cell \
-    /usr/share/jailhouse/cells/k3-am625-sk-linux-demo.cell \
-    /lib/firmware \
-    /lib/firmware/jailhouse.bin \
-    /boot/tisdk-tiny-image-am62xx-evm.cpio \
+    /usr/sbin/* \
+    /usr/libexec/* \
+    /usr/share/* \
+    /lib/firmware/* \
 "
--- a/meta-ti-extras/recipes-ti/jailhouse/ti-jailhouse.inc
+++ b/meta-ti-extras/recipes-ti/jailhouse/ti-jailhouse.inc
@@ -0,0 +1,87 @@
+SUMMARY = "Linux-based partitioning hypervisor"
+DESCRIPTION = "Jailhouse is a partitioning Hypervisor based on Linux. It is able to run bare-metal applications or (adapted) \
+operating systems besides Linux. For this purpose, it configures CPU and device virtualization features of the hardware \
+platform in a way that none of these domains, called 'cells' here, can interfere with each other in an unacceptable way."
+HOMEPAGE = "https://github.com/siemens/jailhouse"
+SECTION = "jailhouse"
+
+LICENSE = "GPL-2.0-only & BSD-2-Clause"
+
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \
+"
+
+COMPATIBLE_MACHINE = "am62xx|am62pxx"
+TARGET_CC_ARCH += "${LDFLAGS}"
+PV = "0.12+git${SRCPV}"
+SRCREV = "0b29ad90f6f54105b98d6bbf35cc47fb244f7799"
+BRANCH = "master"
+SRC_URI = " \
+    git://git.ti.com/git/jailhouse/ti-jailhouse.git;protocol=https;branch=${BRANCH} \
+"
+
+# Set jailhouse architecture JH_ARCH variable
+#
+# return value must match one of architectures supported by jailhouse
+#
+valid_jh_archs = "x86 arm"
+
+def map_jh_arch(a, d):
+    import re
+
+    valid_jh_archs = d.getVar('valid_jh_archs', True).split()
+
+    if   re.match('(i.86|athlon|x86.64)$', a):  return 'x86'
+    elif re.match('armeb$', a):                 return 'arm'
+    elif re.match('aarch64$', a):               return 'arm64'
+    elif re.match('aarch64_be$', a):            return 'arm64'
+    elif a in valid_jh_archs:                   return a
+    else:
+        bb.error("cannot map '%s' to a jailhouse supported architecture" % a)
+
+export JH_ARCH = "${@map_jh_arch(d.getVar('TARGET_ARCH', True), d)}"
+
+COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
+
+S = "${WORKDIR}/git"
+B = "${S}"
+
+DEPENDS = "virtual/kernel dtc-native python3-mako-native python3-mako make-native"
+
+inherit module python3native bash-completion deploy setuptools3
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = "(ti-soc)"
+
+JH_DATADIR ?= "${datadir}/jailhouse"
+JH_EXEC_DIR ?= "${libexecdir}/jailhouse"
+CELL_DIR ?= "${JH_DATADIR}/cells"
+CELLCONF_DIR ?= "${JH_DATADIR}/configs"
+INMATES_DIR ?= "${JH_DATADIR}/inmates"
+
+JH_SYSCONFIG_CELL ?= ""
+JH_SYSCONFIG_CELL:am62xx ?= "k3-am625-sk.cell"
+JH_SYSCONFIG_CELL:am65xx ?= "k3-am654-idk.cell"
+JH_SYSCONFIG_CELL:am62pxx ?= "k3-am62p5-sk.cell"
+JH_SYSCONFIG_CELL:j7 ?= "k3-j721e-evm.cell"
+JH_SYSCONFIG_CELL:j7200-evm ?= "k3-j7200-evm.cell"
+
+do_configure() {
+        if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ];
+        then
+            cp ${STAGING_DIR_HOST}/${CELLCONF_DIR}/*.c ${S}/configs/
+        fi
+}
+
+USER_SPACE_CFLAGS = '${CFLAGS} -DLIBEXECDIR=\\\"${libexecdir}\\\" \
+                    -DJAILHOUSE_VERSION=\\\"$JAILHOUSE_VERSION\\\" \
+                    -Wall -Wextra -Wmissing-declarations -Wmissing-prototypes -Werror \
+                    -I../driver'
+
+TOOLS_SRC_DIR = "${S}/tools"
+
+EXTRA_OEMAKE = "ARCH=${JH_ARCH} CROSS_COMPILE=${TARGET_PREFIX} CC="${CC}" KDIR=${STAGING_KERNEL_BUILDDIR}"
+
+do_compile() {
+        oe_runmake V=1
+}
				`@@ -1 +0,0 @@`
				`require ${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-driver ti-sgx-ddk-km', 'pvr-cairo.inc', '', d)}`