CI/CD Auto-Merger: cicd.kirkstone.202410111007

Updated the value(s) for:
  ti-linux-fw: TI_LINUX_FW_SRCREV,TI_SYSFW_VERSION
  u-boot-ti-staging_2023.04: SRCREV
  linux-ti-staging-rt_6.1: SRCREV
  linux-ti-staging_6.1: SRCREV

Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com>

meta-ti-bsp/README

@@ -8,11 +8,11 @@ This layer depends on:
 
 URI: git://git.openembedded.org/openembedded-core
 layers: meta
-branch: master
+branch: kirkstone
 
 URI: git://git.yoctoproject.org/meta-arm
 layers: meta-arm
-branch: master
+branch: kirkstone
 
 
 The base BSP part of meta-ti should work with different OpenEmbedded/Yocto

meta-ti-bsp/conf/machine/am57xx-evm.conf

@@ -10,6 +10,7 @@ SERIAL_CONSOLES = "115200;ttyS2"
 
 KERNEL_DEVICETREE_PREFIX = " \
     am57 \
+    ov10635 \
     ti/am57 \
     ti/lcd \
     ti/ov10635 \

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 = " \

meta-ti-bsp/conf/machine/am62pxx-evm.conf

@@ -9,6 +9,7 @@ KERNEL_DEVICETREE_PREFIX = " \
     ti/k3-am62p5 \
     ti/k3-am62x-sk-csi2 \
     ti/k3-am62x-sk-hdmi \
+    ti/k3-am62x-sk-lpm \
 "
 
 KERNEL_DEVICETREE = " \
@@ -16,3 +17,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)}"

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"

meta-ti-bsp/conf/machine/am62xx-lp-evm.conf

@@ -3,6 +3,7 @@
 #@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 \

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"

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"

meta-ti-bsp/conf/machine/beaglebone-ai64.conf

@@ -6,21 +6,30 @@ 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-common-proc-board-infotainment.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"

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"

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"

meta-ti-bsp/conf/machine/beagleplay.conf

@@ -20,6 +20,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"
@@ -28,17 +33,40 @@ 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-beaglemod.dtb \
+ti/k3-am625-beaglemod-audio.dtbo \
+ti/k3-am625-beaglemod-can0.dtbo \
+ti/k3-am625-beaglemod-can1.dtbo \
+ti/k3-am625-beaglemod-csi0-ov5640.dtbo \
+ti/k3-am625-beaglemod-eeprom.dtbo \
+ti/k3-am625-beaglemod-eth.dtbo \
+ti/k3-am625-beaglemod-hdmi.dtbo \
+ti/k3-am625-beaglemod-io-expand.dtbo \
+ti/k3-am625-beaglemod-lt-lcd185.dtbo \
+ti/k3-am625-beaglemod-ospi-flash.dtbo \
+ti/k3-am625-beaglemod-rs485-1.dtbo \
+ti/k3-am625-beaglemod-rs485-2.dtbo \
+ti/k3-am625-beaglemod-rtc.dtbo \
+ti/k3-am625-beaglemod-wl1835.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-hdmi-disable-fastboot.dtbo \
+ti/k3-am62x-sk-lpm-wkup-sources.dtbo \
+ti/k3-am62x-sk-mcan.dtbo \
 "
 
 MACHINE_GUI_CLASS = "bigscreen"

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"

meta-ti-bsp/conf/machine/include/j7200.inc

@@ -4,6 +4,12 @@ SOC_FAMILY:append = ":j7200"
 # Default tiboot3.bin on J7200 is for GP
 IMAGE_BOOT_FILES += "tiboot3-j7200-gp-evm.bin"
 
+# Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-FS
+IMAGE_BOOT_FILES += "tiboot3-j7200-hs-fs-evm.bin"
+
+# Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-SE
+IMAGE_BOOT_FILES += "tiboot3-j7200-hs-evm.bin"
+
 # Since default tiboot3.bin on J7200 is for GP, add a version for SR2.0 HS-FS
 IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-fs-evm.bin"
 

meta-ti-bsp/conf/machine/include/j721e.inc

@@ -12,13 +12,21 @@ IMAGE_BOOT_FILES += "sysfw.itb"
 IMAGE_BOOT_FILES += "tiboot3-j721e-gp-evm.bin"
 IMAGE_BOOT_FILES += "sysfw-j721e-gp-evm.itb"
 
-# Since default on J721e is for GP, add a version for HS-FS
+# Since default on J721e is for GP, add a version for SR1.1 HS-FS
+IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-fs-evm.bin"
+IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-fs-evm.itb"
+
+# Since default on J721e is for GP, add a version for SR1.1 HS-SE
+IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-evm.bin"
+IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-evm.itb"
+
+# Since default on J721e is for GP, add a version for SR2.0 HS-FS
 IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-fs-evm.bin"
 IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-fs-evm.itb"
 
-# Since default on J721e is for GP, add a version for HS-SE
-IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-evm.bin"
-IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-evm.itb"
+# Since default on J721e is for GP, add a version for SR2.0 HS-SE
+IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-evm.bin"
+IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-evm.itb"
 
 TFA_BOARD = "generic"
 

meta-ti-bsp/conf/machine/include/j721s2.inc

@@ -12,6 +12,9 @@ IMAGE_BOOT_FILES += "tiboot3-j721s2-gp-evm.bin"
 # Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-FS
 IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin"
 
+# Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-SE
+IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-evm.bin"
+
 TFA_BOARD = "generic"
 
 OPTEEMACHINE = "k3-j784s4"

meta-ti-bsp/conf/machine/include/j722s.inc

@@ -0,0 +1,22 @@
+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"
+
+# Since default tiboot3.bin on J722S is for HS-FS, add a version for HS-SE
+IMAGE_BOOT_FILES += "tiboot3-j722s-hs-evm.bin"
+
+TFA_BOARD = "lite"
+TFA_K3_SYSTEM_SUSPEND = "1"
+
+OPTEEMACHINE = "k3-am62x"
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cnm-wave-fw"
+
+SERIAL_CONSOLES = "115200;ttyS2"

meta-ti-bsp/conf/machine/include/j784s4.inc

@@ -12,6 +12,9 @@ IMAGE_BOOT_FILES += "tiboot3-j784s4-gp-evm.bin"
 # Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-FS
 IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin"
 
+# Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-SE
+IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-evm.bin"
+
 TFA_BOARD = "j784s4"
 
 OPTEEMACHINE = "k3-j784s4"

meta-ti-bsp/conf/machine/j721s2-evm.conf

@@ -12,6 +12,7 @@ KERNEL_DEVICETREE_PREFIX = " \
     ti/k3-fpdlink \
     ti/k3-j7200-evm-mcspi-loopback \
     ti/k3-am68-sk \
+    ti/k3-v3link \
 "
 
 KERNEL_DEVICETREE = " \

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"

meta-ti-bsp/conf/machine/j722s-evm.conf

@@ -0,0 +1,15 @@
+#@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 \
+    ti/k3-fpdlink \
+    ti/k3-v3link \
+"
+
+KERNEL_DEVICETREE = ""
+
+UBOOT_MACHINE = "j722s_evm_a53_defconfig"

meta-ti-bsp/conf/machine/j784s4-evm.conf

@@ -12,6 +12,7 @@ KERNEL_DEVICETREE_PREFIX = " \
     ti/k3-fpdlink \
     ti/k3-j7200-evm-mcspi-loopback \
     ti/k3-am69-sk \
+    ti/k3-v3link \
 "
 
 KERNEL_DEVICETREE = " \

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"

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}"
 

meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb

@@ -12,7 +12,7 @@ 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"
 
@@ -22,13 +22,14 @@ SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-driver.git;protocol=https;
 
 S = "${WORKDIR}/git"
 
-SRCREV = "778aa5d1e104f36c7f7c1f50e99f8499cbbdadbb"
+SRCREV = "c89c1efa4a1ee5da64fd525f45e9e33728cf6181"
 
 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"
 

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"
 

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() {

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.08"
+PRUETH_FW_AM65X_SR2_VERSION = "02.02.14.03"
 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.08"
+CNM_WAVE521_FW_VERSION = "1.0.4"
+TI_DM_FW_VERSION = "10.00.05"
+TI_SYSFW_VERSION = "10.01.01"
 
-TI_LINUX_FW_SRCREV ?= "9ee2fedb1fb4815f54310dd872d34faf9948c7c1"
+TI_LINUX_FW_SRCREV ?= "ddb9cc251ace41dfad6650390f82e4a389d3967e"
 SRCREV = "${TI_LINUX_FW_SRCREV}"
 
 BRANCH ?= "ti-linux-firmware"

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${SRCPV}"
+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"

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"

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.07"
+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.07"
 # 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 = "83cdab8b2c6ea0fc0860f8444d083353b47f1d5c"
+SRCREV = "866ca972d6c3cabeaf6dbac431e8e08bb30b3c8e"

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 = "c1c2bdf272561724f531fe8e7a649ef687d1a67e"
-
-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 = "0853d7725220d59130d8bcc59d01151cba64ffa0"

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"
@@ -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"
@@ -216,6 +221,13 @@ do_deploy:append:k3r5 () {
 			install -m 644 $f ${DEPLOYDIR}/
 		fi
 	done
+
+	rm ${DEPLOYDIR}/u-boot-initial-env || true
+	rm ${DEPLOYDIR}/${PN}-initial-env || true
+	rm ${DEPLOYDIR}/u-boot-initial-env-${MACHINE} || true
+	rm ${DEPLOYDIR}/${PN}-initial-env-${MACHINE} || true
+	rm ${DEPLOYDIR}/u-boot-initial-env-${MACHINE}-${PV}-${PR} || true
+	rm ${DEPLOYDIR}/${PN}-initial-env-${MACHINE}-${PV}-${PR} || true
 }
 
 do_deploy:append () {
@@ -320,13 +332,26 @@ do_deploy:append () {
 			ln -sf ${UBOOT_HS_2ND_IMAGE} ${UBOOT_HS_2ND_BINARY}
 		fi
 	fi
+}
 
-	rm ${DEPLOYDIR}/u-boot-initial-env || true
-	rm ${DEPLOYDIR}/${PN}-initial-env || true
-	rm ${DEPLOYDIR}/u-boot-initial-env-${MACHINE} || true
-	rm ${DEPLOYDIR}/${PN}-initial-env-${MACHINE} || true
-	rm ${DEPLOYDIR}/u-boot-initial-env-${MACHINE}-${PV}-${PR} || true
-	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"

meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb

@@ -10,7 +10,7 @@ PV = "0.3+git${SRCPV}"
 COMPATIBLE_MACHINE = "k3"
 
 BRANCH ?= "master"
-SRCREV = "de06befe878be061a40540d2127d4273320b35bc"
+SRCREV = "30a1d5b2d08c0da39d4e62b3ebee591a9882fa21"
 
 SRC_URI = "git://git.ti.com/git/k3conf/k3conf.git;protocol=https;branch=${BRANCH}"
 

meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb

@@ -28,11 +28,7 @@ PACKAGECONFIG:append = " \
     ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-sgx-ddk-km', 'sgx', '', d)} \
 "
 
-# Temporary work around to use a different SRCREV for SGX Mesa, vs Rogue Mesa
-# Idea is these two should be the same, but currently a segfault is happening
-# on certain platforms if the sgx commit is used.
-SRCREV = "${@bb.utils.contains('PACKAGECONFIG', 'sgx', '7c9522a4147836064f582278e4f7115735c16868', '54fd9d7dea098b6f11c2a244b0c6763dc8c5690c', d)}"
-PR = "sgxrgx-${SRCREV}"
+SRCREV = "1be98ba80452ebe38546a7fca26b5a70f2629083"
 
 PVR_DISPLAY_CONTROLLER_ALIAS ??= "tidss"
 PACKAGECONFIG[pvr] = "-Dgallium-pvr-alias=${PVR_DISPLAY_CONTROLLER_ALIAS},"

meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb

@@ -6,13 +6,13 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=7232b98c1c58f99e3baa03de52
 inherit bin_package
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx|am62pxx"
+COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx|am62pxx|j722s"
 
 PR = "r2"
 
 BRANCH = "linuxws/kirkstone/k6.1/${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"
@@ -20,6 +20,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"
 
@@ -30,7 +31,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)} \
 "
 
@@ -118,7 +119,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"

meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb

@@ -10,24 +10,21 @@ inherit kernel
 require recipes-kernel/linux/setup-defconfig.inc
 require recipes-kernel/linux/ti-kernel.inc
 
-# BB.org hasn't switched to "vendored" DTB layout by default yet
-KERNEL_DTBVENDORED = "0"
-
 DEPENDS += "gmp-native libmpc-native"
 
 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.80 version for 32-bit
+SRCREV:armv7a = "4ca9ea30768d58c8d4d56d03dd1eaf8c8feb7ef9"
+PV:armv7a = "6.1.80+git${SRCPV}"
+BRANCH:armv7a = "v6.1.80-ti-r34"
 
-# 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.80 version for 64-bit
+SRCREV:aarch64 = "977c75e082620f15c06c72bcced30f787c14b390"
+PV:aarch64 = "6.1.80+git${SRCPV}"
+BRANCH:aarch64 = "v6.1.80-ti-arm64-r49"
 
 SRC_URI = " \
     git://github.com/beagleboard/linux.git;protocol=https;branch=${BRANCH} \

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 = "b4f1767f9ebaadcb85e2b10eadc5b168a2a7cdb4"
+SRCREV = "451df8c0a2a3bcf0656b2f6fdc49d6fb4d05f186"
 
 include ${@ 'recipes-kernel/linux/ti-extras-rt.inc' if d.getVar('TI_EXTRAS') else ''}
 
-PV = "6.1.46+git${SRCPV}"
+PV = "6.1.105+git${SRCPV}"

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 ?= "5da2f861d7d06b97ea386294469e1644b18666fc"
-PV = "6.1.46+git${SRCPV}"
+SRCREV ?= "92ce8d7d2ab679e10c1dda309a0fb2ceae78b908"
+PV = "6.1.105+git${SRCPV}"
 
 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
 MACHINE_KERNEL_PR:append = "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`

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${SRCPV}"
+SRCREV = "f7e4ced15d1fefd073bbfc484fe0e1f74afe96c2"

meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc

@@ -6,6 +6,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

meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc

@@ -1,2 +1,2 @@
-PV = "4.0.0+git${SRCPV}"
-SRCREV = "2a5b1d1232f582056184367fb58a425ac7478ec6"
+PV = "4.1.0+git${SRCPV}"
+SRCREV = "012cdca49db398693903e05c42a254a3a0c0d8f2"

meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc

@@ -1,2 +1,2 @@
-PV = "4.0.0+git${SRCPV}"
-SRCREV = "1c3d6be5eaa6174e3dbabf60928d15628e39b994"
+PV = "4.1.0+git${SRCPV}"
+SRCREV = "2e1e7a9c9d659585566a75fc8802f4758c42bcb2"

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${SRCPV}"
 
 S = "${WORKDIR}/git"
 

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"

meta-ti-bsp/wic/sdimage-2part-efi.wks.in

@@ -2,6 +2,7 @@
 # long-description: Creates a partitioned SD card image for TI platforms that
 # supports EFI.  Boot files are located in the first vfat partition with extra
 # reserved space.  We cannot use a GPT here.
+
 bootloader --timeout=3 --append="rootfstype=ext4"
-part /boot --source bootimg-efi --sourceparams="loader=${EFI_PROVIDER}" --fstype=vfat --label boot --active --align 1024 --use-uuid --fixed-size 128M
+part --source bootimg-efi --sourceparams="loader=${EFI_PROVIDER}" --fstype=vfat --label boot --active --align 1024 --use-uuid --fixed-size 128M
 part / --source rootfs --fstype=ext4 --label root --align 1024 --use-uuid

meta-ti-bsp/wic/sdimage-2part.wks

@@ -2,5 +2,5 @@
 # long-description: Creates a partitioned SD card image for TI platforms.
 # Boot files are located in the first vfat partition with extra reserved space.
 
-part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 1024 --fixed-size 128 --use-uuid
-part / --source rootfs --ondisk mmcblk0 --fstype=ext4 --label root --align 1024 --use-uuid
+part --source bootimg-partition --fstype=vfat --label boot --active --align 1024 --use-uuid --fixed-size 128M
+part / --source rootfs --fstype=ext4 --label root --align 1024 --use-uuid

meta-ti-extras/README

@@ -8,14 +8,14 @@ This layer depends on:
 
 URI: git://git.openembedded.org/openembedded-core
 layers: meta
-branch: master
+branch: kirkstone
 
 URI: git://git.yoctoproject.org/meta-arm
 layers: meta-arm
-branch: master
+branch: kirkstone
 
 URI: git://git.yoctoproject.org/meta-ti
-branch: master
+branch: kirkstone
 revision: HEAD
 layers: meta-ti-bsp
 

meta-ti-extras/recipes-connectivity/wl18xx-target-scripts/wl18xx-target-scripts_8.8.1.bb

@@ -2,8 +2,8 @@ DESCRIPTION = "Scripts and configuration files for TI wireless drivers"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://README;beginline=1;endline=21;md5=b8d6a0865f50159bf5c0d175d1f4a705"
 
-# Tag: R8.7_SP3 (8.7.3)
-SRCREV = "a07b6e711d2a70608101d3d6cdc5749c4d8a96d5"
+# Tag: R8.8.1
+SRCREV = "8bcee075061527d61f26d6d506aebdfd496037d9"
 BRANCH = "sitara-scripts"
 SRC_URI = "git://git.ti.com/git/wilink8-wlan/wl18xx-target-scripts.git;protocol=https;branch=${BRANCH} \
 file://0001-print_stat.sh-replace-system-bin-sh-with-bin-sh.patch \

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"

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 \
+"

meta-ti-extras/recipes-ti/jailhouse/jailhouse_git.bb

@@ -1,51 +1,15 @@
-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|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} \
-"
-
-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"
@@ -61,13 +25,6 @@ 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:am62pxx ?= "k3-am62p5-sk.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}"
 
@@ -78,29 +35,7 @@ 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
@@ -147,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}-*"
 
@@ -179,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/* \
 "

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 = "603819ef9a771a3c253a141220daab8e61751a43"
+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
+}