CI/CD Auto-Merger: cicd.scarthgap.202409050400

Updated the value(s) for:
  linux-ti-staging-rt_6.6: SRCREV
  linux-ti-staging_6.6: SRCREV

Changelogs:
  linux-ti-staging-rt_6.6: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=2cc066b2c5d12544415bd84564e633bf852bef74..fb018c5e9fa7eb05fa1cb2e87760d9c1e430da64
  linux-ti-staging_6.6: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/log/?qt=range&q=d80245c38ed4432878e5fe309f6ba958fd2c2e8f..c0deda7906ed2661afaa841e1d822932a37f38f6

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

TODO

@@ -1,2 +0,0 @@
-This TODO list allows us to track certain actions and lists of patches that
-need to be removed at a future date.

check_yocto_rules.json

@@ -1,52 +0,0 @@
-{
-    "APPEND-1" : {
-        "skip_vars" : [ "ALTERNATIVE", "FILES", "INSANE_SKIP", "RDEPENDS", "RRECOMMENDS" ]
-    },
-    "APPEND-2" : {
-        "skip_vars" : [ "KERNEL_LOCALVERSION", "PR", "PV", "S" ],
-        "file_regex" : {
-            "meta-ti-bsp\\/recipes-graphics\\/mesa\\/mesa-pvr_\\S+\\.bb" : {
-                "skip_vars": [ "GALLIUMDRIVERS", "VULKAN_DRIVERS" ]
-            },
-            "meta-ti-bsp\\/recipes-graphics\\/mesa\\/mesa-pvr\\.inc" : {
-                "skip_vars": [ "TOOLS", "TOOLS_DEPS", "GALLIUMDRIVERS", "VULKAN_DRIVERS" ]
-            }
-        }
-    },
-    "GUARD-1" : {
-        "skip_files" : [
-            "meta-ti-bsp/recipes-core/udev/eudev_%.bbappend",
-            "meta-ti-bsp/recipes-devtools/binutils/binutils-cross-canadian_%.bbappend",
-            "meta-ti-bsp/recipes-security/optee/optee-%.bbappend",
-            "meta-ti-bsp/dynamic-layers/openembedded-layer/recipes-bsp/u-boot/u-boot-ti-%.bbappend",
-            "meta-ti-bsp/dynamic-layers/openembedded-layer/recipes-ti/initramfs/packagegroup-ti-core-initramfs.bbappend"
-        ]
-    },
-    "GUARD-2" : {
-        "skip_vars" : [ "k3" , "ti-soc" ]
-    },
-    "GUARD-3" : {
-        "skip_files" : [
-            "meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend"
-        ]
-    },
-    "PV-1" :{
-        "skip_files" : [
-            "meta-ti-bsp/recipes-kernel/linux/ti-kernel-fitimage.bb",
-            "meta-ti-bsp/recipes-multimedia/ti-multimedia-udev/ti-multimedia-udev.bb",
-            "meta-ti-bsp/recipes-ti/initramfs/packagegroup-ti-core-initramfs.bb",
-            "meta-ti-bsp/recipes-ti/initramfs/ti-core-initramfs.bb",
-            "meta-ti-bsp/recipes-ti/secdev/ti-k3-secdev_git.bb",
-            "meta-ti-extras/recipes-connectivity/cc33xx-target-scripts/cc33xx-target-scripts_git.bb",
-            "meta-ti-extras/recipes-ti/beagleboard/beaglebone-capes.bb",
-            "meta-ti-extras/recipes-ti/beagleboard/beaglebone-getting-started.bb",
-            "meta-ti-extras/recipes-ti/ipc/ti-ipc-examples-linux_git.bb",
-            "meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos_git.bb"
-        ]
-    },
-    "SUMMARY-1" : {
-        "skip_files" : [
-            "meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos_git.bb"
-        ]
-    }
-}

meta-beagle/COPYING.MIT

@@ -1,17 +0,0 @@
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

meta-beagle/README

@@ -1,31 +0,0 @@
-OpenEmbedded/Yocto layer that extends meta-ti-bsp with BeagleBoard.org platforms.
-
-It is hosted on http://git.yoctoproject.org/cgit/cgit.cgi/meta-ti/ with the
-source repository at git://git.yoctoproject.org/meta-ti
-
-
-This layer depends on:
-
-URI: git://git.openembedded.org/openembedded-core
-layers: meta
-branch: master
-
-URI: git://git.yoctoproject.org/meta-arm
-layers: meta-arm
-branch: master
-
-URI: git://git.yoctoproject.org/meta-ti
-branch: master
-revision: HEAD
-layers: meta-ti-bsp
-
-
-Send pull requests, patches, comments or questions to:
-meta-ti@lists.yoctoproject.org
-
-Please note - meta-ti mailing list requires subscription for posting:
-https://lists.yoctoproject.org/g/meta-ti
-
-Maintainers:
-Denys Dmytriyenko <denys@konsulko.com>
-Ryan Eatmon <reatmon@ti.com>

meta-beagle/SECURITY

@@ -1,20 +0,0 @@
-How to Report a Potential Vulnerability?
-========================================
-
-If you would like to report a public issue (for example, one with a released
-CVE number), please report it to the mailing list:
-
-  https://lists.yoctoproject.org/g/meta-ti
-
-If you are dealing with a not-yet released or urgent issue, please send a
-message to one of the maintainers listed in the README.  Include as many
-details as possible:
-  - the layer or software module affected
-  - the recipe and its version
-  - any example code, if available
-
-Branches maintained with security fixes
----------------------------------------
-
-See https://wiki.yoctoproject.org/wiki/Releases for the list of current
-releases.  We only accept patches for the LTS releases and the master branch.

meta-beagle/conf/layer.conf

@@ -1,17 +0,0 @@
-# We have a conf and classes directory, append to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-# We have a recipes directory, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
-
-BBFILE_COLLECTIONS += "meta-beagle"
-BBFILE_PATTERN_meta-beagle := "^${LAYERDIR}/"
-BBFILE_PRIORITY_meta-beagle = "6"
-
-LAYERSERIES_COMPAT_meta-beagle = "whinlatter"
-
-LAYERDEPENDS_meta-beagle = " \
-    meta-ti-bsp \
-"
-
-HOSTTOOLS_NONFATAL += "lz4c"

meta-beagle/conf/machine/beagle-x15.conf

@@ -1,48 +0,0 @@
-#@TYPE: Machine
-#@NAME: BeagleBoard X15
-#@DESCRIPTION: Machine configuration for the BeagleBoard X15
-
-require conf/machine/include/am57xx.inc
-require conf/machine/include/beagle-bsp.inc
-
-KERNEL_DEVICETREE_PREFIX = " \
-    ti/omap/am57xx-beagle-x15 \
-    ti/omap/am57xx-idk-lcd \
-"
-
-KERNEL_DEVICETREE:bsp-bb_org-6_6 = " \
-ti/omap/am571x-idk.dtb \
-ti/omap/am571x-idk-touchscreen.dtbo \
-ti/omap/am5729-beagleboneai.dtb \
-ti/omap/am572x-idk.dtb \
-ti/omap/am572x-idk-touchscreen.dtbo \
-ti/omap/am574x-idk.dtb \
-ti/omap/am57xx-beagle-x15.dtb \
-ti/omap/am57xx-beagle-x15-revb1.dtb \
-ti/omap/am57xx-beagle-x15-revc.dtb \
-ti/omap/am57xx-evm.dtbo \
-ti/omap/am57xx-idk-lcd-osd101t2045.dtbo \
-ti/omap/am57xx-idk-lcd-osd101t2587.dtbo \
-"
-
-KERNEL_DEVICETREE:bsp-bb_org-6_12 = " \
-ti/omap/am571x-idk.dtb \
-ti/omap/am571x-idk-touchscreen.dtbo \
-ti/omap/am5729-beagleboneai.dtb \
-ti/omap/am572x-idk.dtb \
-ti/omap/am572x-idk-touchscreen.dtbo \
-ti/omap/am574x-idk.dtb \
-ti/omap/am57xx-beagle-x15.dtb \
-ti/omap/am57xx-beagle-x15-revb1.dtb \
-ti/omap/am57xx-beagle-x15-revc.dtb \
-ti/omap/am57xx-evm.dtbo \
-ti/omap/am57xx-evm-ov10635.dtbo \
-ti/omap/am57xx-idk-lcd-osd101t2045.dtbo \
-ti/omap/am57xx-idk-lcd-osd101t2587.dtbo \
-"
-
-MACHINE_GUI_CLASS = "bigscreen"
-
-SERIAL_CONSOLES = "115200;ttyS2"
-
-UBOOT_MACHINE = "am57xx_evm_config"

meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf

@@ -1,8 +0,0 @@
-#@TYPE: Machine
-#@NAME: BeagleBone AI-64 (R5F)
-#@DESCRIPTION: Machine configuration for the BeagleBone AI-64 (R5F core)
-
-require conf/machine/include/k3r5.inc
-require conf/machine/include/beagle-bsp.inc
-
-UBOOT_MACHINE = "j721e_beagleboneai64_r5_defconfig"

meta-beagle/conf/machine/beaglebone-ai64.conf

@@ -1,95 +0,0 @@
-#@TYPE: Machine
-#@NAME: BeagleBone AI-64 (A72)
-#@DESCRIPTION: Machine configuration for the BeagleBone AI-64 board (A72 core)
-
-require conf/machine/include/j721e.inc
-require conf/machine/include/beagle-bsp.inc
-
-UBOOT_MACHINE = "j721e_beagleboneai64_a72_defconfig"
-
-SPL_BINARY = "tispl.bin_unsigned"
-
-KERNEL_DEVICETREE_PREFIX = " \
-    ti/k3-j721e \
-"
-
-KERNEL_DEVICETREE:bsp-bb_org-6_6 = " \
-ti/k3-j721e-beagleboneai64-BBORG_MOTOR.dtbo \
-ti/k3-j721e-beagleboneai64-dsi-rpi-7inch-panel.dtbo \
-ti/k3-j721e-beagleboneai64.dtb \
-ti/k3-j721e-beagleboneai64-microtips-mf070zima-lcd3.dtbo \
-ti/k3-j721e-beagleboneai64-pwm-epwm0-p8_13.dtbo \
-ti/k3-j721e-beagleboneai64-pwm-epwm0-p8_13-p8_19.dtbo \
-ti/k3-j721e-beagleboneai64-pwm-epwm0-p8_19.dtbo \
-ti/k3-j721e-beagleboneai64-pwm-epwm2-p9_14.dtbo \
-ti/k3-j721e-beagleboneai64-pwm-epwm2-p9_14-p9_16.dtbo \
-ti/k3-j721e-beagleboneai64-pwm-epwm2-p9_16.dtbo \
-ti/k3-j721e-beagleboneai64-pwm-epwm4-p9_25.dtbo \
-ti/k3-j721e-beagleboneai64-spi-mcspi1-cs0.dtbo \
-ti/k3-j721e-beagleboneai64-spi-mcspi1-cs0-no-miso.dtbo \
-ti/k3-j721e-beagleboneai64-spi-mcspi2-cs0.dtbo \
-ti/k3-j721e-beagleboneai64-spi-mcspi3-cs0-no-miso.dtbo \
-ti/k3-j721e-beagleboneai64-spi-mcspi6-cs0-cs1.dtbo \
-ti/k3-j721e-beagleboneai64-spi-mcspi6-cs0.dtbo \
-ti/k3-j721e-beagleboneai64-spi-mcspi6-cs1-no-miso.dtbo \
-ti/k3-j721e-beagleboneai64-spi-mcspi7-cs0.dtbo \
-ti/k3-j721e-common-proc-board.dtb \
-ti/k3-j721e-common-proc-board-infotainment.dtbo \
-ti/k3-j721e-evm-csi2-ov5640.dtbo \
-ti/k3-j721e-evm-ethfw.dtbo \
-ti/k3-j721e-evm-fusion.dtbo \
-ti/k3-j721e-evm-gesi-exp-board.dtbo \
-ti/k3-j721e-evm-ina2xx.dtbo \
-ti/k3-j721e-evm-pcie0-ep.dtbo \
-ti/k3-j721e-evm-pcie1-ep.dtbo \
-ti/k3-j721e-evm-quad-port-eth-exp.dtbo \
-ti/k3-j721e-sk-csi2-dual-imx219.dtbo \
-ti/k3-j721e-sk-csi2-ov5640.dtbo \
-ti/k3-j721e-sk.dtb \
-ti/k3-j721e-sk-fpdlink-fusion.dtbo \
-ti/k3-j721e-sk-rpi-hdr-ehrpwm.dtbo \
-"
-
-KERNEL_DEVICETREE:bsp-bb_org-6_12 = " \
-ti/k3-j721e-beagleboneai64-BBORG_MOTOR.dtbo \
-ti/k3-j721e-beagleboneai64-dsi-rpi-7inch-panel.dtbo \
-ti/k3-j721e-beagleboneai64.dtb \
-ti/k3-j721e-beagleboneai64-microtips-mf070zima-lcd3.dtbo \
-ti/k3-j721e-beagleboneai64-pwm-epwm0-p8_13.dtbo \
-ti/k3-j721e-beagleboneai64-pwm-epwm0-p8_13-p8_19.dtbo \
-ti/k3-j721e-beagleboneai64-pwm-epwm0-p8_19.dtbo \
-ti/k3-j721e-beagleboneai64-pwm-epwm2-p9_14.dtbo \
-ti/k3-j721e-beagleboneai64-pwm-epwm2-p9_14-p9_16.dtbo \
-ti/k3-j721e-beagleboneai64-pwm-epwm2-p9_16.dtbo \
-ti/k3-j721e-beagleboneai64-pwm-epwm4-p9_25.dtbo \
-ti/k3-j721e-beagleboneai64-spi-mcspi1-cs0.dtbo \
-ti/k3-j721e-beagleboneai64-spi-mcspi1-cs0-no-miso.dtbo \
-ti/k3-j721e-beagleboneai64-spi-mcspi2-cs0.dtbo \
-ti/k3-j721e-beagleboneai64-spi-mcspi3-cs0-no-miso.dtbo \
-ti/k3-j721e-beagleboneai64-spi-mcspi6-cs0-cs1.dtbo \
-ti/k3-j721e-beagleboneai64-spi-mcspi6-cs0.dtbo \
-ti/k3-j721e-beagleboneai64-spi-mcspi6-cs1-no-miso.dtbo \
-ti/k3-j721e-beagleboneai64-spi-mcspi7-cs0.dtbo \
-ti/k3-j721e-common-proc-board.dtb \
-ti/k3-j721e-common-proc-board-infotainment.dtbo \
-ti/k3-j721e-evm-csi2-ov5640.dtbo \
-ti/k3-j721e-evm-ethfw.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-pcie1-ep.dtbo \
-ti/k3-j721e-evm-pcie-ntb.dtbo \
-ti/k3-j721e-evm-quad-port-eth-exp.dtbo \
-ti/k3-j721e-evm-ub954.dtbo \
-ti/k3-j721e-sk-csi2-dual-imx219.dtbo \
-ti/k3-j721e-sk-csi2-ov5640.dtbo \
-ti/k3-j721e-sk.dtb \
-ti/k3-j721e-sk-fpdlink-fusion.dtbo \
-"
-
-MACHINE_GUI_CLASS = "bigscreen"
-
-# TI has moved a driver out of its kernel tree and into an out of tree module.
-# We need to not include that for older kernels since the module is still in
-# the kernel.
-TI_VXE_VXD_DRIVER:bsp-bb_org-6_6 = ""

meta-beagle/conf/machine/beaglebone.conf

@@ -1,62 +0,0 @@
-#@TYPE: Machine
-#@NAME: BeagleBone machine
-#@DESCRIPTION: Machine configuration for the http://beagleboard.org/bone board
-
-require conf/machine/include/ti33x.inc
-require conf/machine/include/beagle-bsp.inc
-
-KERNEL_DEVICETREE_PREFIX = " \
-    ti/omap/am335x-bone \
-    ti/omap/am335x-pocketbeagle \
-    ti/omap/am335x-sancloud-bbe \
-"
-
-KERNEL_DEVICETREE:bsp-bb_org-6_6 = " \
-ti/omap/am335x-boneblack.dtb \
-ti/omap/am335x-boneblack-revd.dtb \
-ti/omap/am335x-boneblack-uboot.dtb \
-ti/omap/am335x-boneblack-uboot-univ.dtb \
-ti/omap/am335x-boneblack-wireless.dtb \
-ti/omap/am335x-boneblue.dtb \
-ti/omap/am335x-bone.dtb \
-ti/omap/am335x-bonegreen.dtb \
-ti/omap/am335x-bonegreen-gateway.dtb \
-ti/omap/am335x-bonegreen-wireless.dtb \
-ti/omap/am335x-bonegreen-wireless-uboot-univ.dtb \
-ti/omap/am335x-evm.dtb \
-ti/omap/am335x-evmsk.dtb \
-ti/omap/am335x-icev2.dtb \
-ti/omap/am335x-osd3358-sm-red.dtb \
-ti/omap/am335x-pocketbeagle.dtb \
-ti/omap/am335x-sancloud-bbe.dtb \
-ti/omap/am335x-sancloud-bbe-extended-wifi.dtb \
-ti/omap/am335x-sancloud-bbe-lite.dtb \
-"
-
-KERNEL_DEVICETREE:bsp-bb_org-6_12 = " \
-ti/omap/am335x-boneblack.dtb \
-ti/omap/am335x-boneblack-revd.dtb \
-ti/omap/am335x-boneblack-uboot.dtb \
-ti/omap/am335x-boneblack-uboot-univ.dtb \
-ti/omap/am335x-boneblack-wireless.dtb \
-ti/omap/am335x-boneblue.dtb \
-ti/omap/am335x-bone.dtb \
-ti/omap/am335x-bonegreen.dtb \
-ti/omap/am335x-bonegreen-eco.dtb \
-ti/omap/am335x-bonegreen-gateway.dtb \
-ti/omap/am335x-bonegreen-wireless.dtb \
-ti/omap/am335x-bonegreen-wireless-uboot-univ.dtb \
-ti/omap/am335x-evm.dtb \
-ti/omap/am335x-evmsk.dtb \
-ti/omap/am335x-icev2.dtb \
-ti/omap/am335x-osd3358-sm-red.dtb \
-ti/omap/am335x-pocketbeagle.dtb \
-ti/omap/am335x-sancloud-bbe.dtb \
-ti/omap/am335x-sancloud-bbe-extended-wifi.dtb \
-ti/omap/am335x-sancloud-bbe-lite.dtb \
-"
-
-MACHINE_GUI_CLASS = "bigscreen"
-MACHINE_FEATURES += "screen"
-
-SERIAL_CONSOLES = "115200;ttyS0"

meta-beagle/conf/machine/beagleplay-k3r5.conf

@@ -1,7 +0,0 @@
-#@TYPE: Machine
-#@NAME: BeaglePlay (R5F)
-#@DESCRIPTION: Machine configuration for the BeaglePlay (R5F core)
-
-require conf/machine/beagleplay-ti-k3r5.conf
-
-require conf/machine/include/beagle-bsp.inc

meta-beagle/conf/machine/beagleplay.conf

@@ -1,62 +0,0 @@
-#@TYPE: Machine
-#@NAME: BeaglePlay (A53)
-#@DESCRIPTION: Machine configuration for the BeaglePlay board (A53 core)
-
-require conf/machine/beagleplay-ti.conf
-
-require conf/machine/include/beagle-bsp.inc
-
-KERNEL_DEVICETREE:bsp-bb_org-6_6 = " \
-ti/k3-am625-beagleplay-csi2-ov5640.dtbo \
-ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \
-ti/k3-am625-beagleplay.dtb \
-ti/k3-am625-beagleplay-lincolntech-lcd185-panel.dtbo \
-ti/k3-am625-minimal.dtb \
-ti/k3-am625-sk.dtb \
-ti/k3-am625-sk-ecap-capture.dtbo \
-ti/k3-am625-sk-lincolntech-lcd185-panel.dtbo \
-ti/k3-am625-sk-m2-cc3301.dtbo \
-ti/k3-am625-sk-mcspi-loopback.dtbo \
-ti/k3-am625-sk-microtips-mf101hie-panel.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-dmtimer-pwm.dtbo \
-ti/k3-am62x-sk-eqep.dtbo \
-ti/k3-am62x-sk-fastboot-disable-hdmi.dtbo \
-ti/k3-am62x-sk-hdmi-audio.dtbo \
-ti/k3-am62x-sk-lpm-wkup-sources.dtbo \
-ti/k3-am62x-sk-mcan.dtbo \
-ti/k3-am62x-sk-microtips-mf103hie-lcd2.dtbo \
-ti/k3-am62x-sk-pwm.dtbo \
-"
-
-KERNEL_DEVICETREE:bsp-bb_org-6_12 = " \
-ti/k3-am625-beagleplay-bcfserial-no-firmware.dtbo \
-ti/k3-am625-beagleplay-csi2-ov5640.dtbo \
-ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \
-ti/k3-am625-beagleplay.dtb \
-ti/k3-am625-beagleplay-lincolntech-lcd185-panel.dtbo \
-ti/k3-am625-sk.dtb \
-ti/k3-am625-sk-lincolntech-lcd185-panel.dtbo \
-ti/k3-am625-sk-m2-cc3351.dtbo \
-ti/k3-am625-sk-mcspi-loopback.dtbo \
-ti/k3-am625-sk-microtips-mf101hie-panel.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-dmtimer-pwm.dtbo \
-ti/k3-am62x-sk-ecap-capture.dtbo \
-ti/k3-am62x-sk-eqep.dtbo \
-ti/k3-am62x-sk-fastboot-disable-hdmi.dtbo \
-ti/k3-am62x-sk-hdmi-audio.dtbo \
-ti/k3-am62x-sk-lpm-io-ddr-wkup-sources.dtbo \
-ti/k3-am62x-sk-lpm-wkup-sources.dtbo \
-ti/k3-am62x-sk-mcan.dtbo \
-ti/k3-am62x-sk-microtips-mf103hie-lcd2.dtbo \
-ti/k3-am62x-sk-pwm.dtbo \
-"

meta-beagle/conf/machine/beagley-ai-k3r5.conf

@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: BeagleY AI (R5F)
-#@DESCRIPTION: Machine configuration for the BeagleY AI (R5F core)
-
-require conf/machine/include/k3r5.inc
-require conf/machine/include/beagle-bsp.inc
-
-UBOOT_MACHINE = "am67a_beagley_ai_r5_defconfig"
-UBOOT_MACHINE:bsp-bb_org-6_6 = "j722s_evm_r5_defconfig"
-UBOOT_MACHINE:bsp-ti-6_6 = "j722s_evm_r5_defconfig"
-UBOOT_MACHINE:bsp-ti-6_12 = "j722s_evm_r5_defconfig"

meta-beagle/conf/machine/beagley-ai.conf

@@ -1,108 +0,0 @@
-#@TYPE: Machine
-#@NAME: BeagleY AI (A53)
-#@DESCRIPTION: Machine configuration for the BeagleY AI board (A53 core)
-
-require conf/machine/include/j722s.inc
-require conf/machine/include/beagle-bsp.inc
-
-UBOOT_MACHINE = "am67a_beagley_ai_a53_defconfig"
-UBOOT_MACHINE:bsp-bb_org-6_6 = "j722s_evm_a53_config"
-UBOOT_MACHINE:bsp-ti-6_6 = "j722s_evm_a53_config"
-UBOOT_MACHINE:bsp-ti-6_12 = "j722s_evm_a53_config"
-
-KERNEL_DEVICETREE_PREFIX = " \
-    ti/k3-am67a \
-    ti/k3-j722s \
-"
-
-KERNEL_DEVICETREE:bsp-bb_org-6_6 = " \
-ti/k3-am67a-beagley-ai.dtb \
-ti/k3-am67a-beagley-ai-i2c1-400000.dtbo \
-ti/k3-am67a-beagley-ai-i2c1-ads1115.dtbo \
-ti/k3-am67a-beagley-ai-i2c1-rtc-rv3028.dtbo \
-ti/k3-am67a-beagley-ai-i2c1-ssd1306.dtbo \
-ti/k3-am67a-beagley-ai-mikroe-eth.dtbo \
-ti/k3-am67a-beagley-ai-mikroe-microsd.dtbo \
-ti/k3-am67a-beagley-ai-pps-gpio18.dtbo \
-ti/k3-am67a-beagley-ai-pwm-ecap0-gpio12.dtbo \
-ti/k3-am67a-beagley-ai-pwm-ecap1-gpio16.dtbo \
-ti/k3-am67a-beagley-ai-pwm-ecap1-gpio21.dtbo \
-ti/k3-am67a-beagley-ai-pwm-ecap2-gpio17.dtbo \
-ti/k3-am67a-beagley-ai-pwm-ecap2-gpio18.dtbo \
-ti/k3-am67a-beagley-ai-pwm-epwm0-gpio12.dtbo \
-ti/k3-am67a-beagley-ai-pwm-epwm0-gpio14.dtbo \
-ti/k3-am67a-beagley-ai-pwm-epwm0-gpio15.dtbo \
-ti/k3-am67a-beagley-ai-pwm-epwm0-gpio15-gpio12.dtbo \
-ti/k3-am67a-beagley-ai-pwm-epwm0-gpio15-gpio14.dtbo \
-ti/k3-am67a-beagley-ai-pwm-epwm0-gpio5.dtbo \
-ti/k3-am67a-beagley-ai-pwm-epwm0-gpio5-gpio12.dtbo \
-ti/k3-am67a-beagley-ai-pwm-epwm0-gpio5-gpio14.dtbo \
-ti/k3-am67a-beagley-ai-pwm-epwm1-gpio13.dtbo \
-ti/k3-am67a-beagley-ai-pwm-epwm1-gpio20.dtbo \
-ti/k3-am67a-beagley-ai-pwm-epwm1-gpio21.dtbo \
-ti/k3-am67a-beagley-ai-pwm-epwm1-gpio21-gpio13.dtbo \
-ti/k3-am67a-beagley-ai-pwm-epwm1-gpio21-gpio20.dtbo \
-ti/k3-am67a-beagley-ai-pwm-epwm1-gpio6.dtbo \
-ti/k3-am67a-beagley-ai-pwm-epwm1-gpio6-gpio13.dtbo \
-ti/k3-am67a-beagley-ai-pwm-epwm1-gpio6-gpio20.dtbo \
-ti/k3-am67a-beagley-ai-spi0-1cs.dtbo \
-ti/k3-am67a-beagley-ai-spi0-2cs.dtbo \
-ti/k3-am67a-beagley-ai-spidev0.dtbo \
-ti/k3-am67a-beagley-ai-uart-ttyama0.dtbo \
-ti/k3-j722s-evm-csi2-ov5640.dtbo \
-ti/k3-j722s-evm-csi2-quad-rpi-cam-imx219.dtbo \
-ti/k3-j722s-evm-csi2-quad-tevi-ov5640.dtbo \
-ti/k3-j722s-evm-dsi-rpi-7inch-panel.dtbo \
-ti/k3-j722s-evm.dtb \
-ti/k3-j722s-evm-fpdlink-fusion.dtbo \
-ti/k3-j722s-evm-microtips-mf101hie-panel.dtbo \
-ti/k3-j722s-evm-pwm.dtbo \
-ti/k3-j722s-evm-v3link-fusion.dtbo \
-"
-
-KERNEL_DEVICETREE:bsp-bb_org-6_12 = " \
-ti/k3-am67a-beagley-ai.dtb \
-ti/k3-am67a-beagley-ai-i2c1-400000.dtbo \
-ti/k3-am67a-beagley-ai-i2c1-ads1115.dtbo \
-ti/k3-am67a-beagley-ai-i2c1-rtc-rv3028.dtbo \
-ti/k3-am67a-beagley-ai-i2c1-ssd1306.dtbo \
-ti/k3-am67a-beagley-ai-mikroe-eth.dtbo \
-ti/k3-am67a-beagley-ai-mikroe-microsd.dtbo \
-ti/k3-am67a-beagley-ai-pps-gpio18.dtbo \
-ti/k3-am67a-beagley-ai-pwm-ecap0-gpio12.dtbo \
-ti/k3-am67a-beagley-ai-pwm-ecap1-gpio16.dtbo \
-ti/k3-am67a-beagley-ai-pwm-ecap1-gpio21.dtbo \
-ti/k3-am67a-beagley-ai-pwm-ecap2-gpio17.dtbo \
-ti/k3-am67a-beagley-ai-pwm-ecap2-gpio18.dtbo \
-ti/k3-am67a-beagley-ai-pwm-epwm0-gpio12.dtbo \
-ti/k3-am67a-beagley-ai-pwm-epwm0-gpio14.dtbo \
-ti/k3-am67a-beagley-ai-pwm-epwm0-gpio15.dtbo \
-ti/k3-am67a-beagley-ai-pwm-epwm0-gpio15-gpio12.dtbo \
-ti/k3-am67a-beagley-ai-pwm-epwm0-gpio15-gpio14.dtbo \
-ti/k3-am67a-beagley-ai-pwm-epwm0-gpio5.dtbo \
-ti/k3-am67a-beagley-ai-pwm-epwm0-gpio5-gpio12.dtbo \
-ti/k3-am67a-beagley-ai-pwm-epwm0-gpio5-gpio14.dtbo \
-ti/k3-am67a-beagley-ai-pwm-epwm1-gpio13.dtbo \
-ti/k3-am67a-beagley-ai-pwm-epwm1-gpio20.dtbo \
-ti/k3-am67a-beagley-ai-pwm-epwm1-gpio21.dtbo \
-ti/k3-am67a-beagley-ai-pwm-epwm1-gpio21-gpio13.dtbo \
-ti/k3-am67a-beagley-ai-pwm-epwm1-gpio21-gpio20.dtbo \
-ti/k3-am67a-beagley-ai-pwm-epwm1-gpio6.dtbo \
-ti/k3-am67a-beagley-ai-pwm-epwm1-gpio6-gpio13.dtbo \
-ti/k3-am67a-beagley-ai-pwm-epwm1-gpio6-gpio20.dtbo \
-ti/k3-am67a-beagley-ai-spi0-1cs.dtbo \
-ti/k3-am67a-beagley-ai-spi0-2cs.dtbo \
-ti/k3-am67a-beagley-ai-spidev0.dtbo \
-ti/k3-am67a-beagley-ai-uart-ttyama0.dtbo \
-ti/k3-j722s-evm-csi2-quad-rpi-cam-imx219.dtbo \
-ti/k3-j722s-evm-csi2-quad-tevi-ov5640.dtbo \
-ti/k3-j722s-evm-dsi-rpi-7inch-panel.dtbo \
-ti/k3-j722s-evm.dtb \
-ti/k3-j722s-evm-fpdlink-fusion.dtbo \
-ti/k3-j722s-evm-fpdlink-iv-fusion.dtbo \
-ti/k3-j722s-evm-microtips-mf101hie-panel.dtbo \
-ti/k3-j722s-evm-pwm.dtbo \
-ti/k3-j722s-evm-v3link-fusion.dtbo \
-"
-
-MACHINE_GUI_CLASS = "bigscreen"

meta-beagle/conf/machine/include/beagle-bsp.inc

@@ -1,47 +0,0 @@
-# Use meta-ti-bsp "multi-BSP" facility to create a custom "bb_org" BSP profile
-# with default preferences for Beagle platforms
-
-# Default is bb_org-6_12, but can override with any of the existing options
-TI_PREFERRED_BSP ?= "bb_org-6_12"
-
-# ===========
-# bb_org-6_12
-# BeagleBoard.org kernel 6.12, u-boot 2025.04
-# based on TI staging trees with extra Beagle-specific features
-# but may not be up-to-date with TI version
-# ===========
-BSP_KERNEL_PROVIDER:bsp-bb_org-6_12 = "linux-bb.org"
-BSP_KERNEL_VERSION:bsp-bb_org-6_12 = "6.12.%"
-BSP_BOOTLOADER_PROVIDER:bsp-bb_org-6_12 = "u-boot-bb.org"
-BSP_BOOTLOADER_VERSION:bsp-bb_org-6_12 = "2025.%"
-KERNEL_DEVICETREE_PREFIX:bsp-bb_org-6_12 = ""
-
-BSP_SGX_DRIVER_PROVIDER:bsp-bb_org-6_12 = "ti-sgx-ddk-km"
-BSP_SGX_DRIVER_VERSION:bsp-bb_org-6_12 = "1.17%"
-BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org-6_12 = "ti-img-rogue-driver"
-BSP_ROGUE_DRIVER_VERSION:bsp-bb_org-6_12 = "25%"
-BSP_MESA_PVR_VERSION:bsp-bb_org-6_12 = "24%"
-
-# GC320 support requires out-of-tree drivers not yet available in bb.org 6.12
-MACHINE_FEATURES:remove:bsp-bb_org-6_12 = "gc320"
-
-# ==========
-# bb_org-6_6
-# BeagleBoard.org kernel 6.6, u-boot 2024.10
-# based on TI staging trees with extra Beagle-specific features
-# but may not be up-to-date with TI version
-# ==========
-BSP_KERNEL_PROVIDER:bsp-bb_org-6_6 = "linux-bb.org"
-BSP_KERNEL_VERSION:bsp-bb_org-6_6 = "6.6.%"
-BSP_BOOTLOADER_PROVIDER:bsp-bb_org-6_6 = "u-boot-bb.org"
-BSP_BOOTLOADER_VERSION:bsp-bb_org-6_6 = "2024.%"
-KERNEL_DEVICETREE_PREFIX:bsp-bb_org-6_6 = ""
-
-BSP_SGX_DRIVER_PROVIDER:bsp-bb_org-6_6 = "ti-sgx-ddk-km"
-BSP_SGX_DRIVER_VERSION:bsp-bb_org-6_6 = "1.17%"
-BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org-6_6 = "ti-img-rogue-driver"
-BSP_ROGUE_DRIVER_VERSION:bsp-bb_org-6_6 = "25%"
-BSP_MESA_PVR_VERSION:bsp-bb_org-6_6 = "24%"
-
-# GC320 support requires out-of-tree drivers not yet available in bb.org 6.6
-MACHINE_FEATURES:remove:bsp-bb_org-6_6 = "gc320"

meta-beagle/conf/machine/pocketbeagle2-k3r5.conf

@@ -1,8 +0,0 @@
-#@TYPE: Machine
-#@NAME: PocketBeagle2 (R5F)
-#@DESCRIPTION: Machine configuration for the PocketBeagle2 (R5F core)
-
-require conf/machine/include/k3r5.inc
-require conf/machine/include/beagle-bsp.inc
-
-UBOOT_MACHINE = "am62_pocketbeagle2_r5_defconfig"

meta-beagle/conf/machine/pocketbeagle2.conf

@@ -1,58 +0,0 @@
-#@TYPE: Machine
-#@NAME: PocketBeagle2 (A53)
-#@DESCRIPTION: Machine configuration for the PocketBeagle2 board (A53 core)
-
-require conf/machine/include/k3.inc
-require conf/machine/include/mc_k3r5.inc
-
-require conf/machine/include/beagle-bsp.inc
-
-SOC_FAMILY:append = ":am62xx"
-
-SERIAL_CONSOLES = "115200;ttyS2"
-
-TFA_BOARD = "lite"
-TFA_K3_SYSTEM_SUSPEND = "1"
-
-OPTEEMACHINE = "k3-am62x"
-
-UBOOT_MACHINE = "am62_pocketbeagle2_a53_defconfig"
-
-KERNEL_DEVICETREE_PREFIX = " \
-    ti/k3-am6232 \
-    ti/k3-am62-pocket \
-"
-
-KERNEL_DEVICETREE = " \
-ti/k3-am6232-pocketbeagle2.dtb \
-ti/k3-am6232-pocketbeagle2-techlab-cape.dtbo \
-ti/k3-am625-beagleplay-bcfserial-no-firmware.dtbo \
-ti/k3-am625-beagleplay-csi2-ov5640.dtbo \
-ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \
-ti/k3-am625-beagleplay.dtb \
-ti/k3-am625-beagleplay-lincolntech-lcd185-panel.dtbo \
-ti/k3-am625-sk.dtb \
-ti/k3-am625-sk-lincolntech-lcd185-panel.dtbo \
-ti/k3-am625-sk-m2-cc3351.dtbo \
-ti/k3-am625-sk-mcspi-loopback.dtbo \
-ti/k3-am625-sk-microtips-mf101hie-panel.dtbo \
-ti/k3-am625-sk-rpi-hdr-ehrpwm.dtbo \
-ti/k3-am62-pocketbeagle2-ardupilot-cape.dtbo \
-ti/k3-am62-pocketbeagle2.dtb \
-ti/k3-am62-pocketbeagle2-leds-off.dtbo \
-ti/k3-am62-pocketbeagle2-techlab-cape.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-dmtimer-pwm.dtbo \
-ti/k3-am62x-sk-ecap-capture.dtbo \
-ti/k3-am62x-sk-eqep.dtbo \
-ti/k3-am62x-sk-fastboot-disable-hdmi.dtbo \
-ti/k3-am62x-sk-hdmi-audio.dtbo \
-ti/k3-am62x-sk-lpm-io-ddr-wkup-sources.dtbo \
-ti/k3-am62x-sk-lpm-wkup-sources.dtbo \
-ti/k3-am62x-sk-mcan.dtbo \
-ti/k3-am62x-sk-microtips-mf103hie-lcd2.dtbo \
-ti/k3-am62x-sk-pwm.dtbo \
-"

meta-beagle/recipes-bsp/u-boot/u-boot-bb.org-2025.10+git/bootcmd-ti-mmc.cfg

@@ -1 +0,0 @@
-CONFIG_BOOTCOMMAND="run bootcmd_ti_mmc"

meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2024.10.bb

@@ -1,14 +0,0 @@
-require recipes-bsp/u-boot/u-boot-ti.inc
-
-SUMMARY = "BeagleBoard.org U-Boot"
-
-COMPATIBLE_MACHINE = "beagle.*"
-
-PV = "2024.10"
-
-SRC_URI += "file://0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch"
-
-UBOOT_GIT_URI = "git://github.com/beagleboard/u-boot.git"
-UBOOT_GIT_PROTOCOL = "https"
-BRANCH = "v2024.10-Beagle"
-SRCREV = "bf0e9d0b7274d2b561bd24c858affec2038250f9"

meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2025.10.bb

@@ -1,19 +0,0 @@
-require recipes-bsp/u-boot/u-boot-ti.inc
-
-SUMMARY = "BeagleBoard.org U-Boot"
-
-COMPATIBLE_MACHINE = "pocketbeagle2|beagle.*"
-
-PV = "2025.10"
-
-UBOOT_GIT_URI = "git://github.com/beagleboard/u-boot.git"
-UBOOT_GIT_PROTOCOL = "https"
-BRANCH = "v2025.10-Beagle"
-SRCREV = "6825d60bea17774358f4199c4c7062801cfb931e"
-
-BRANCH:pocketbeagle2 = "v2025.10-am62-pocketbeagle2"
-BRANCH:pocketbeagle2-k3r5 = "v2025.10-am62-pocketbeagle2"
-SRCREV:pocketbeagle2 = "4e0b6294a1185029d34eff6ed91f3ad1734b643f"
-SRCREV:pocketbeagle2-k3r5 = "4e0b6294a1185029d34eff6ed91f3ad1734b643f"
-
-SRC_URI:append:pocketbeagle2 = " file://bootcmd-ti-mmc.cfg"

meta-beagle/recipes-kernel/linux/linux-bb.org-6.6/defconfig

@@ -1 +0,0 @@
-use-kernel-config=bb.org_defconfig

meta-beagle/recipes-kernel/linux/linux-bb.org-6.6/no-fortify.cfg

@@ -1 +0,0 @@
-CONFIG_FORTIFY_SOURCE=n

meta-beagle/recipes-kernel/linux/linux-bb.org_6.12.bb

@@ -1,67 +0,0 @@
-# Look in the generic major.minor directory for files
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.12:"
-
-SECTION = "kernel"
-SUMMARY = "BeagleBoard.org Linux kernel"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-
-COMPATIBLE_MACHINE = "pocketbeagle2|beagle.*"
-
-inherit kernel
-
-require recipes-kernel/linux/setup-defconfig.inc
-require recipes-kernel/linux/ti-kernel.inc
-
-DEPENDS += "gmp-native libmpc-native"
-
-KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
-
-# Extra DT overlays/capes
-KERNEL_DEVICETREE:append:armv7a = " \
-    ti/omap/BB-ADC-00A0.dtbo \
-    ti/omap/BB-BBBW-WL1835-00A0.dtbo \
-    ti/omap/BB-BBGG-WL1835-00A0.dtbo \
-    ti/omap/BB-BBGW-WL1835-00A0.dtbo \
-    ti/omap/BB-BONE-4D5R-01-00A1.dtbo \
-    ti/omap/BB-BONE-eMMC1-01-00A0.dtbo \
-    ti/omap/BB-BONE-LCD4-01-00A1.dtbo \
-    ti/omap/BB-BONE-NH7C-01-A0.dtbo \
-    ti/omap/BB-CAPE-DISP-CT4-00A0.dtbo \
-    ti/omap/BB-HDMI-TDA998x-00A0.dtbo \
-    ti/omap/BB-I2C1-MCP7940X-00A0.dtbo \
-    ti/omap/BB-I2C1-RTC-DS3231.dtbo \
-    ti/omap/BB-I2C1-RTC-PCF8563.dtbo \
-    ti/omap/BB-I2C2-BME680.dtbo \
-    ti/omap/BB-I2C2-MPU6050.dtbo \
-    ti/omap/BB-LCD-ADAFRUIT-24-SPI1-00A0.dtbo \
-    ti/omap/BB-NHDMI-TDA998x-00A0.dtbo \
-    ti/omap/BBORG_COMMS-00A2.dtbo \
-    ti/omap/BBORG_FAN-A000.dtbo \
-    ti/omap/BBORG_RELAY-00A2.dtbo \
-    ti/omap/BB-SPIDEV0-00A0.dtbo \
-    ti/omap/BB-SPIDEV1-00A0.dtbo \
-    ti/omap/BB-UART1-00A0.dtbo \
-    ti/omap/BB-UART2-00A0.dtbo \
-    ti/omap/BB-UART4-00A0.dtbo \
-    ti/omap/BB-W1-P9.12-00A0.dtbo \
-    ti/omap/BONE-ADC.dtbo \
-    ti/omap/M-BB-BBG-00A0.dtbo \
-    ti/omap/M-BB-BBGG-00A0.dtbo \
-    ti/omap/PB-MIKROBUS-0.dtbo \
-    ti/omap/PB-MIKROBUS-1.dtbo \
-"
-
-S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}"
-
-# 6.12.34 version for 32-bit
-SRCREV:armv7a = "9e419b26243bd7efcd103ae0f6456f828592b34b"
-PV:armv7a = "6.12.34+git"
-BRANCH:armv7a = "v6.12.34-ti-arm32-r12"
-
-# 6.12.43 version for 64-bit
-SRCREV:aarch64 = "84c4b4613a852db269620a3fdfed65de90569fa1"
-PV:aarch64 = "6.12.43+git"
-BRANCH:aarch64 = "v6.12.43-ti-arm64-r54"
-
-KERNEL_GIT_URI = "git://github.com/beagleboard/linux.git"

meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb

@@ -1,71 +0,0 @@
-# Look in the generic major.minor directory for files
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.6:"
-
-SECTION = "kernel"
-SUMMARY = "BeagleBoard.org Linux kernel"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-
-COMPATIBLE_MACHINE = "beagle.*"
-
-inherit kernel
-
-require recipes-kernel/linux/setup-defconfig.inc
-require recipes-kernel/linux/ti-kernel.inc
-
-DEPENDS += "gmp-native libmpc-native"
-
-KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
-
-# Extra DT overlays/capes
-KERNEL_DEVICETREE:append:armv7a = " \
-    ti/omap/AM335X-PRU-UIO-00A0.dtbo \
-    ti/omap/BB-ADC-00A0.dtbo \
-    ti/omap/BB-BBBW-WL1835-00A0.dtbo \
-    ti/omap/BB-BBGG-WL1835-00A0.dtbo \
-    ti/omap/BB-BBGW-WL1835-00A0.dtbo \
-    ti/omap/BB-BONE-4D5R-01-00A1.dtbo \
-    ti/omap/BB-BONE-eMMC1-01-00A0.dtbo \
-    ti/omap/BB-BONE-LCD4-01-00A1.dtbo \
-    ti/omap/BB-BONE-NH7C-01-A0.dtbo \
-    ti/omap/BB-CAPE-DISP-CT4-00A0.dtbo \
-    ti/omap/BB-HDMI-TDA998x-00A0.dtbo \
-    ti/omap/BB-I2C1-MCP7940X-00A0.dtbo \
-    ti/omap/BB-I2C1-RTC-DS3231.dtbo \
-    ti/omap/BB-I2C1-RTC-PCF8563.dtbo \
-    ti/omap/BB-I2C2-BME680.dtbo \
-    ti/omap/BB-I2C2-MPU6050.dtbo \
-    ti/omap/BB-LCD-ADAFRUIT-24-SPI1-00A0.dtbo \
-    ti/omap/BB-NHDMI-TDA998x-00A0.dtbo \
-    ti/omap/BBORG_COMMS-00A2.dtbo \
-    ti/omap/BBORG_FAN-A000.dtbo \
-    ti/omap/BBORG_RELAY-00A2.dtbo \
-    ti/omap/BB-SPIDEV0-00A0.dtbo \
-    ti/omap/BB-SPIDEV1-00A0.dtbo \
-    ti/omap/BB-UART1-00A0.dtbo \
-    ti/omap/BB-UART2-00A0.dtbo \
-    ti/omap/BB-UART4-00A0.dtbo \
-    ti/omap/BB-W1-P9.12-00A0.dtbo \
-    ti/omap/BONE-ADC.dtbo \
-    ti/omap/M-BB-BBG-00A0.dtbo \
-    ti/omap/M-BB-BBGG-00A0.dtbo \
-    ti/omap/PB-MIKROBUS-0.dtbo \
-    ti/omap/PB-MIKROBUS-1.dtbo \
-"
-
-S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}"
-
-# 6.6.58 version for 32-bit
-SRCREV:armv7a = "3d519995234675748a38b1e3bc087baa03e3ac25"
-PV:armv7a = "6.6.58+git"
-BRANCH:armv7a = "v6.6.58-ti-arm32-r12"
-
-# 6.6.58 version for 64-bit
-SRCREV:aarch64 = "1de9481cd5749807550148086aea959295bd11db"
-PV:aarch64 = "6.6.58+git"
-BRANCH:aarch64 = "v6.6.58-ti-arm64-r30"
-
-KERNEL_GIT_URI = "git://github.com/beagleboard/linux.git"
-
-SRC_URI += "file://no-fortify.cfg"
-KERNEL_CONFIG_FRAGMENTS += "${UNPACKDIR}/no-fortify.cfg"

meta-ti-bsp/README

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

meta-ti-bsp/SECURITY

@@ -1,20 +0,0 @@
-How to Report a Potential Vulnerability?
-========================================
-
-If you would like to report a public issue (for example, one with a released
-CVE number), please report it to the mailing list:
-
-  https://lists.yoctoproject.org/g/meta-ti
-
-If you are dealing with a not-yet released or urgent issue, please send a
-message to one of the maintainers listed in the README.  Include as many
-details as possible:
-  - the layer or software module affected
-  - the recipe and its version
-  - any example code, if available
-
-Branches maintained with security fixes
----------------------------------------
-
-See https://wiki.yoctoproject.org/wiki/Releases for the list of current
-releases.  We only accept patches for the LTS releases and the master branch.

meta-ti-bsp/classes/kernel-fitimage-legacyhs.bbclass

@@ -1,4 +1,4 @@
-inherit ti-secdev kernel-uboot-legacyhs uboot-sign-legacyhs
+inherit ti-secdev kernel-uboot uboot-sign-legacyhs
 
 FITIMAGE_HASH_ALGO ?= "sha1"
 FITIMAGE_PACK_TEE ?= "0"
@@ -316,7 +316,6 @@ EOF
 # $4 ... ramdisk ID
 # $5 ... config ID
 # $6 ... tee ID/name
-# $7 ... default DTB ID
 fitimage_emit_section_config() {
 
 	conf_csum=${FITIMAGE_HASH_ALGO}
@@ -371,16 +370,6 @@ fitimage_emit_section_config() {
 		final_conf_desc="${conf_desc}"
 	fi
 
-	default_dtb_count=${7}
-	if [ "x${FITIMAGE_CONF_BY_NAME}" = "x1" ] ; then
-		default_conf_name="${FIT_CONF_DEFAULT_DTB}"
-	else
-		default_conf_name="conf-${default_dtb_count}"
-	fi
-	cat << EOF >> ${1}
-        default = "${default_conf_name}";
-EOF
-
 	dtbcount=1
 	for DTB in ${KERNEL_DEVICETREE}; do
 		DTB=$(basename "${DTB}")
@@ -397,6 +386,12 @@ EOF
 			fdt_line="fdt = \"fdt-${dtbcount}\";"
 		fi
 
+		if [ "x${dtbcount}" = "x1" ]; then
+			cat << EOF >> ${1}
+                default = "${conf_name}";
+EOF
+		fi
+
 # Generate a single configuration section
 			cat << EOF >> ${1}
                 ${conf_name} {
@@ -529,7 +524,6 @@ fitimage_assemble() {
 	ramdiskcount=${3}
 	setupcount=""
 	teecount=1
-	default_dtb_count=1
 	rm -f ${1} arch/${ARCH}/boot/${2}
 
 	fitimage_emit_fit_header ${1}
@@ -550,9 +544,6 @@ fitimage_assemble() {
 		dtbcount=1
 		dtboaddress="${UBOOT_DTBO_LOADADDRESS}"
 		for DTB in ${KERNEL_DEVICETREE}; do
-			if [ "${DTB}" = "${FIT_CONF_DEFAULT_DTB}" ]; then
-				default_dtb_count=${dtbcount}
-			fi
 			if echo ${DTB} | grep -q '/dts/'; then
 				bbwarn "${DTB} contains the full path to the the dts file, but only the dtb name should be used."
 				DTB=`basename ${DTB} | sed 's,\.dts$,.dtb,g'`
@@ -669,7 +660,7 @@ fitimage_assemble() {
 	else
 		teeref="${teecount}"
 	fi
-	fitimage_emit_section_config ${1} "${kernelcount}" "${dtbref}" "${ramdiskcount}" "${setupcount}" "${teeref}" "${default_dtb_count}"
+	fitimage_emit_section_config ${1} "${kernelcount}" "${dtbref}" "${ramdiskcount}" "${setupcount}" "${teeref}"
 
 	fitimage_emit_section_maint ${1} sectend
 

meta-ti-bsp/classes/kernel-uboot-legacyhs.bbclass

@@ -1,51 +0,0 @@
-#
-# Copyright OpenEmbedded Contributors
-#
-# SPDX-License-Identifier: MIT
-#
-
-# fitImage kernel compression algorithm
-FIT_KERNEL_COMP_ALG ?= "gzip"
-FIT_KERNEL_COMP_ALG_EXTENSION ?= ".gz"
-
-# Kernel image type passed to mkimage (i.e. kernel kernel_noload...)
-UBOOT_MKIMAGE_KERNEL_TYPE ?= "kernel"
-
-uboot_prep_kimage() {
-	if [ -e arch/${ARCH}/boot/compressed/vmlinux ]; then
-		vmlinux_path="arch/${ARCH}/boot/compressed/vmlinux"
-		linux_suffix=""
-		linux_comp="none"
-	elif [ -e arch/${ARCH}/boot/vmlinuz.bin ]; then
-		rm -f linux.bin
-		cp -l arch/${ARCH}/boot/vmlinuz.bin linux.bin
-		vmlinux_path=""
-		linux_suffix=""
-		linux_comp="none"
-	else
-		vmlinux_path="vmlinux"
-		# Use vmlinux.initramfs for linux.bin when INITRAMFS_IMAGE_BUNDLE set
-		# As per the implementation in kernel.bbclass.
-		# See do_bundle_initramfs function
-		if [ "${INITRAMFS_IMAGE_BUNDLE}" = "1" ] && [ -e vmlinux.initramfs ]; then
-			vmlinux_path="vmlinux.initramfs"
-		fi
-		linux_suffix="${FIT_KERNEL_COMP_ALG_EXTENSION}"
-		linux_comp="${FIT_KERNEL_COMP_ALG}"
-	fi
-
-	[ -n "${vmlinux_path}" ] && ${KERNEL_OBJCOPY} -O binary -R .note -R .comment -S "${vmlinux_path}" linux.bin
-
-	if [ "${linux_comp}" != "none" ] ; then
-		if [ "${linux_comp}" = "gzip" ] ; then
-			gzip -9 linux.bin
-		elif [ "${linux_comp}" = "lzo" ] ; then
-			lzop -9 linux.bin
-		elif [ "${linux_comp}" = "lzma" ] ; then
-			xz --format=lzma -f -6 linux.bin
-		fi
-		mv -f "linux.bin${linux_suffix}" linux.bin
-	fi
-
-	echo "${linux_comp}"
-}

meta-ti-bsp/classes/kernel_legacyhs.bbclass

@@ -1,870 +0,0 @@
-#
-# Copyright OpenEmbedded Contributors
-#
-# SPDX-License-Identifier: MIT
-#
-
-inherit linux-kernel-base kernel-module-split
-
-COMPATIBLE_HOST = ".*-linux"
-
-KERNEL_PACKAGE_NAME ??= "kernel"
-KERNEL_DEPLOYSUBDIR ??= "${@ "" if (d.getVar("KERNEL_PACKAGE_NAME") == "kernel") else d.getVar("KERNEL_PACKAGE_NAME") }"
-
-PROVIDES += "virtual/kernel"
-DEPENDS += "virtual/cross-binutils virtual/cross-cc kmod-native bc-native bison-native"
-DEPENDS += "${@bb.utils.contains("INITRAMFS_FSTYPES", "cpio.lzo", "lzop-native", "", d)}"
-DEPENDS += "${@bb.utils.contains("INITRAMFS_FSTYPES", "cpio.lz4", "lz4-native", "", d)}"
-DEPENDS += "${@bb.utils.contains("INITRAMFS_FSTYPES", "cpio.zst", "zstd-native", "", d)}"
-PACKAGE_WRITE_DEPS += "depmodwrapper-cross"
-
-do_deploy[depends] += "depmodwrapper-cross:do_populate_sysroot gzip-native:do_populate_sysroot"
-do_clean[depends] += "make-mod-scripts:do_clean"
-
-# CPE entries from NVD use linux_kernel, but the raw CVE entries from the kernel CNA have
-# vendor: linux and product: linux. Note that multiple distributions use "linux" as a product
-# name, so we need to fill vendor to avoid false positives
-CVE_PRODUCT ?= "linux_kernel linux:linux"
-
-S = "${STAGING_KERNEL_DIR}"
-B = "${WORKDIR}/build"
-KBUILD_OUTPUT = "${B}"
-OE_TERMINAL_EXPORTS += "KBUILD_OUTPUT"
-
-# we include gcc above, we dont need virtual/libc
-INHIBIT_DEFAULT_DEPS = "1"
-
-KERNEL_IMAGETYPE ?= "zImage"
-INITRAMFS_IMAGE ?= ""
-INITRAMFS_TASK ?= ""
-INITRAMFS_IMAGE_BUNDLE ?= ""
-INITRAMFS_DEPLOY_DIR_IMAGE ?= "${DEPLOY_DIR_IMAGE}"
-INITRAMFS_MULTICONFIG ?= ""
-
-# KERNEL_VERSION is extracted from source code. It is evaluated as
-# None for the first parsing, since the code has not been fetched.
-# After the code is fetched, it will be evaluated as real version
-# number and cause kernel to be rebuilt. To avoid this, make
-# KERNEL_VERSION_NAME and KERNEL_VERSION_PKG_NAME depend on
-# LINUX_VERSION which is a constant.
-KERNEL_VERSION_NAME = "${@d.getVar('KERNEL_VERSION') or ""}"
-KERNEL_VERSION_NAME[vardepvalue] = "${LINUX_VERSION}"
-KERNEL_VERSION_PKG_NAME = "${@legitimize_package_name(d.getVar('KERNEL_VERSION'))}"
-KERNEL_VERSION_PKG_NAME[vardepvalue] = "${LINUX_VERSION}"
-
-python __anonymous () {
-    pn = d.getVar("PN")
-    kpn = d.getVar("KERNEL_PACKAGE_NAME")
-
-    # XXX Remove this after bug 11905 is resolved
-    #  FILES:${KERNEL_PACKAGE_NAME}-dev doesn't expand correctly
-    if kpn == pn:
-        bb.warn("Some packages (E.g. *-dev) might be missing due to "
-                "bug 11905 (variable KERNEL_PACKAGE_NAME == PN)")
-
-    # The default kernel recipe builds in a shared location defined by
-    # bitbake/distro confs: STAGING_KERNEL_DIR and STAGING_KERNEL_BUILDDIR.
-    # Set these variables to directories under ${WORKDIR} in alternate
-    # kernel recipes (I.e. where KERNEL_PACKAGE_NAME != kernel) so that they
-    # may build in parallel with the default kernel without clobbering.
-    if kpn != "kernel":
-        workdir = d.getVar("WORKDIR")
-        sourceDir = os.path.join(workdir, 'kernel-source')
-        artifactsDir = os.path.join(workdir, 'kernel-build-artifacts')
-        d.setVar("STAGING_KERNEL_DIR", sourceDir)
-        d.setVar("STAGING_KERNEL_BUILDDIR", artifactsDir)
-
-    # Merge KERNEL_IMAGETYPE and KERNEL_ALT_IMAGETYPE into KERNEL_IMAGETYPES
-    type = d.getVar('KERNEL_IMAGETYPE') or ""
-    alttype = d.getVar('KERNEL_ALT_IMAGETYPE') or ""
-    types = d.getVar('KERNEL_IMAGETYPES') or ""
-    if type not in types.split():
-        types = (type + ' ' + types).strip()
-    if alttype not in types.split():
-        types = (alttype + ' ' + types).strip()
-    d.setVar('KERNEL_IMAGETYPES', types)
-
-    # KERNEL_IMAGETYPES may contain a mixture of image types supported directly
-    # by the kernel build system and types which are created by post-processing
-    # the output of the kernel build system (e.g. compressing vmlinux ->
-    # vmlinux.gz in kernel_legacyhs_do_transform_kernel()).
-    # KERNEL_IMAGETYPE_FOR_MAKE should contain only image types supported
-    # directly by the kernel build system.
-    if not d.getVar('KERNEL_IMAGETYPE_FOR_MAKE'):
-        typeformake = set()
-        for type in types.split():
-            if type == 'vmlinux.gz':
-                type = 'vmlinux'
-            typeformake.add(type)
-
-        d.setVar('KERNEL_IMAGETYPE_FOR_MAKE', ' '.join(sorted(typeformake)))
-
-    kname = d.getVar('KERNEL_PACKAGE_NAME') or "kernel"
-    imagedest = d.getVar('KERNEL_IMAGEDEST')
-
-    for type in types.split():
-        if bb.data.inherits_class('nopackages', d):
-            continue
-        typelower = type.lower()
-        d.appendVar('PACKAGES', ' %s-image-%s' % (kname, typelower))
-        d.setVar('FILES:' + kname + '-image-' + typelower, '/' + imagedest + '/' + type + '-${KERNEL_VERSION_NAME}' + ' /' + imagedest + '/' + type)
-        d.appendVar('RDEPENDS:%s-image' % kname, ' %s-image-%s (= ${EXTENDPKGV})' % (kname, typelower))
-        splitmods = d.getVar("KERNEL_SPLIT_MODULES")
-        if splitmods != '1':
-            d.appendVar('RDEPENDS:%s-image' % kname, ' %s-modules (= ${EXTENDPKGV})' % kname)
-            d.appendVar('RDEPENDS:%s-image-%s' % (kname, typelower), ' %s-modules-${KERNEL_VERSION_PKG_NAME} (= ${EXTENDPKGV})' % kname)
-            d.setVar('PKG:%s-modules' % kname, '%s-modules-${KERNEL_VERSION_PKG_NAME}' % kname)
-            d.appendVar('RPROVIDES:%s-modules' % kname, ' %s-modules-${KERNEL_VERSION_PKG_NAME}' % kname)
-
-        d.setVar('PKG:%s-image-%s' % (kname,typelower), '%s-image-%s-${KERNEL_VERSION_PKG_NAME}' % (kname, typelower))
-        d.setVar('ALLOW_EMPTY:%s-image-%s' % (kname, typelower), '1')
-
-        if d.getVar('KERNEL_IMAGETYPE_SYMLINK') == '1':
-            d.prependVar('pkg_postinst:%s-image-%s' % (kname,typelower), """set +e
-if [ -n "$D" ]; then
-    ln -sf %s-${KERNEL_VERSION} $D/${KERNEL_IMAGEDEST}/%s > /dev/null 2>&1
-else
-    ln -sf %s-${KERNEL_VERSION} ${KERNEL_IMAGEDEST}/%s > /dev/null 2>&1
-    if [ $? -ne 0 ]; then
-        echo "Filesystem on ${KERNEL_IMAGEDEST}/ doesn't support symlinks, falling back to copied image (%s)."
-        install -m 0644 ${KERNEL_IMAGEDEST}/%s-${KERNEL_VERSION} ${KERNEL_IMAGEDEST}/%s
-    fi
-fi
-set -e
-""" % (type, type, type, type, type, type, type))
-            d.setVar('pkg_postrm:%s-image-%s' % (kname,typelower), """set +e
-if [ -f "${KERNEL_IMAGEDEST}/%s" -o -L "${KERNEL_IMAGEDEST}/%s" ]; then
-    rm -f ${KERNEL_IMAGEDEST}/%s  > /dev/null 2>&1
-fi
-set -e
-""" % (type, type, type))
-
-
-    image = d.getVar('INITRAMFS_IMAGE')
-    # If the INTIRAMFS_IMAGE is set but the INITRAMFS_IMAGE_BUNDLE is set to 0,
-    # the do_bundle_initramfs does nothing, but the INITRAMFS_IMAGE is built
-    # standalone for use by wic and other tools.
-    if image:
-        if d.getVar('INITRAMFS_MULTICONFIG'):
-            d.appendVarFlag('do_bundle_initramfs', 'mcdepends', ' mc:${BB_CURRENT_MC}:${INITRAMFS_MULTICONFIG}:${INITRAMFS_IMAGE}:do_image_complete')
-        else:
-            d.appendVarFlag('do_bundle_initramfs', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete')
-    if image and bb.utils.to_boolean(d.getVar('INITRAMFS_IMAGE_BUNDLE')):
-        bb.build.addtask('do_transform_bundled_initramfs', 'do_deploy', 'do_bundle_initramfs', d)
-
-    # NOTE: setting INITRAMFS_TASK is for backward compatibility
-    #       The preferred method is to set INITRAMFS_IMAGE, because
-    #       this INITRAMFS_TASK has circular dependency problems
-    #       if the initramfs requires kernel modules
-    image_task = d.getVar('INITRAMFS_TASK')
-    if image_task:
-        d.appendVarFlag('do_configure', 'depends', ' ${INITRAMFS_TASK}')
-}
-
-# Here we pull in all various kernel image types which we support.
-#
-# In case you're wondering why kernel.bbclass inherits the other image
-# types instead of the other way around, the reason for that is to
-# maintain compatibility with various currently existing meta-layers.
-# By pulling in the various kernel image types here, we retain the
-# original behavior of kernel.bbclass, so no meta-layers should get
-# broken.
-#
-# KERNEL_CLASSES by default pulls in kernel-uimage.bbclass, since this
-# used to be the default behavior when only uImage was supported. This
-# variable can be appended by users who implement support for new kernel
-# image types.
-
-KERNEL_CLASSES ?= " kernel-uimage "
-inherit_defer ${KERNEL_CLASSES}
-
-# Old style kernels may set ${S} = ${WORKDIR}/git for example
-# We need to move these over to STAGING_KERNEL_DIR. We can't just
-# create the symlink in advance as the git fetcher can't cope with
-# the symlink.
-do_unpack[cleandirs] += " ${S} ${STAGING_KERNEL_DIR} ${B} ${STAGING_KERNEL_BUILDDIR}"
-do_clean[cleandirs] += " ${S} ${STAGING_KERNEL_DIR} ${B} ${STAGING_KERNEL_BUILDDIR}"
-python do_symlink_kernsrc () {
-    s = d.getVar("S")
-    kernsrc = d.getVar("STAGING_KERNEL_DIR")
-    if s != kernsrc:
-        bb.utils.mkdirhier(kernsrc)
-        bb.utils.remove(kernsrc, recurse=True)
-        if s[-1] == '/':
-            # drop trailing slash, so that os.symlink(kernsrc, s) doesn't use s as
-            # directory name and fail
-            s = s[:-1]
-        if d.getVar("EXTERNALSRC"):
-            # With EXTERNALSRC S will not be wiped so we can symlink to it
-            os.symlink(s, kernsrc)
-        else:
-            import shutil
-            shutil.move(s, kernsrc)
-            os.symlink(kernsrc, s)
-}
-# do_patch is normally ordered before do_configure, but
-# externalsrc.bbclass deletes do_patch, breaking the dependency of
-# do_configure on do_symlink_kernsrc.
-addtask symlink_kernsrc before do_patch do_configure after do_unpack
-
-inherit kernel-arch deploy
-
-PACKAGES_DYNAMIC += "^${KERNEL_PACKAGE_NAME}-module-.*"
-PACKAGES_DYNAMIC += "^${KERNEL_PACKAGE_NAME}-image-.*"
-PACKAGES_DYNAMIC += "^${KERNEL_PACKAGE_NAME}-firmware-.*"
-
-export OS = "${TARGET_OS}"
-export CROSS_COMPILE = "${TARGET_PREFIX}"
-
-KERNEL_RELEASE ?= "${KERNEL_VERSION}"
-
-# The directory where built kernel lies in the kernel tree
-KERNEL_OUTPUT_DIR ?= "arch/${ARCH}/boot"
-KERNEL_IMAGEDEST ?= "boot"
-KERNEL_DTBDEST ?= "${KERNEL_IMAGEDEST}"
-KERNEL_DTBVENDORED ?= "0"
-
-#
-# configuration
-#
-KERNEL_VERSION = "${@get_kernelversion_headers('${B}')}"
-
-# kernels are generally machine specific
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-# U-Boot support
-UBOOT_ENTRYPOINT ?= "0x20008000"
-UBOOT_LOADADDRESS ?= "${UBOOT_ENTRYPOINT}"
-
-# Some Linux kernel configurations need additional parameters on the command line
-KERNEL_EXTRA_ARGS ?= ""
-
-EXTRA_OEMAKE += ' CC="${KERNEL_CC}" LD="${KERNEL_LD}" OBJCOPY="${KERNEL_OBJCOPY}" STRIP="${KERNEL_STRIP}"'
-EXTRA_OEMAKE += ' HOSTCC="${BUILD_CC}" HOSTCFLAGS="${BUILD_CFLAGS}" HOSTLDFLAGS="${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}"'
-EXTRA_OEMAKE += ' HOSTCXX="${BUILD_CXX}" HOSTCXXFLAGS="${BUILD_CXXFLAGS}"'
-# Only for newer kernels (5.19+), native pkg-config variables are set for older kernels when building kernel and modules
-EXTRA_OEMAKE += ' HOSTPKG_CONFIG="pkg-config-native"'
-
-KERNEL_ALT_IMAGETYPE ??= ""
-
-copy_initramfs() {
-	echo "Copying initramfs into ./usr ..."
-	# In case the directory is not created yet from the first pass compile:
-	mkdir -p ${B}/usr
-	# Find and use the first initramfs image archive type we find
-	rm -f ${B}/usr/${INITRAMFS_IMAGE_NAME}.cpio
-	for img in cpio cpio.gz cpio.lz4 cpio.lzo cpio.lzma cpio.xz cpio.zst; do
-		if [ -e "${INITRAMFS_DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE_NAME}.$img" ]; then
-			cp ${INITRAMFS_DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE_NAME}.$img ${B}/usr/.
-			case $img in
-			*gz)
-				echo "gzip decompressing image"
-				gunzip -f ${B}/usr/${INITRAMFS_IMAGE_NAME}.$img
-				break
-				;;
-			*lz4)
-				echo "lz4 decompressing image"
-				lz4 -df ${B}/usr/${INITRAMFS_IMAGE_NAME}.$img ${B}/usr/${INITRAMFS_IMAGE_NAME}.cpio
-				break
-				;;
-			*lzo)
-				echo "lzo decompressing image"
-				lzop -df ${B}/usr/${INITRAMFS_IMAGE_NAME}.$img
-				break
-				;;
-			*lzma)
-				echo "lzma decompressing image"
-				lzma -df ${B}/usr/${INITRAMFS_IMAGE_NAME}.$img
-				break
-				;;
-			*xz)
-				echo "xz decompressing image"
-				xz -df ${B}/usr/${INITRAMFS_IMAGE_NAME}.$img
-				break
-				;;
-			*zst)
-				echo "zst decompressing image"
-				zstd -df ${B}/usr/${INITRAMFS_IMAGE_NAME}.$img
-				break
-				;;
-			esac
-			break
-		fi
-	done
-	# Verify that the above loop found a initramfs, fail otherwise
-	[ -f ${B}/usr/${INITRAMFS_IMAGE_NAME}.cpio ] && echo "Finished copy of initramfs into ./usr" || die "Could not find any ${INITRAMFS_DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE_NAME}.cpio{.gz|.lz4|.lzo|.lzma|.xz|.zst) for bundling; INITRAMFS_IMAGE_NAME might be wrong."
-}
-
-do_bundle_initramfs () {
-	if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then
-		echo "Creating a kernel image with a bundled initramfs..."
-		copy_initramfs
-		# Backing up kernel image relies on its type(regular file or symbolic link)
-		tmp_path=""
-		for imageType in ${KERNEL_IMAGETYPE_FOR_MAKE} ; do
-			if [ -h ${KERNEL_OUTPUT_DIR}/$imageType ] ; then
-				linkpath=`readlink -n ${KERNEL_OUTPUT_DIR}/$imageType`
-				realpath=`readlink -fn ${KERNEL_OUTPUT_DIR}/$imageType`
-				mv -f $realpath $realpath.bak
-				tmp_path=$tmp_path" "$imageType"#"$linkpath"#"$realpath
-			elif [ -f ${KERNEL_OUTPUT_DIR}/$imageType ]; then
-				mv -f ${KERNEL_OUTPUT_DIR}/$imageType ${KERNEL_OUTPUT_DIR}/$imageType.bak
-				tmp_path=$tmp_path" "$imageType"##"
-			fi
-		done
-		use_alternate_initrd=CONFIG_INITRAMFS_SOURCE=${B}/usr/${INITRAMFS_IMAGE_NAME}.cpio
-		kernel_legacyhs_do_compile
-		# Restoring kernel image
-		for tp in $tmp_path ; do
-			imageType=`echo $tp|cut -d "#" -f 1`
-			linkpath=`echo $tp|cut -d "#" -f 2`
-			realpath=`echo $tp|cut -d "#" -f 3`
-			if [ -n "$realpath" ]; then
-				mv -f $realpath $realpath.initramfs
-				mv -f $realpath.bak $realpath
-				ln -sf $linkpath.initramfs ${B}/${KERNEL_OUTPUT_DIR}/$imageType.initramfs
-			else
-				mv -f ${KERNEL_OUTPUT_DIR}/$imageType ${KERNEL_OUTPUT_DIR}/$imageType.initramfs
-				mv -f ${KERNEL_OUTPUT_DIR}/$imageType.bak ${KERNEL_OUTPUT_DIR}/$imageType
-			fi
-		done
-	fi
-}
-do_bundle_initramfs[dirs] = "${B}"
-
-kernel_legacyhs_do_transform_bundled_initramfs() {
-        # vmlinux.gz is not built by kernel
-	if (echo "${KERNEL_IMAGETYPES}" | grep -wq "vmlinux\.gz"); then
-		gzip -9cn < ${KERNEL_OUTPUT_DIR}/vmlinux.initramfs > ${KERNEL_OUTPUT_DIR}/vmlinux.gz.initramfs
-        fi
-}
-do_transform_bundled_initramfs[dirs] = "${B}"
-
-python do_package:prepend () {
-    d.setVar('STRIP',  d.getVar('KERNEL_STRIP').strip())
-}
-
-python do_devshell:prepend () {
-    os.environ["LDFLAGS"] = ''
-}
-
-addtask bundle_initramfs after do_install before do_deploy
-
-KERNEL_DEBUG_TIMESTAMPS ??= "0"
-
-kernel_legacyhs_do_compile() {
-	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
-
-	# setup native pkg-config variables (kconfig scripts call pkg-config directly, cannot generically be overriden to pkg-config-native)
-	export PKG_CONFIG_DIR="${STAGING_DIR_NATIVE}${libdir_native}/pkgconfig"
-	export PKG_CONFIG_PATH="$PKG_CONFIG_DIR:${STAGING_DATADIR_NATIVE}/pkgconfig"
-	export PKG_CONFIG_LIBDIR="$PKG_CONFIG_DIR"
-	export PKG_CONFIG_SYSROOT_DIR=""
-
-	if [ "${KERNEL_DEBUG_TIMESTAMPS}" != "1" ]; then
-		# kernel sources do not use do_unpack, so SOURCE_DATE_EPOCH may not
-		# be set....
-		if [ "${SOURCE_DATE_EPOCH}" = "" -o "${SOURCE_DATE_EPOCH}" = "0" ]; then
-			# The source directory is not necessarily a git repository, so we
-			# specify the git-dir to ensure that git does not query a
-			# repository in any parent directory.
-			SOURCE_DATE_EPOCH=`git --git-dir="${S}/.git" log -1 --pretty=%ct 2>/dev/null || echo "${REPRODUCIBLE_TIMESTAMP_ROOTFS}"`
-		fi
-
-		ts=`LC_ALL=C date -d @$SOURCE_DATE_EPOCH`
-		export KBUILD_BUILD_TIMESTAMP="$ts"
-		export KCONFIG_NOTIMESTAMP=1
-		bbnote "KBUILD_BUILD_TIMESTAMP: $ts"
-	else
-		ts=`LC_ALL=C date`
-		export KBUILD_BUILD_TIMESTAMP="$ts"
-		bbnote "KBUILD_BUILD_TIMESTAMP: $ts"
-	fi
-	# The $use_alternate_initrd is only set from
-	# do_bundle_initramfs() This variable is specifically for the
-	# case where we are making a second pass at the kernel
-	# compilation and we want to force the kernel build to use a
-	# different initramfs image.  The way to do that in the kernel
-	# is to specify:
-	# make ...args... CONFIG_INITRAMFS_SOURCE=some_other_initramfs.cpio
-	if [ "$use_alternate_initrd" = "" ] && [ "${INITRAMFS_TASK}" != "" ] ; then
-		# The old style way of copying an prebuilt image and building it
-		# is turned on via INTIRAMFS_TASK != ""
-		copy_initramfs
-		use_alternate_initrd=CONFIG_INITRAMFS_SOURCE=${B}/usr/${INITRAMFS_IMAGE_NAME}.cpio
-	fi
-	for typeformake in ${KERNEL_IMAGETYPE_FOR_MAKE} ; do
-		oe_runmake ${PARALLEL_MAKE} ${typeformake} ${KERNEL_EXTRA_ARGS} $use_alternate_initrd
-	done
-}
-
-kernel_legacyhs_do_transform_kernel() {
-	# vmlinux.gz is not built by kernel
-	if (echo "${KERNEL_IMAGETYPES}" | grep -wq "vmlinux\.gz"); then
-		mkdir -p "${KERNEL_OUTPUT_DIR}"
-		gzip -9cn < ${B}/vmlinux > "${KERNEL_OUTPUT_DIR}/vmlinux.gz"
-	fi
-}
-do_transform_kernel[dirs] = "${B}"
-addtask transform_kernel after do_compile before do_install
-
-do_compile_kernelmodules() {
-	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
-
-	# setup native pkg-config variables (kconfig scripts call pkg-config directly, cannot generically be overriden to pkg-config-native)
-	export PKG_CONFIG_DIR="${STAGING_DIR_NATIVE}${libdir_native}/pkgconfig"
-	export PKG_CONFIG_PATH="$PKG_CONFIG_DIR:${STAGING_DATADIR_NATIVE}/pkgconfig"
-	export PKG_CONFIG_LIBDIR="$PKG_CONFIG_DIR"
-	export PKG_CONFIG_SYSROOT_DIR=""
-
-	if [ "${KERNEL_DEBUG_TIMESTAMPS}" != "1" ]; then
-		# kernel sources do not use do_unpack, so SOURCE_DATE_EPOCH may not
-		# be set....
-		if [ "${SOURCE_DATE_EPOCH}" = "" -o "${SOURCE_DATE_EPOCH}" = "0" ]; then
-			# The source directory is not necessarily a git repository, so we
-			# specify the git-dir to ensure that git does not query a
-			# repository in any parent directory.
-			SOURCE_DATE_EPOCH=`git --git-dir="${S}/.git" log -1 --pretty=%ct 2>/dev/null || echo "${REPRODUCIBLE_TIMESTAMP_ROOTFS}"`
-		fi
-
-		ts=`LC_ALL=C date -d @$SOURCE_DATE_EPOCH`
-		export KBUILD_BUILD_TIMESTAMP="$ts"
-		export KCONFIG_NOTIMESTAMP=1
-		bbnote "KBUILD_BUILD_TIMESTAMP: $ts"
-	else
-		ts=`LC_ALL=C date`
-		export KBUILD_BUILD_TIMESTAMP="$ts"
-		bbnote "KBUILD_BUILD_TIMESTAMP: $ts"
-	fi
-	if (grep -q -i -e '^CONFIG_MODULES=y$' ${B}/.config); then
-		oe_runmake -C ${B} ${PARALLEL_MAKE} modules ${KERNEL_EXTRA_ARGS}
-
-		# Module.symvers gets updated during the
-		# building of the kernel modules. We need to
-		# update this in the shared workdir since some
-		# external kernel modules has a dependency on
-		# other kernel modules and will look at this
-		# file to do symbol lookups
-		cp ${B}/Module.symvers ${STAGING_KERNEL_BUILDDIR}/
-		# 5.10+ kernels have module.lds that we need to copy for external module builds
-		if [ -e "${B}/scripts/module.lds" ]; then
-			install -Dm 0644 ${B}/scripts/module.lds ${STAGING_KERNEL_BUILDDIR}/scripts/module.lds
-		fi
-	else
-		bbnote "no modules to compile"
-	fi
-}
-addtask compile_kernelmodules after do_compile before do_strip
-
-kernel_legacyhs_do_install() {
-	#
-	# First install the modules
-	#
-	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
-	if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
-		oe_runmake DEPMOD=echo MODLIB=${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION} INSTALL_FW_PATH=${D}${nonarch_base_libdir}/firmware modules_install
-		rm -f "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/build"
-		rm -f "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/source"
-		# Remove empty module directories to prevent QA issues
-		[ -d "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel" ] && find "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel" -type d -empty -delete
-	else
-		bbnote "no modules to install"
-	fi
-
-	#
-	# Install various kernel output (zImage, map file, config, module support files)
-	#
-	install -d ${D}/${KERNEL_IMAGEDEST}
-
-	#
-	# When including an initramfs bundle inside a FIT image, the fitImage is created after the install task
-	# by do_assemble_fitimage_initramfs.
-	# This happens after the generation of the initramfs bundle (done by do_bundle_initramfs).
-	# So, at the level of the install task we should not try to install the fitImage. fitImage is still not
-	# generated yet.
-	# After the generation of the fitImage, the deploy task copies the fitImage from the build directory to
-	# the deploy folder.
-	#
-
-	for imageType in ${KERNEL_IMAGETYPES} ; do
-		if [ $imageType != "fitImage" ] || [ "${INITRAMFS_IMAGE_BUNDLE}" != "1" ] ; then
-			install -m 0644 ${KERNEL_OUTPUT_DIR}/$imageType ${D}/${KERNEL_IMAGEDEST}/$imageType-${KERNEL_VERSION}
-		fi
-	done
-
-	install -m 0644 System.map ${D}/${KERNEL_IMAGEDEST}/System.map-${KERNEL_VERSION}
-	install -m 0644 .config ${D}/${KERNEL_IMAGEDEST}/config-${KERNEL_VERSION}
-	install -m 0644 vmlinux ${D}/${KERNEL_IMAGEDEST}/vmlinux-${KERNEL_VERSION}
-	! [ -e Module.symvers ] || install -m 0644 Module.symvers ${D}/${KERNEL_IMAGEDEST}/Module.symvers-${KERNEL_VERSION}
-}
-
-# Must be ran no earlier than after do_kernel_checkout or else Makefile won't be in ${S}/Makefile
-do_kernel_version_sanity_check() {
-	if [ "x${KERNEL_VERSION_SANITY_SKIP}" = "x1" ]; then
-		exit 0
-	fi
-
-	# The Makefile determines the kernel version shown at runtime
-	# Don't use KERNEL_VERSION because the headers it grabs the version from aren't generated until do_compile
-	VERSION=$(grep "^VERSION =" ${S}/Makefile | sed s/.*=\ *//)
-	PATCHLEVEL=$(grep "^PATCHLEVEL =" ${S}/Makefile | sed s/.*=\ *//)
-	SUBLEVEL=$(grep "^SUBLEVEL =" ${S}/Makefile | sed s/.*=\ *//)
-	EXTRAVERSION=$(grep "^EXTRAVERSION =" ${S}/Makefile | sed s/.*=\ *//)
-
-	# Build a string for regex and a plain version string
-	reg="^${VERSION}\.${PATCHLEVEL}"
-	vers="${VERSION}.${PATCHLEVEL}"
-	if [ -n "${SUBLEVEL}" ]; then
-		# Ignoring a SUBLEVEL of zero is fine
-		if [ "${SUBLEVEL}" = "0" ]; then
-			reg="${reg}(\.${SUBLEVEL})?"
-		else
-			reg="${reg}\.${SUBLEVEL}"
-			vers="${vers}.${SUBLEVEL}"
-		fi
-	fi
-	vers="${vers}${EXTRAVERSION}"
-	reg="${reg}${EXTRAVERSION}"
-
-	if [ -z `echo ${PV} | grep -E "${reg}"` ]; then
-		bbfatal "Package Version (${PV}) does not match of kernel being built (${vers}). Please update the PV variable to match the kernel source or set KERNEL_VERSION_SANITY_SKIP=\"1\" in your recipe."
-	fi
-	exit 0
-}
-
-addtask shared_workdir after do_compile before do_compile_kernelmodules
-addtask shared_workdir_setscene
-
-do_shared_workdir_setscene () {
-	exit 1
-}
-
-emit_depmod_pkgdata() {
-	# Stash data for depmod
-	install -d ${PKGDESTWORK}/${KERNEL_PACKAGE_NAME}-depmod/
-	echo "${KERNEL_VERSION}" > ${PKGDESTWORK}/${KERNEL_PACKAGE_NAME}-depmod/${KERNEL_PACKAGE_NAME}-abiversion
-	cp ${B}/System.map ${PKGDESTWORK}/${KERNEL_PACKAGE_NAME}-depmod/System.map-${KERNEL_VERSION}
-}
-
-PACKAGEFUNCS += "emit_depmod_pkgdata"
-
-do_shared_workdir[cleandirs] += " ${STAGING_KERNEL_BUILDDIR}"
-do_shared_workdir () {
-	cd ${B}
-
-	kerneldir=${STAGING_KERNEL_BUILDDIR}
-	install -d $kerneldir
-
-	#
-	# Store the kernel version in sysroots for module-base.bbclass
-	#
-
-	echo "${KERNEL_VERSION}" > $kerneldir/${KERNEL_PACKAGE_NAME}-abiversion
-	echo "${KERNEL_LOCALVERSION}" > $kerneldir/${KERNEL_PACKAGE_NAME}-localversion
-
-	# Copy files required for module builds
-	cp System.map $kerneldir/System.map-${KERNEL_VERSION}
-	! [ -e Module.symvers ] || cp Module.symvers $kerneldir/
-	cp .config $kerneldir/
-	mkdir -p $kerneldir/include/config
-	cp include/config/kernel.release $kerneldir/include/config/kernel.release
-	if [ -e certs/signing_key.x509 ]; then
-		# The signing_key.* files are stored in the certs/ dir in
-		# newer Linux kernels
-		mkdir -p $kerneldir/certs
-		cp certs/signing_key.* $kerneldir/certs/
-	elif [ -e signing_key.priv ]; then
-		cp signing_key.* $kerneldir/
-	fi
-
-	# We can also copy over all the generated files and avoid special cases
-	# like version.h, but we've opted to keep this small until file creep starts
-	# to happen
-	if [ -e include/linux/version.h ]; then
-		mkdir -p $kerneldir/include/linux
-		cp include/linux/version.h $kerneldir/include/linux/version.h
-	fi
-
-	# As of Linux kernel version 3.0.1, the clean target removes
-	# arch/powerpc/lib/crtsavres.o which is present in
-	# KBUILD_LDFLAGS_MODULE, making it required to build external modules.
-	if [ ${ARCH} = "powerpc" ]; then
-		if [ -e arch/powerpc/lib/crtsavres.o ]; then
-			mkdir -p $kerneldir/arch/powerpc/lib/
-			cp arch/powerpc/lib/crtsavres.o $kerneldir/arch/powerpc/lib/crtsavres.o
-		fi
-	fi
-
-	if [ -d include/generated ]; then
-		mkdir -p $kerneldir/include/generated/
-		cp -fR include/generated/* $kerneldir/include/generated/
-	fi
-
-	if [ -d arch/${ARCH}/include/generated ]; then
-		mkdir -p $kerneldir/arch/${ARCH}/include/generated/
-		cp -fR arch/${ARCH}/include/generated/* $kerneldir/arch/${ARCH}/include/generated/
-	fi
-
-	if (grep -q -i -e '^CONFIG_UNWINDER_ORC=y$' $kerneldir/.config); then
-		# With CONFIG_UNWINDER_ORC (the default in 4.14), objtool is required for
-		# out-of-tree modules to be able to generate object files.
-		if [ -x tools/objtool/objtool ]; then
-			mkdir -p ${kerneldir}/tools/objtool
-			cp tools/objtool/objtool ${kerneldir}/tools/objtool/
-		fi
-	fi
-
-	# When building with CONFIG_MODVERSIONS=y and CONFIG_RANDSTRUCT=y we need
-	# to copy the build assets generated for the randstruct seed to
-	# STAGING_KERNEL_BUILDDIR, otherwise the out-of-tree modules build will
-	# generate those assets which will result in a different
-	# RANDSTRUCT_HASHED_SEED
-	if [ -d scripts/basic ]; then
-		mkdir -p ${kerneldir}/scripts
-		cp -r scripts/basic ${kerneldir}/scripts
-	fi
-
-	if [ -d scripts/gcc-plugins ]; then
-		mkdir -p ${kerneldir}/scripts
-		cp -r scripts/gcc-plugins ${kerneldir}/scripts
-	fi
-
-}
-
-# We don't need to stage anything, not the modules/firmware since those would clash with linux-firmware
-SYSROOT_DIRS = ""
-
-KERNEL_CONFIG_COMMAND ?= "oe_runmake_call -C ${S} O=${B} olddefconfig || oe_runmake -C ${S} O=${B} oldnoconfig"
-
-python check_oldest_kernel() {
-    oldest_kernel = d.getVar('OLDEST_KERNEL')
-    kernel_version = d.getVar('KERNEL_VERSION')
-    tclibc = d.getVar('TCLIBC')
-    if tclibc == 'glibc':
-        kernel_version = kernel_version.split('-', 1)[0]
-        if oldest_kernel and kernel_version:
-            if bb.utils.vercmp_string(kernel_version, oldest_kernel) < 0:
-                bb.warn('%s: OLDEST_KERNEL is "%s" but the version of the kernel you are building is "%s" - therefore %s as built may not be compatible with this kernel. Either set OLDEST_KERNEL to an older version, or build a newer kernel.' % (d.getVar('PN'), oldest_kernel, kernel_version, tclibc))
-}
-
-check_oldest_kernel[vardepsexclude] += "OLDEST_KERNEL KERNEL_VERSION"
-do_compile[postfuncs] += "check_oldest_kernel"
-
-KERNEL_LOCALVERSION ??= ""
-
-# 6.3+ requires the variable LOCALVERSION to be set to not get a "+" in
-# the local version. Having it empty means nothing will be added, and any
-# value will be appended to the local kernel version. This replaces the
-# use of .scmversion file for setting a localversion without using
-# the CONFIG_LOCALVERSION option.
-#
-# Note: This class saves the value of localversion to a file
-# so other recipes like make-mod-scripts can restore it via the
-# helper function get_kernellocalversion_file
-export LOCALVERSION = "${KERNEL_LOCALVERSION}"
-
-kernel_legacyhs_do_configure() {
-	# fixes extra + in /lib/modules/2.6.37+
-	# $ scripts/setlocalversion . => +
-	# $ make kernelversion => 2.6.37
-	# $ make kernelrelease => 2.6.37+
-	# See kernel-arch.bbclass for post v6.3 removal of the extra
-	# + in localversion. .scmversion is no longer used, and the
-	# variable LOCALVERSION must be used
-	if [ ! -e ${B}/.scmversion -a ! -e ${S}/.scmversion ]; then
-		echo ${KERNEL_LOCALVERSION} > ${B}/.scmversion
-		echo ${KERNEL_LOCALVERSION} > ${S}/.scmversion
-	fi
-
-	if [ "${S}" != "${B}" ] && [ -f "${S}/.config" ] && [ ! -f "${B}/.config" ]; then
-		mv "${S}/.config" "${B}/.config"
-	fi
-
-	# Copy defconfig to .config if .config does not exist. This allows
-	# recipes to manage the .config themselves in do_configure:prepend().
-	if [ -f "${UNPACKDIR}/defconfig" ] && [ ! -f "${B}/.config" ]; then
-		cp "${UNPACKDIR}/defconfig" "${B}/.config"
-	fi
-
-	${KERNEL_CONFIG_COMMAND}
-}
-
-inherit cml1 pkgconfig
-
-EXPORT_FUNCTIONS do_compile do_transform_kernel do_transform_bundled_initramfs do_install do_configure
-
-# kernel-base becomes kernel-${KERNEL_VERSION}
-# kernel-image becomes kernel-image-${KERNEL_VERSION}
-PACKAGES = "${KERNEL_PACKAGE_NAME} ${KERNEL_PACKAGE_NAME}-base ${KERNEL_PACKAGE_NAME}-vmlinux ${KERNEL_PACKAGE_NAME}-image ${KERNEL_PACKAGE_NAME}-dev ${KERNEL_PACKAGE_NAME}-modules ${KERNEL_PACKAGE_NAME}-dbg"
-FILES:${PN} = ""
-FILES:${KERNEL_PACKAGE_NAME}-base = "${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.order ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.builtin ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.builtin.modinfo"
-FILES:${KERNEL_PACKAGE_NAME}-image = ""
-FILES:${KERNEL_PACKAGE_NAME}-dev = "/${KERNEL_IMAGEDEST}/System.map* /${KERNEL_IMAGEDEST}/Module.symvers* /${KERNEL_IMAGEDEST}/config* ${KERNEL_SRC_PATH} ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/build"
-FILES:${KERNEL_PACKAGE_NAME}-vmlinux = "/${KERNEL_IMAGEDEST}/vmlinux-${KERNEL_VERSION_NAME}"
-FILES:${KERNEL_PACKAGE_NAME}-modules = ""
-FILES:${KERNEL_PACKAGE_NAME}-dbg = "/usr/lib/debug /usr/src/debug"
-RDEPENDS:${KERNEL_PACKAGE_NAME} = "${KERNEL_PACKAGE_NAME}-base (= ${EXTENDPKGV})"
-# Allow machines to override this dependency if kernel image files are
-# not wanted in images as standard
-RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base ?= "${KERNEL_PACKAGE_NAME}-image (= ${EXTENDPKGV})"
-PKG:${KERNEL_PACKAGE_NAME}-image = "${KERNEL_PACKAGE_NAME}-image-${@legitimize_package_name(d.getVar('KERNEL_VERSION'))}"
-RPROVIDES:${KERNEL_PACKAGE_NAME}-image += "${KERNEL_PACKAGE_NAME}-image"
-RDEPENDS:${KERNEL_PACKAGE_NAME}-image += "${@oe.utils.conditional('KERNEL_IMAGETYPE', 'vmlinux', '${KERNEL_PACKAGE_NAME}-vmlinux (= ${EXTENDPKGV})', '', d)}"
-PKG:${KERNEL_PACKAGE_NAME}-base = "${KERNEL_PACKAGE_NAME}-${@legitimize_package_name(d.getVar('KERNEL_VERSION'))}"
-RPROVIDES:${KERNEL_PACKAGE_NAME}-base += "${KERNEL_PACKAGE_NAME}-${KERNEL_VERSION} ${KERNEL_PACKAGE_NAME}-base"
-ALLOW_EMPTY:${KERNEL_PACKAGE_NAME} = "1"
-ALLOW_EMPTY:${KERNEL_PACKAGE_NAME}-base = "1"
-ALLOW_EMPTY:${KERNEL_PACKAGE_NAME}-image = "1"
-ALLOW_EMPTY:${KERNEL_PACKAGE_NAME}-modules = "1"
-DESCRIPTION:${KERNEL_PACKAGE_NAME}-modules = "Kernel modules meta package"
-
-pkg_postinst:${KERNEL_PACKAGE_NAME}-base () {
-	if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then
-		mkdir -p $D/lib/modules/${KERNEL_VERSION}
-	fi
-	if [ -n "$D" ]; then
-		depmodwrapper -a -b $D ${KERNEL_VERSION} ${KERNEL_PACKAGE_NAME}
-	else
-		depmod -a ${KERNEL_VERSION}
-	fi
-}
-
-PACKAGESPLITFUNCS =+ "split_kernel_packages"
-
-python split_kernel_packages () {
-    do_split_packages(d, root='${nonarch_base_libdir}/firmware', file_regex=r'^(.*)\.(bin|fw|cis|csp|dsp)$', output_pattern='${KERNEL_PACKAGE_NAME}-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='')
-}
-
-# Many scripts want to look in arch/$arch/boot for the bootable
-# image. This poses a problem for vmlinux and vmlinuz based
-# booting. This task arranges to have vmlinux and vmlinuz appear
-# in the normalized directory location.
-do_kernel_link_images() {
-	if [ ! -d "${B}/arch/${ARCH}/boot" ]; then
-		mkdir ${B}/arch/${ARCH}/boot
-	fi
-	cd ${B}/arch/${ARCH}/boot
-	ln -sf ../../../vmlinux
-	if [ -f ../../../vmlinuz ]; then
-		ln -sf ../../../vmlinuz
-	fi
-	if [ -f ../../../vmlinuz.bin ]; then
-		ln -sf ../../../vmlinuz.bin
-	fi
-	if [ -f ../../../vmlinux.64 ]; then
-		ln -sf ../../../vmlinux.64
-	fi
-}
-addtask kernel_link_images after do_compile before do_strip
-
-python do_strip() {
-    import shutil
-
-    strip = d.getVar('KERNEL_STRIP')
-    extra_sections = d.getVar('KERNEL_IMAGE_STRIP_EXTRA_SECTIONS')
-    kernel_image = d.getVar('B') + "/" + d.getVar('KERNEL_OUTPUT_DIR') + "/vmlinux"
-
-    if (extra_sections and kernel_image.find(d.getVar('KERNEL_IMAGEDEST') + '/vmlinux') != -1):
-        kernel_image_stripped = kernel_image + ".stripped"
-        shutil.copy2(kernel_image, kernel_image_stripped)
-        oe.package.runstrip((kernel_image_stripped, 8, strip, extra_sections))
-        bb.debug(1, "KERNEL_IMAGE_STRIP_EXTRA_SECTIONS is set, stripping sections: " + \
-            extra_sections)
-}
-do_strip[dirs] = "${B}"
-
-addtask strip before do_sizecheck after do_kernel_link_images
-
-# Support checking the kernel size since some kernels need to reside in partitions
-# with a fixed length or there is a limit in transferring the kernel to memory.
-# If more than one image type is enabled, warn on any that don't fit but only fail
-# if none fit.
-do_sizecheck() {
-	if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" ]; then
-		invalid=`echo ${KERNEL_IMAGE_MAXSIZE} | sed 's/[0-9]//g'`
-		if [ -n "$invalid" ]; then
-			die "Invalid KERNEL_IMAGE_MAXSIZE: ${KERNEL_IMAGE_MAXSIZE}, should be an integer (The unit is Kbytes)"
-		fi
-		at_least_one_fits=
-		for imageType in ${KERNEL_IMAGETYPES} ; do
-			size=`du -ks ${B}/${KERNEL_OUTPUT_DIR}/$imageType | awk '{print $1}'`
-			if [ $size -gt ${KERNEL_IMAGE_MAXSIZE} ]; then
-				bbwarn "This kernel $imageType (size=$size(K) > ${KERNEL_IMAGE_MAXSIZE}(K)) is too big for your device."
-			else
-				at_least_one_fits=y
-			fi
-		done
-		if [ -z "$at_least_one_fits" ]; then
-			die "All kernel images are too big for your device. Please reduce the size of the kernel by making more of it modular."
-		fi
-	fi
-}
-do_sizecheck[dirs] = "${B}"
-
-addtask sizecheck before do_install after do_strip
-
-inherit kernel-artifact-names
-
-kernel_legacyhs_do_deploy() {
-	deployDir="${DEPLOYDIR}"
-	if [ -n "${KERNEL_DEPLOYSUBDIR}" ]; then
-		deployDir="${DEPLOYDIR}/${KERNEL_DEPLOYSUBDIR}"
-		mkdir "$deployDir"
-	fi
-
-	for imageType in ${KERNEL_IMAGETYPES} ; do
-		baseName=$imageType-${KERNEL_IMAGE_NAME}
-
-		if [ -s ${KERNEL_OUTPUT_DIR}/$imageType.stripped ] ; then
-			install -m 0644 ${KERNEL_OUTPUT_DIR}/$imageType.stripped $deployDir/$baseName${KERNEL_IMAGE_BIN_EXT}
-		else
-			install -m 0644 ${KERNEL_OUTPUT_DIR}/$imageType $deployDir/$baseName${KERNEL_IMAGE_BIN_EXT}
-		fi
-		if [ -n "${KERNEL_IMAGE_LINK_NAME}" ] ; then
-			ln -sf $baseName${KERNEL_IMAGE_BIN_EXT} $deployDir/$imageType-${KERNEL_IMAGE_LINK_NAME}${KERNEL_IMAGE_BIN_EXT}
-		fi
-		if [ "${KERNEL_IMAGETYPE_SYMLINK}" = "1" ] ; then
-			ln -sf $baseName${KERNEL_IMAGE_BIN_EXT} $deployDir/$imageType
-		fi
-	done
-
-	if [ ${MODULE_TARBALL_DEPLOY} = "1" ] && (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
-		mkdir -p ${D}${root_prefix}/lib
-		if [ -n "${SOURCE_DATE_EPOCH}" ]; then
-			TAR_ARGS="--sort=name --clamp-mtime --mtime=@${SOURCE_DATE_EPOCH}"
-		else
-			TAR_ARGS=""
-		fi
-		TAR_ARGS="$TAR_ARGS --owner=0 --group=0"
-		tar $TAR_ARGS -cv -C ${D}${root_prefix} lib | gzip -9n > $deployDir/modules-${MODULE_TARBALL_NAME}.tgz
-
-		if [ -n "${MODULE_TARBALL_LINK_NAME}" ] ; then
-			ln -sf modules-${MODULE_TARBALL_NAME}.tgz $deployDir/modules-${MODULE_TARBALL_LINK_NAME}.tgz
-		fi
-	fi
-
-	if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then
-		for imageType in ${KERNEL_IMAGETYPES} ; do
-			if [ "$imageType" = "fitImage" ] ; then
-				continue
-			fi
-			initramfsBaseName=$imageType-${INITRAMFS_NAME}
-			install -m 0644 ${KERNEL_OUTPUT_DIR}/$imageType.initramfs $deployDir/$initramfsBaseName${KERNEL_IMAGE_BIN_EXT}
-			if [ -n "${INITRAMFS_LINK_NAME}" ] ; then
-				ln -sf $initramfsBaseName${KERNEL_IMAGE_BIN_EXT} $deployDir/$imageType-${INITRAMFS_LINK_NAME}${KERNEL_IMAGE_BIN_EXT}
-			fi
-		done
-	fi
-}
-
-# We deploy to filenames that include PKGV and PKGR, read the saved data to
-# ensure we get the right values for both
-do_deploy[prefuncs] += "read_subpackage_metadata"
-
-addtask deploy after do_populate_sysroot do_packagedata
-
-EXPORT_FUNCTIONS do_deploy
-
-# Add using Device Tree support
-inherit kernel-devicetree
-

meta-ti-bsp/classes/ti-secdev.bbclass

@@ -15,6 +15,7 @@ TI_SECURE_DEV_PKG:k3r5 = "${@ d.getVar('TI_SECURE_DEV_PKG_K3') or d.getVar('TI_K
 TI_SECURE_DEV_PKG:ti33x = "${TI_SECURE_DEV_PKG_CAT}/am3x"
 TI_SECURE_DEV_PKG:ti43x = "${TI_SECURE_DEV_PKG_CAT}/am4x"
 TI_SECURE_DEV_PKG:am57xx = "${TI_SECURE_DEV_PKG_AUTO}/am5x"
+TI_SECURE_DEV_PKG:dra7xx = "${TI_SECURE_DEV_PKG_AUTO}/dra7"
 
 # The SECDEV scripts may need their own location provided through the environment
 export TI_SECURE_DEV_PKG

meta-ti-bsp/classes/uboot-fragments.bbclass

@@ -0,0 +1,77 @@
+# Handle U-Boot config fragments for a machine
+#
+# This interacts with the UBOOT_CONFIG flow
+#
+# The format to specify it, in the machine, is:
+#
+# UBOOT_FRAGMENTS_CONFIG[foo] = "fragment[,fragment...]"
+#
+# or
+#
+# UBOOT_FRAGMENTS = "fragment[,fragment...]"
+#
+# Copyright 2024 (C) Texas Instruments, Inc.
+#
+# SPDX-License-Identifier: MIT
+
+python () {
+    loUbootConfig = (d.getVar('UBOOT_CONFIG') or "").split()
+    loUbootFragments = d.getVar('UBOOT_FRAGMENTS')
+    loUbootFragmentsConfigFlags = d.getVarFlags('UBOOT_FRAGMENTS_CONFIG')
+        
+    if loUbootFragmentsConfigFlags and loUbootFragments:
+        raise bb.parse.SkipRecipe("You cannot use UBOOT_FRAGMENTS and UBOOT_FRAGMENTS_CONFIG at the same time.")
+
+    if loUbootFragmentsConfigFlags is not None and len(loUbootConfig) > 0:
+        for lpConfig in loUbootConfig:
+            loFound = False
+            for lpFlag, lpValue in loUbootFragmentsConfigFlags.items():
+                if lpConfig == lpFlag: 
+                    loFound = True
+                    if lpValue == "":
+                        d.appendVar('UBOOT_FRAGMENTS', ' none')
+                    else:
+                        d.appendVar('UBOOT_FRAGMENTS', ' ' + lpValue)
+
+            if not loFound:
+                raise bb.parse.SkipRecipe("The selected UBOOT_CONFIG key %s has no match in %s." % (loUbootConfig, loUbootFragmentsConfigFlags.keys()))
+}
+
+uboot_configure_config:append () {
+   if [ -n "${UBOOT_FRAGMENTS}" ]
+   then
+        unset loTypeIdx
+        for lpType in ${UBOOT_CONFIG}; do
+            loTypeIdx=$(expr $loTypeIdx + 1)
+
+            if [ "${lpType}" == "${type}" ]; then
+                break
+            fi
+        done
+        
+        loApplyFragments=""
+        
+        for lpFragment in ${UBOOT_FRAGMENTS}; do
+            lpFragmentIdx=$(expr $lpFragmentIdx + 1)
+            if [ $y -eq $x ]; then
+                if [ "${lpFragment}" != "none" ]; then
+                    loApplyFragments=`echo ${lpFragment} | tr "," " "`
+                fi
+                break
+            fi
+        done
+
+        if [ -n "${loApplyFragments}" ]; then
+            oe_runmake -C ${S} O=${B}/${config} ${config} ${loApplyFragments}
+            oe_runmake -C ${S} O=${B}/${config} oldconfig
+        fi
+    fi
+}
+
+uboot_configure:append () {
+   if [ -n "${UBOOT_FRAGMENTS}" ] && [ -n "${UBOOT_MACHINE}" ]
+   then
+       oe_runmake -C ${S} O=${B} ${UBOOT_MACHINE} `echo ${UBOOT_FRAGMENTS} | tr "," " "`
+       oe_runmake -C ${S} O=${B} oldconfig
+   fi
+}

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 = "whinlatter"
+LAYERSERIES_COMPAT_meta-ti-bsp = "scarthgap"
 
 LICENSE_PATH += "${LAYERDIR}/licenses"
 
@@ -18,12 +18,8 @@ LAYERDEPENDS_meta-ti-bsp = " \
     meta-arm \
 "
 
-LAYERRECOMMENDS_meta-ti-bsp = " \
-    openembedded-layer \
-"
-
 BBFILES_DYNAMIC += " \
-    openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/recipes*/*/*.bbappend \
+    clang-layer:${LAYERDIR}/dynamic-layers/clang-layer/recipes*/*/*.bbappend \
 "
 
 SIGGEN_EXCLUDERECIPES_ABISAFE += " \
@@ -36,8 +32,3 @@ TI_COMMON_DEPLOY ?= "${TOPDIR}/deploy-ti"
 DEPLOY_DIR_IMAGE:ti-soc = "${TI_COMMON_DEPLOY}/images/${MACHINE}"
 SDK_DEPLOY:ti-soc = "${TI_COMMON_DEPLOY}/sdk"
 PSEUDO_IGNORE_PATHS:append:ti-soc = ",${TI_COMMON_DEPLOY}"
-
-MIRRORS += " \
-    git://git.ti.com/.* git://github.com/TexasInstruments/BASENAME;protocol=https \
-    gitsm://git.ti.com/.* gitsm://github.com/TexasInstruments/BASENAME;protocol=https \
-"

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

@@ -22,7 +22,7 @@ SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS3"
 # UBI: logical eraseblock size:    126976 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 1988 LEBs
-MKUBIFS_ARGS ?= "-F -m 2048 -e 126976 -c 18000"
+MKUBIFS_ARGS ?= "-F -m 2048 -e 126976 -c 13000"
 
 # do ubiattach /dev/ubi_ctrl -m 7 -O 2048
 # from dmesg:

meta-ti-bsp/conf/machine/am335x-hs-evm.conf

@@ -10,8 +10,12 @@ UBOOT_CONFIG ??= "uart mmc"
 UBOOT_CONFIG[uart] = "am335x_hs_evm_uart_config"
 UBOOT_CONFIG[mmc] = "am335x_hs_evm_config"
 
+UBOOT_ENTRYPOINT = "0x82000000"
+UBOOT_LOADADDRESS = "0x82000000"
+UBOOT_RD_LOADADDRESS = "0x84000000"
+UBOOT_RD_ENTRYPOINT = "0x84000000"
+
 # FIT image for legacy secure devices
-KERNEL_BASE_CLASS = "kernel_legacyhs"
 KERNEL_CLASSES += " kernel-fitimage-legacyhs"
 KERNEL_IMAGETYPES += " fitImage"
 
@@ -20,4 +24,3 @@ FITIMAGE_HASH_ALGO = ""
 FITIMAGE_DTB_BY_NAME = "1"
 FITIMAGE_TEE_BY_NAME = "1"
 FITIMAGE_CONF_BY_NAME = "1"
-FIT_CONF_DEFAULT_DTB = "am335x-evm.dtb"

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

@@ -21,7 +21,7 @@ SERIAL_CONSOLES = "115200;ttyS0"
 # UBI: logical eraseblock size:    253952 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 994 LEBs
-MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 10000"
+MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 8000"
 
 # do ubiattach /dev/ubi_ctrl -m 11 -O 4096
 # from dmesg:

meta-ti-bsp/conf/machine/am437x-hs-evm.conf

@@ -6,13 +6,17 @@ require conf/machine/am437x-evm.conf
 
 UBOOT_MACHINE = "am43xx_hs_evm_config"
 
+UBOOT_ENTRYPOINT = "0x82000000"
+UBOOT_LOADADDRESS = "0x82000000"
+UBOOT_RD_LOADADDRESS = "0x84000000"
+UBOOT_RD_ENTRYPOINT = "0x84000000"
+
 OPTEEMACHINE = "ti-am43xx"
 OPTEEFLAVOR = "am43xx"
 
 EXTRA_IMAGEDEPENDS += "optee-os"
 
 # FIT image for legacy secure devices
-KERNEL_BASE_CLASS = "kernel_legacyhs"
 KERNEL_CLASSES += " kernel-fitimage-legacyhs"
 KERNEL_IMAGETYPES += " fitImage"
 
@@ -22,4 +26,3 @@ FITIMAGE_PACK_TEE = "1"
 FITIMAGE_DTB_BY_NAME = "1"
 FITIMAGE_TEE_BY_NAME = "1"
 FITIMAGE_CONF_BY_NAME = "1"
-FIT_CONF_DEFAULT_DTB = "am437x-gp-evm.dtb"

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

@@ -6,6 +6,11 @@ require conf/machine/am57xx-evm.conf
 
 UBOOT_MACHINE = "am57xx_hs_evm_config"
 
+UBOOT_ENTRYPOINT = "0x82000000"
+UBOOT_LOADADDRESS = "0x82000000"
+UBOOT_RD_LOADADDRESS = "0x84000000"
+UBOOT_RD_ENTRYPOINT = "0x84000000"
+
 OPTEEMACHINE = "ti-am57xx"
 OPTEEFLAVOR = "am57xx"
 OPTEEPAGER = "y"
@@ -13,7 +18,6 @@ OPTEEPAGER = "y"
 EXTRA_IMAGEDEPENDS += "optee-os"
 
 # FIT image for legacy secure devices
-KERNEL_BASE_CLASS = "kernel_legacyhs"
 KERNEL_CLASSES += " kernel-fitimage-legacyhs"
 KERNEL_IMAGETYPES += " fitImage"
 
@@ -23,4 +27,3 @@ FITIMAGE_PACK_TEE = "1"
 FITIMAGE_DTB_BY_NAME = "1"
 FITIMAGE_TEE_BY_NAME = "1"
 FITIMAGE_CONF_BY_NAME = "1"
-FIT_CONF_DEFAULT_DTB = "am57xx-evm.dtb"

meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf

@@ -4,6 +4,8 @@
 
 require conf/machine/include/k3r5.inc
 
-UBOOT_MACHINE = "am62ax_evm_r5_defconfig"
+SYSFW_SOC = "am62ax"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
 
-UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"
+UBOOT_MACHINE = "am62ax_evm_r5_defconfig"

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

@@ -11,12 +11,7 @@ KERNEL_DEVICETREE_PREFIX = " \
     ti/k3-v3link \
 "
 
-KERNEL_DEVICETREE_DTBMERGE = " \
-    ti/k3-am62a7-sk-ub954-evm-ov2312.dtb \
-"
-
 KERNEL_DEVICETREE = " \
-    ti/k3-am62a7-phyboard-lyra-rdk.dtb \
     ti/k3-am62a7-sk.dtb \
     ti/k3-am62x-sk-csi2-imx219.dtbo \
     ti/k3-am62x-sk-csi2-ov5640.dtbo \
@@ -24,6 +19,4 @@ KERNEL_DEVICETREE = " \
     ti/k3-am62x-sk-hdmi-audio.dtbo \
 "
 
-FIT_CONF_DEFAULT_DTB = "k3-am62a7-sk.dtb"
-
 UBOOT_MACHINE = "am62ax_evm_a53_defconfig"

meta-ti-bsp/conf/machine/am62dxx-evm-k3r5.conf

@@ -1,7 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM62D HS-FS EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM62D EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-UBOOT_MACHINE = "am62dx_evm_r5_defconfig"

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

@@ -1,20 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM62DXX EVM
-#@DESCRIPTION: Machine configuration for the TI AM62DXX EVM
-
-require conf/machine/include/am62dxx.inc
-
-KERNEL_DEVICETREE_PREFIX = " \
-    ti/k3-am62d2 \
-    ti/k3-am62a7-sk-edgeai \
-    ti/k3-am62x-sk \
-    ti/k3-am62a7-sk-rpi-hdr-ehrpwm \
-"
-
-KERNEL_DEVICETREE = ""
-
-FIT_CONF_DEFAULT_DTB = "k3-am62d2-evm.dtb"
-
-UBOOT_MACHINE = "am62dx_evm_a53_defconfig"
-
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "ti-dac-fw"

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

@@ -1,19 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM62L EVM
-#@DESCRIPTION: Machine configuration for the TI AM62L EVM
-
-require conf/machine/include/am62lxx.inc
-
-IMAGE_FSTYPES += "ubifs ubi"
-
-MKUBIFS_ARGS ?= "-F -m 4096 -e 258048 -c 8500"
-
-UBINIZE_ARGS ?= "-m 4096 -p 256KiB -s 1024 -O 1024"
-
-KERNEL_DEVICETREE_PREFIX = " \
-    ti/k3-am62l \
-"
-
-KERNEL_DEVICETREE = ""
-
-UBOOT_MACHINE = "am62lx_evm_defconfig"

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

@@ -3,7 +3,10 @@
 #@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"
+SYSFW_SUFFIX = "hs-fs"
 
 UBOOT_MACHINE = "am62px_evm_r5_defconfig"
-
-UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"

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

@@ -3,14 +3,13 @@
 #@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 \
     ti/k3-am62x-sk-csi2 \
     ti/k3-am62x-sk-hdmi \
     ti/k3-am62x-sk-lpm \
-    ti/k3-am62x-sk-mcspi-loopback \
-    ti/k3-v3link \
 "
 
 KERNEL_DEVICETREE = " \
@@ -21,13 +20,8 @@ KERNEL_DEVICETREE = " \
     ti/k3-am62x-sk-hdmi-audio.dtbo \
 "
 
-FIT_CONF_DEFAULT_DTB = "k3-am62p5-sk.dtb"
-
 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 am62x_evm_prune_splashscreen.config fragment present in ti-u-boot tree
-UBOOT_CONFIG_FRAGMENTS = "${@oe.utils.conditional('DISPLAY_CLUSTER_ENABLE', '1', 'am62x_evm_prune_splashscreen.config', '', d)}"
+UBOOT_FRAGMENTS = "${@oe.utils.conditional('DISPLAY_CLUSTER_ENABLE', '1', 'am62x_evm_prune_splashscreen.config', '', d)}"
+
+UBOOT_FRAGMENTS:bsp-ti-6_1 = "${@oe.utils.conditional('DISPLAY_CLUSTER_ENABLE', '1', 'am62px_evm_prune_splashscreen.config', '', d)}"

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

@@ -2,8 +2,6 @@
 #@NAME: AM62XX EVM (R5F)
 #@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core)
 
-require conf/machine/include/k3r5.inc
+require conf/machine/am62xx-unified-k3r5.conf
 
-UBOOT_MACHINE = "am62x_evm_r5_defconfig"
-
-UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"
+UBOOT_CONFIG = "evm"

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

@@ -2,7 +2,7 @@
 #@NAME: AM62XX EVM
 #@DESCRIPTION: Machine configuration for the TI AM62XX EVM
 
-require conf/machine/include/am62xx.inc
+require conf/machine/am62xx-unified.conf
 
 KERNEL_DEVICETREE_PREFIX = " \
     ti/k3-am625 \
@@ -13,7 +13,6 @@ KERNEL_DEVICETREE = " \
     ti/k3-am625-beagleplay-csi2-ov5640.dtbo \
     ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \
     ti/k3-am625-beagleplay.dtb \
-    ti/k3-am625-phyboard-lyra-1-4-ghz-opp.dtbo \
     ti/k3-am625-phyboard-lyra-rdk.dtb \
     ti/k3-am625-sk.dtb \
     ti/k3-am625-verdin-nonwifi-dahlia.dtb \
@@ -30,6 +29,4 @@ KERNEL_DEVICETREE = " \
     ti/k3-am62x-sk-hdmi-audio.dtbo \
 "
 
-FIT_CONF_DEFAULT_DTB = "k3-am625-sk.dtb"
-
-UBOOT_MACHINE = "am62x_evm_a53_defconfig"
+UBOOT_CONFIG = "evm"

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

@@ -2,8 +2,6 @@
 #@NAME: AM62XX LP GP EVM (R5F)
 #@DESCRIPTION: Machine configuration for the TI AM62xx LP GP EVM (R5F core)
 
-require conf/machine/include/k3r5.inc
+require conf/machine/am62xx-unified-k3r5.conf
 
-UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"
-
-UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"
+UBOOT_CONFIG = "lpsk"

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

@@ -2,27 +2,20 @@
 #@NAME: AM62XX LP EVM
 #@DESCRIPTION: Machine configuration for the TI AM62XX LP EVM
 
-require conf/machine/include/am62xx.inc
+require conf/machine/am62xx-unified.conf
 
 KERNEL_DEVICETREE_PREFIX = " \
     ti/k3-am62-lp \
     ti/k3-am625-sk \
-    ti/k3-am62x-sk-dmtimer-pwm \
-    ti/k3-am62x-sk-eqep \
     ti/k3-am62x-sk-hdmi \
     ti/k3-am62x-sk-lpm \
     ti/k3-am62x-sk-mcan \
-    ti/k3-am62x-sk-mcspi-loopback \
-    ti/k3-am62x-sk-pwm \
 "
 
 KERNEL_DEVICETREE = " \
-    ti/k3-am62-lp-sk-nand.dtbo \
     ti/k3-am62-lp-sk.dtb \
     ti/k3-am625-sk.dtb \
     ti/k3-am62x-sk-hdmi-audio.dtbo \
 "
 
-FIT_CONF_DEFAULT_DTB = "k3-am62-lp-sk.dtb"
-
-UBOOT_MACHINE = "am62x_lpsk_a53_defconfig"
+UBOOT_CONFIG = "lpsk"

meta-ti-bsp/conf/machine/am62xx-unified-k3r5.conf

@@ -0,0 +1,28 @@
+#@TYPE: Machine
+#@NAME: AM62XX EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core)
+
+require conf/machine/include/k3r5.inc
+require conf/machine/include/ti-extras.inc
+
+SYSFW_SOC = "am62x"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+
+UBOOT_MACHINE = ""
+# Last config in the list is default
+UBOOT_CONFIG ??= "sip lpsk evm"
+
+UBOOT_CONFIG:bsp-ti-6_1 ??= "evm"
+
+UBOOT_CONFIG[sip] = "am62xsip_evm_r5_defconfig"
+UBOOT_CONFIG[lpsk] = "am62x_lpsk_r5_defconfig"
+UBOOT_CONFIG[evm] = "am62x_evm_r5_defconfig"
+
+UBOOT_FRAGMENTS_CONFIG_SIP = ""
+UBOOT_FRAGMENTS_CONFIG_SIP:bsp-ti-6_1 = "am62xsip_sk_r5"
+
+UBOOT_FRAGMENTS_CONFIG[sip] = "${UBOOT_FRAGMENTS_CONFIG_SIP}"
+UBOOT_FRAGMENTS_CONFIG[lpsk] = ""
+UBOOT_FRAGMENTS_CONFIG[evm] = ""
+

meta-ti-bsp/conf/machine/am62xx-unified.conf

@@ -0,0 +1,43 @@
+#@TYPE: Machine
+#@NAME: AM62XX Unified EVM
+#@DESCRIPTION: Machine configuration for the TI AM62XX EVM and all of its variations
+
+require conf/machine/include/am62xx.inc
+require conf/machine/include/ti-extras.inc
+
+KERNEL_DEVICETREE_PREFIX = " \
+    ti/k3-am62-lp \
+    ti/k3-am625 \
+    ti/k3-am62x-sk \
+"
+
+KERNEL_DEVICETREE = " \
+    ti/k3-am62-lp-sk.dtb \
+    ti/k3-am625-beagleplay-csi2-ov5640.dtbo \
+    ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \
+    ti/k3-am625-beagleplay.dtb \
+    ti/k3-am625-phyboard-lyra-rdk.dtb \
+    ti/k3-am625-sk.dtb \
+    ti/k3-am625-verdin-nonwifi-dahlia.dtb \
+    ti/k3-am625-verdin-nonwifi-dev.dtb \
+    ti/k3-am625-verdin-nonwifi-mallow.dtb \
+    ti/k3-am625-verdin-nonwifi-yavia.dtb \
+    ti/k3-am625-verdin-wifi-dahlia.dtb \
+    ti/k3-am625-verdin-wifi-dev.dtb \
+    ti/k3-am625-verdin-wifi-mallow.dtb \
+    ti/k3-am625-verdin-wifi-yavia.dtb \
+    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-hdmi-audio.dtbo \
+"
+
+UBOOT_MACHINE = ""
+# Last config in the list is default
+UBOOT_CONFIG ??= "sip lpsk evm"
+
+UBOOT_CONFIG:bsp-ti-6_1 ??= "lpsk evm"
+
+UBOOT_CONFIG[sip] = "am62xsip_evm_a53_defconfig"
+UBOOT_CONFIG[lpsk] = "am62x_lpsk_a53_defconfig"
+UBOOT_CONFIG[evm] = "am62x_evm_a53_defconfig"

meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf

@@ -2,8 +2,10 @@
 #@NAME: AM62XX SIP EVM (R5F)
 #@DESCRIPTION: Machine configuration for the TI AM62xx SIP EVM (R5F core)
 
-require conf/machine/include/k3r5.inc
+require conf/machine/am62xx-unified-k3r5.conf
 
-UBOOT_MACHINE = "am6254xxl_evm_r5_defconfig"
-UBOOT_MACHINE:bsp-ti-6_6 = "am62xsip_evm_r5_defconfig"
-UBOOT_MACHINE:bsp-ti-6_18 = "am6254atl_evm_r5_defconfig"
+UBOOT_CONFIG = "sip"
+
+UBOOT_CONFIG:bsp-ti-6_1 = ""
+
+UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_r5_defconfig"

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

@@ -2,16 +2,7 @@
 #@NAME: AM62XX SIP EVM
 #@DESCRIPTION: Machine configuration for the TI AM62XX SIP EVM
 
-require conf/machine/include/am62xx.inc
-
-TFA_K3_BL32_BASE = "0x80080000"
-TFA_K3_BL32_BASE:bsp-ti-6_6 = ""
-
-TFA_K3_PRELOADED_BL33 = "0x82000000"
-TFA_K3_PRELOADED_BL33:bsp-ti-6_6 = ""
-
-OPTEE_K3_TZDRAM_START = "0x80080000"
-OPTEE_K3_TZDRAM_START:bsp-ti-6_6 = ""
+require conf/machine/am62xx-unified.conf
 
 KERNEL_DEVICETREE_PREFIX = " \
     ti/k3-am625 \
@@ -22,10 +13,4 @@ KERNEL_DEVICETREE = " \
     ti/k3-am625-sk.dtb \
 "
 
-FIT_CONF_DEFAULT_DTB = "k3-am6254xxl-sk.dtb"
-FIT_CONF_DEFAULT_DTB:bsp-ti-6_6 = "k3-am625-sk.dtb"
-FIT_CONF_DEFAULT_DTB:bsp-ti-6_18 = "k3-am6254atl-sk.dtb"
-
-UBOOT_MACHINE = "am6254xxl_evm_a53_defconfig"
-UBOOT_MACHINE:bsp-ti-6_6 = "am62xsip_evm_a53_defconfig"
-UBOOT_MACHINE:bsp-ti-6_18 = "am6254atl_evm_a53_defconfig"
+UBOOT_CONFIG = "sip"

meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf

@@ -4,4 +4,8 @@
 
 require conf/machine/include/k3r5.inc
 
+SYSFW_SOC = "am64x_sr2"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+
 UBOOT_MACHINE = "am64x_evm_r5_defconfig"

meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf

@@ -4,4 +4,8 @@
 
 require conf/machine/include/k3r5.inc
 
+SYSFW_SOC = "am65x_sr2"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "gp"
+
 UBOOT_MACHINE = "am65x_evm_r5_defconfig"

meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf

@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: AM65xx HS EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM65xx HS EVM (R5F core)
+
+require conf/machine/include/k3r5.inc
+
+SYSFW_SOC = "am65x_sr2"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs"
+
+UBOOT_MACHINE = "am65x_evm_r5_defconfig"

meta-ti-bsp/conf/machine/am65xx-hs-evm.conf

@@ -0,0 +1,7 @@
+#@TYPE: Machine
+#@NAME: AM65xx HS EVM
+#@DESCRIPTION: Machine configuration for the TI AM65xx HS EVM
+
+require conf/machine/include/am65xx.inc
+
+UBOOT_MACHINE = "am65x_evm_a53_defconfig"

meta-ti-bsp/conf/machine/am68-sk-k3r5.conf

@@ -4,4 +4,8 @@
 
 require conf/machine/include/k3r5.inc
 
+SYSFW_SOC = "j721s2"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+
 UBOOT_MACHINE = "am68_sk_r5_defconfig"

meta-ti-bsp/conf/machine/am69-sk-k3r5.conf

@@ -4,4 +4,8 @@
 
 require conf/machine/include/k3r5.inc
 
+SYSFW_SOC = "j784s4"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+
 UBOOT_MACHINE = "am69_sk_r5_defconfig"

meta-ti-bsp/conf/machine/beagle-x15.conf

@@ -0,0 +1,30 @@
+#@TYPE: Machine
+#@NAME: BeagleBoard X15
+#@DESCRIPTION: Machine configuration for the BeagleBoard X15
+
+TI_PREFERRED_BSP ?= "bb_org"
+
+require conf/machine/include/am57xx.inc
+
+DT_VENDOR_PREFIX = "ti/omap/"
+DT_VENDOR_PREFIX:bsp-ti-6_1 = ""
+DT_VENDOR_PREFIX:bsp-bb_org = ""
+
+KERNEL_DEVICETREE_PREFIX = " \
+${DT_VENDOR_PREFIX}am57xx-beagle-x15 \
+${DT_VENDOR_PREFIX}am57xx-idk-lcd \
+"
+
+KERNEL_DEVICETREE = " \
+${DT_VENDOR_PREFIX}am57xx-beagle-x15.dtb \
+${DT_VENDOR_PREFIX}am57xx-beagle-x15-revb1.dtb \
+${DT_VENDOR_PREFIX}am57xx-beagle-x15-revc.dtb \
+${DT_VENDOR_PREFIX}am57xx-idk-lcd-osd101t2045.dtbo \
+${DT_VENDOR_PREFIX}am57xx-idk-lcd-osd101t2587.dtbo \
+"
+
+MACHINE_GUI_CLASS = "bigscreen"
+
+SERIAL_CONSOLES = "115200;ttyS2"
+
+UBOOT_MACHINE = "am57xx_evm_config"

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

@@ -1,21 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM62L Badge
-#@DESCRIPTION: Machine configuration for the TI AM62L Badge
-
-require conf/machine/include/am62lxx.inc
-
-IMAGE_FSTYPES += "ubifs ubi"
-
-MKUBIFS_ARGS ?= "-F -m 4096 -e 258048 -c 8500"
-
-UBINIZE_ARGS ?= "-m 4096 -p 256KiB -s 1024 -O 1024"
-
-KERNEL_DEVICETREE_PREFIX = " \
-    ti/k3-am62l3-badge \
-"
-
-KERNEL_DEVICETREE = ""
-
-UBOOT_MACHINE = "am62lx_badge_defconfig"
-
-TFA_BOARD = "am62l-badge"

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

@@ -0,0 +1,23 @@
+#@TYPE: Machine
+#@NAME: BeagleBone AI-64 (R5F)
+#@DESCRIPTION: Machine configuration for the BeagleBone AI-64 (R5F core)
+
+TI_PREFERRED_BSP ?= "bb_org"
+
+require conf/machine/include/k3r5.inc
+
+SYSFW_SOC = "j721e"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "gp"
+
+SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}"
+SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}"
+UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
+UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
+UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
+
+UBOOT_MACHINE = "j721e_evm_r5_defconfig"
+UBOOT_MACHINE:bsp-ti-6_6 = "j721e_beagleboneai64_r5_defconfig"
+
+UBOOT_FRAGMENTS:bsp-bb_org = "j721e_beagleboneai64_r5.config"
+UBOOT_FRAGMENTS:bsp-ti-6_1 = "j721e_beagleboneai64_r5.config"

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

@@ -0,0 +1,46 @@
+#@TYPE: Machine
+#@NAME: BeagleBone AI-64 (A72)
+#@DESCRIPTION: Machine configuration for the BeagleBone AI-64 board (A72 core)
+
+TI_PREFERRED_BSP ?= "bb_org"
+
+require conf/machine/include/j721e.inc
+
+IMAGE_SR1_1_HS_FS_FILES:bsp-bb_org = ""
+IMAGE_SR2_HS_SE_FILES:bsp-bb_org = ""
+
+UBOOT_MACHINE = "j721e_evm_a72_config"
+UBOOT_MACHINE:bsp-ti-6_6 = "j721e_beagleboneai64_a72_defconfig"
+
+UBOOT_FRAGMENTS:bsp-ti-6_1 = "j721e_beagleboneai64_a72.config"
+UBOOT_FRAGMENTS:bsp-bb_org = "j721e_beagleboneai64_a72.config"
+
+SPL_BINARY:bsp-ti-6_6 = "tispl.bin_unsigned"
+SPL_BINARYNAME:bsp-ti-6_6 = "tispl.bin"
+
+KERNEL_DEVICETREE_PREFIX = " \
+    ti/k3-j721e \
+"
+
+KERNEL_DEVICETREE = " \
+ti/k3-j721e-beagleboneai64.dtb \
+ti/k3-j721e-common-proc-board.dtb \
+ti/k3-j721e-evm-gesi-exp-board.dtbo \
+ti/k3-j721e-evm-quad-port-eth-exp.dtbo \
+ti/k3-j721e-sk.dtb \
+"
+
+KERNEL_DEVICETREE:append:bsp-bb_org = " \
+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-pcie0-ep.dtbo \
+ti/k3-j721e-evm-virt-mac-client.dtbo \
+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 \
+"
+
+MACHINE_GUI_CLASS = "bigscreen"

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

@@ -0,0 +1,35 @@
+#@TYPE: Machine
+#@NAME: BeagleBone machine
+#@DESCRIPTION: Machine configuration for the http://beagleboard.org/bone board
+
+TI_PREFERRED_BSP ?= "bb_org"
+
+require conf/machine/include/ti33x.inc
+
+DT_VENDOR_PREFIX = "ti/omap/"
+DT_VENDOR_PREFIX:bsp-ti-6_1 = ""
+DT_VENDOR_PREFIX:bsp-bb_org = ""
+
+KERNEL_DEVICETREE_PREFIX = " \
+${DT_VENDOR_PREFIX}am335x-bone \
+${DT_VENDOR_PREFIX}am335x-pocketbeagle \
+${DT_VENDOR_PREFIX}am335x-sancloud-bbe \
+"
+
+KERNEL_DEVICETREE = " \
+${DT_VENDOR_PREFIX}am335x-bone.dtb \
+${DT_VENDOR_PREFIX}am335x-boneblack.dtb \
+${DT_VENDOR_PREFIX}am335x-boneblack-wireless.dtb \
+${DT_VENDOR_PREFIX}am335x-boneblue.dtb \
+${DT_VENDOR_PREFIX}am335x-bonegreen.dtb \
+${DT_VENDOR_PREFIX}am335x-bonegreen-wireless.dtb \
+${DT_VENDOR_PREFIX}am335x-pocketbeagle.dtb \
+${DT_VENDOR_PREFIX}am335x-sancloud-bbe.dtb \
+${DT_VENDOR_PREFIX}am335x-sancloud-bbe-extended-wifi.dtb \
+${DT_VENDOR_PREFIX}am335x-sancloud-bbe-lite.dtb \
+"
+
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_FEATURES += "screen"
+
+SERIAL_CONSOLES = "115200;ttyS0"

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

@@ -0,0 +1,16 @@
+#@TYPE: Machine
+#@NAME: BeaglePlay (R5F)
+#@DESCRIPTION: Machine configuration for the BeaglePlay (R5F core)
+
+require conf/machine/include/k3r5.inc
+
+SYSFW_SOC = "am62x"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "gp"
+
+UBOOT_MACHINE = "am62x_evm_r5_defconfig"
+UBOOT_MACHINE:bsp-ti-6_6 = "am62x_beagleplay_r5_defconfig"
+
+UBOOT_FRAGMENTS:bsp-bb_org = "am625_beagleplay_r5.config"
+UBOOT_FRAGMENTS:bsp-ti-6_1 = "am625_beagleplay_r5.config"
+UBOOT_FRAGMENTS:bsp-mainline = "beagleplay_r5.config"

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

@@ -1,7 +0,0 @@
-#@TYPE: Machine
-#@NAME: BeaglePlay (R5F)
-#@DESCRIPTION: Machine configuration for the BeaglePlay (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-UBOOT_MACHINE = "am62x_beagleplay_r5_defconfig"

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

@@ -1,43 +0,0 @@
-#@TYPE: Machine
-#@NAME: BeaglePlay (A53)
-#@DESCRIPTION: Machine configuration for the BeaglePlay board (A53 core)
-
-require conf/machine/include/k3.inc
-require conf/machine/include/mc_k3r5.inc
-
-SOC_FAMILY:append = ":am62xx"
-
-MACHINE_FEATURES += "screen"
-
-SERIAL_CONSOLES = "115200;ttyS2"
-
-require conf/machine/include/mesa-pvr.inc
-PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
-
-TFA_BOARD = "lite"
-TFA_K3_SYSTEM_SUSPEND = "1"
-
-OPTEEMACHINE = "k3-am62x"
-
-UBOOT_MACHINE = "am62x_beagleplay_a53_defconfig"
-
-SPL_BINARY = "tispl.bin_unsigned"
-
-KERNEL_DEVICETREE_PREFIX = " \
-    ti/k3-am625-beagle \
-    ti/k3-am625-sk \
-    ti/k3-am62x-sk \
-"
-
-KERNEL_DEVICETREE = " \
-    ti/k3-am625-beagleplay-csi2-ov5640.dtbo \
-    ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \
-    ti/k3-am625-beagleplay.dtb \
-    ti/k3-am625-sk.dtb \
-    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-hdmi-audio.dtbo \
-"
-
-MACHINE_GUI_CLASS = "bigscreen"

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

@@ -0,0 +1,92 @@
+#@TYPE: Machine
+#@NAME: BeaglePlay (A53)
+#@DESCRIPTION: Machine configuration for the BeaglePlay board (A53 core)
+
+require conf/machine/include/k3.inc
+SOC_FAMILY:append = ":am62xx"
+
+MACHINE_FEATURES += "screen gpu"
+
+SERIAL_CONSOLES = "115200;ttyS2"
+
+require conf/machine/include/mesa-pvr.inc
+PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
+
+TFA_BOARD = "lite"
+TFA_K3_SYSTEM_SUSPEND = "1"
+
+OPTEEMACHINE = "k3-am62x"
+
+UBOOT_MACHINE = "am62x_evm_a53_defconfig"
+UBOOT_MACHINE:bsp-ti-6_6 = "am62x_beagleplay_a53_defconfig"
+
+UBOOT_FRAGMENTS:bsp-ti-6_1 = "am625_beagleplay_a53.config"
+UBOOT_FRAGMENTS:bsp-bb_org = "am625_beagleplay_a53.config"
+UBOOT_FRAGMENTS:bsp-mainline = "beagleplay_a53.config"
+
+SPL_BINARY:bsp-ti-6_6 = "tispl.bin_unsigned"
+SPL_BINARYNAME:bsp-ti-6_6 = "tispl.bin"
+
+KERNEL_DEVICETREE_PREFIX = " \
+    ti/k3-am625 \
+    ti/k3-am62x-sk \
+"
+
+KERNEL_DEVICETREE = " \
+    ti/k3-am625-beagleplay-csi2-ov5640.dtbo \
+    ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \
+    ti/k3-am625-beagleplay.dtb \
+    ti/k3-am625-phyboard-lyra-rdk.dtb \
+    ti/k3-am625-sk.dtb \
+    ti/k3-am625-verdin-nonwifi-dahlia.dtb \
+    ti/k3-am625-verdin-nonwifi-dev.dtb \
+    ti/k3-am625-verdin-nonwifi-mallow.dtb \
+    ti/k3-am625-verdin-nonwifi-yavia.dtb \
+    ti/k3-am625-verdin-wifi-dahlia.dtb \
+    ti/k3-am625-verdin-wifi-dev.dtb \
+    ti/k3-am625-verdin-wifi-mallow.dtb \
+    ti/k3-am625-verdin-wifi-yavia.dtb \
+    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-hdmi-audio.dtbo \
+"
+
+KERNEL_DEVICETREE:append:bsp-bb_org = " \
+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-dmtimer-pwm.dtbo \
+ti/k3-am625-sk-ecap-capture.dtbo \
+ti/k3-am625-sk-lincolntech-lcd185-panel.dtbo \
+ti/k3-am625-sk-mcspi-loopback.dtbo \
+ti/k3-am625-sk-microtips-mf101hie-panel.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-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/dra7xx-evm.conf

@@ -2,7 +2,7 @@
 #@NAME: DRA7xx EVM
 #@DESCRIPTION: Machine configuration for the TI DRA7xx EVM
 
-require conf/machine/include/am57xx.inc
+require conf/machine/include/dra7xx.inc
 
 MACHINE_FEATURES += "touchscreen"
 

meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf

@@ -6,6 +6,11 @@ require conf/machine/dra7xx-evm.conf
 
 UBOOT_MACHINE = "dra7xx_hs_evm_config"
 
+UBOOT_ENTRYPOINT = "0x82000000"
+UBOOT_LOADADDRESS = "0x82000000"
+UBOOT_RD_LOADADDRESS = "0x84000000"
+UBOOT_RD_ENTRYPOINT = "0x84000000"
+
 OPTEEMACHINE = "ti-dra7xx"
 OPTEEFLAVOR = "dra7xx"
 OPTEEPAGER = "y"

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

@@ -1,50 +1,7 @@
-require conf/machine/include/ti-soc.inc
+require conf/machine/include/omap-a15.inc
+SOC_FAMILY:append = ":dra7xx"
 SOC_FAMILY:append = ":am57xx"
 
-DEFAULTTUNE ?= "armv7athf-neon"
-require conf/machine/include/arm/armv7a/tune-cortexa15.inc
+MACHINE_FEATURES += "pci"
 
-require conf/machine/include/ti-bsp.inc
-
-# Graphics providers and variables
-require conf/machine/include/mesa-pvr.inc
-PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}"
-
-KERNEL_IMAGETYPE = "zImage"
-KERNEL_IMAGETYPES = "zImage uImage"
-KERNEL_CLASSES += "kernel-uimage"
-
-UBOOT_ARCH = "arm"
-UBOOT_ENTRYPOINT = "0x80008000"
-UBOOT_LOADADDRESS = "0x80008000"
-
-# Generate an extlinux.conf file
-UBOOT_EXTLINUX = "1"
-UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}"
-UBOOT_EXTLINUX_BOOT_FILES = " \
-    extlinux.conf;extlinux/extlinux.conf \
-    ${KERNEL_IMAGETYPE} \
-    ${DEVICETREE_FILES} \
-"
-
-SPL_BINARY = "MLO"
-UBOOT_SUFFIX = "img"
-
-EXTRA_IMAGEDEPENDS += "virtual/bootloader"
-
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-zimage"
-
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "vpdma-fw goodix-fw prueth-fw prusw-fw pruhsr-fw pruprp-fw"
-
-# Use the expected value of the ubifs filesystem's volume name in the kernel
-# and u-boot.
-UBI_VOLNAME = "rootfs"
-
-# List common SoC features, may need to add touchscreen for specific machines
-MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 screen alsa mmip dsp gc320 pci"
-
-IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
-WKS_FILE ?= "sdimage-2part.wks"
-IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES} ipc/dra7-ipu1-fw.xem4;dra7-ipu1-fw.xem4"
-do_image_wic[depends] += "virtual/bootloader:do_deploy"
-do_image_wic[depends] += "ti-rtos-messageq-test-fw:do_deploy"
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw prusw-fw pruhsr-fw pruprp-fw"

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

@@ -1,16 +1,23 @@
 require conf/machine/include/k3.inc
-require conf/machine/include/mc_k3r5.inc
-
 SOC_FAMILY:append = ":am62axx"
 
 MACHINE_FEATURES += "screen touchscreen"
 
 TFA_K3_SYSTEM_SUSPEND = "1"
 
+# Default tiboot3.bin on AM62A is for HS-FS
+TI_BOOTLOADERS += "tiboot3-am62ax-hs-fs-evm.bin"
+TI_MULTICONFIGS += "am62ax-hs-fs-evm"
+
+# Since default tiboot3.bin on AM62A is for HS-FS, add a version for GP
+TI_BOOTLOADERS += "tiboot3-am62ax-gp-evm.bin"
+TI_MULTICONFIGS += "am62ax-gp-evm"
+
+# Since default tiboot3.bin on AM62A is for HS-FS, add a version for HS-SE
+TI_BOOTLOADERS += "tiboot3-am62ax-hs-evm.bin"
+TI_MULTICONFIGS += "am62ax-hs-evm"
+
 TFA_BOARD = "lite"
 OPTEEMACHINE = "k3-am62x"
 
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cnm-wave-fw"
-
-TI_INITRAMFS_KERNEL_MODULES:append:bsp-mainline  = " kernel-module-tps6594-i2c kernel-module-tps6594-regulator kernel-module-tps6594-core"
-TI_INITRAMFS_KERNEL_MODULES:append:bsp-next  = " kernel-module-tps6594-i2c kernel-module-tps6594-regulator kernel-module-tps6594-core"

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

@@ -1,9 +0,0 @@
-require conf/machine/include/k3.inc
-require conf/machine/include/mc_k3r5.inc
-
-SOC_FAMILY:append = ":am62dxx"
-
-TFA_K3_SYSTEM_SUSPEND = "1"
-
-TFA_BOARD = "lite"
-OPTEEMACHINE = "k3-am62x"

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

@@ -1,9 +0,0 @@
-require conf/machine/include/k3.inc
-SOC_FAMILY:append = ":am62lxx"
-
-MACHINE_FEATURES += "screen"
-
-TFA_BOARD = "am62l"
-TFA_K3_SYSTEM_SUSPEND = "1"
-
-OPTEEMACHINE = "k3-am62lx"

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

@@ -1,13 +1,15 @@
 require conf/machine/include/k3.inc
-require conf/machine/include/mc_k3r5.inc
-
 SOC_FAMILY:append = ":am62pxx"
 
-MACHINE_FEATURES += "screen"
+MACHINE_FEATURES += "screen gpu"
 
 require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
 
+# Default tiboot3.bin on AM62Px is for HS-FS
+TI_BOOTLOADERS += "tiboot3-am62px-hs-fs-evm.bin"
+TI_MULTICONFIGS += "am62px-hs-fs-evm"
+
 TFA_BOARD = "lite"
 TFA_K3_SYSTEM_SUSPEND = "1"
 

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

@@ -1,13 +1,23 @@
 require conf/machine/include/k3.inc
-require conf/machine/include/mc_k3r5.inc
-
 SOC_FAMILY:append = ":am62xx"
 
-MACHINE_FEATURES += "screen"
+MACHINE_FEATURES += "screen gpu"
 
 require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
 
+# Default tiboot3.bin on AM62x is for HS-FS
+TI_BOOTLOADERS += "tiboot3-am62x-hs-fs-evm.bin"
+TI_MULTICONFIGS += "am62x-hs-fs-evm"
+
+# Since default tiboot3.bin on AM62x is for HS-FS, add a version for GP
+TI_BOOTLOADERS += "tiboot3-am62x-gp-evm.bin"
+TI_MULTICONFIGS += "am62x-gp-evm"
+
+# Since default tiboot3.bin on AM62x is for HS-FS, add a version for HS-SE
+TI_BOOTLOADERS += "tiboot3-am62x-hs-evm.bin"
+TI_MULTICONFIGS += "am62x-hs-evm"
+
 # Bitmap image tarball for early splashscreen
 IMAGE_BOOT_FILES += "ti_logo_414x97_32bpp.bmp.gz"
 

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

@@ -1,33 +1,34 @@
 require conf/machine/include/k3.inc
-require conf/machine/include/mc_k3r5.inc
-
 SOC_FAMILY:append = ":am64xx"
 
 KERNEL_DEVICETREE_PREFIX = "ti/k3-am642"
 
-KERNEL_DEVICETREE_DTBMERGE = " \
-    ti/k3-am642-evm-nand.dtb \
-"
-
 KERNEL_DEVICETREE = " \
-    ti/k3-am642-evm-icssg1-dualemac-mii.dtbo \
     ti/k3-am642-evm-icssg1-dualemac.dtbo \
-    ti/k3-am642-evm-nand.dtbo \
     ti/k3-am642-evm.dtb \
     ti/k3-am642-hummingboard-t-pcie.dtbo \
     ti/k3-am642-hummingboard-t-usb3.dtbo \
     ti/k3-am642-hummingboard-t.dtb \
     ti/k3-am642-phyboard-electra-gpio-fan.dtbo \
-    ti/k3-am642-phyboard-electra-pcie-usb2.dtbo \
     ti/k3-am642-phyboard-electra-rdk.dtb \
     ti/k3-am642-sk.dtb \
     ti/k3-am642-tqma64xxl-mbax4xxl.dtb \
 "
 
+# Default tiboot3.bin on AM64x is for SR2.0 HS-FS
+TI_BOOTLOADERS += "tiboot3-am64x_sr2-hs-fs-evm.bin"
+TI_MULTICONFIGS += "am64x_sr2-hs-fs-evm"
+
+# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP
+TI_BOOTLOADERS += "tiboot3-am64x-gp-evm.bin"
+TI_MULTICONFIGS += "am64x-gp-evm"
+
+# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for SR2.0 HS-SE
+TI_BOOTLOADERS += "tiboot3-am64x_sr2-hs-evm.bin"
+TI_MULTICONFIGS += "am64x_sr2-hs-evm"
+
 TFA_BOARD = "lite"
 
 OPTEEMACHINE = "k3-am64x"
 
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw pruhsr-fw prusw-fw pruprp-fw"
-
-TI_WKS_BOOTLOADER_APPEND = "console=ttyS2,115200n8"
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw pruhsr-fw prusw-fw"

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

@@ -1,23 +1,13 @@
 require conf/machine/include/k3.inc
-require conf/machine/include/mc_k3r5.inc
-
 SOC_FAMILY:append = ":am65xx"
 
-MACHINE_FEATURES += "screen touchscreen"
+MACHINE_FEATURES += "screen touchscreen gpu"
 
 require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}"
 
 KERNEL_DEVICETREE_PREFIX = "ti/k3-am654"
 
-KERNEL_DEVICETREE_DTBMERGE = " \
-    ti/k3-am654-gp-evm.dtb \
-    ti/k3-am654-evm.dtb \
-    ti/k3-am654-idk.dtb \
-    ti/k3-am6548-iot2050-advanced-m2-bkey-ekey-pcie.dtb \
-    ti/k3-am6548-iot2050-advanced-m2-bkey-usb3.dtb \
-"
-
 KERNEL_DEVICETREE = " \
     ti/k3-am654-base-board-rocktech-rk101-panel.dtbo \
     ti/k3-am654-base-board.dtb \
@@ -25,16 +15,23 @@ KERNEL_DEVICETREE = " \
     ti/k3-am654-idk.dtbo \
     ti/k3-am654-pcie-usb2.dtbo \
     ti/k3-am654-pcie-usb3.dtbo \
-    ti/k3-am6548-iot2050-advanced-m2-bkey-ekey-pcie.dtbo \
-    ti/k3-am6548-iot2050-advanced-m2-bkey-usb3.dtbo \
     ti/k3-am6548-iot2050-advanced-m2.dtb \
     ti/k3-am6548-iot2050-advanced-pg2.dtb \
     ti/k3-am6548-iot2050-advanced-sm.dtb \
     ti/k3-am6548-iot2050-advanced.dtb \
 "
 
-# Deploy SYSFW and any variants
-IMAGE_BOOT_FILES += "sysfw.itb sysfw-*-evm.itb"
+IMAGE_BOOT_FILES += "sysfw.itb"
+
+# Default on AM65x is for GP
+TI_BOOTLOADERS += "tiboot3-am65x_sr2-gp-evm.bin"
+TI_BOOTLOADERS += "sysfw-am65x_sr2-gp-evm.itb"
+TI_MULTICONFIGS += "am65x_sr2-gp-evm"
+
+# Since default on AM65x is for GP, add a version for HS-SE
+TI_BOOTLOADERS += "tiboot3-am65x_sr2-hs-evm.bin"
+TI_BOOTLOADERS += "sysfw-am65x_sr2-hs-evm.itb"
+TI_MULTICONFIGS += "am65x_sr2-hs-evm"
 
 TFA_BOARD = "generic"
 

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

@@ -1,13 +1,19 @@
 require conf/machine/include/k3.inc
-require conf/machine/include/mc_k3r5.inc
-
 SOC_FAMILY:append = ":j721s2"
 
-MACHINE_FEATURES += "screen"
+MACHINE_FEATURES += "screen gpu"
 
 require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
 
+# Default tiboot3.bin on AM68 is for SR1.0 HS-FS
+TI_BOOTLOADERS += "tiboot3-j721s2-hs-fs-evm.bin"
+TI_MULTICONFIGS += "j721s2-hs-fs-evm"
+
+# Since default tiboot3.bin on AM68 is for HS-FS, add a version for SR1.0 HS-SE
+TI_BOOTLOADERS += "tiboot3-j721s2-hs-evm.bin"
+TI_MULTICONFIGS += "j721s2-hs-evm"
+
 TFA_BOARD = "generic"
 
 OPTEEMACHINE = "k3-j784s4"

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

@@ -1,15 +1,21 @@
 require conf/machine/include/k3.inc
-require conf/machine/include/mc_k3r5.inc
-
 SOC_FAMILY:append = ":j784s4"
 
-MACHINE_FEATURES += "screen"
+MACHINE_FEATURES += "screen gpu"
 
 require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
 
+# Default tiboot3.bin on AM69 is for SR1.0 HS-FS
+TI_BOOTLOADERS += "tiboot3-j784s4-hs-fs-evm.bin"
+TI_MULTICONFIGS += "j784s4-hs-fs-evm"
+
+# Since default tiboot3.bin on AM69 is for HS-FS, add a version for SR1.0 HS-SE
+TI_BOOTLOADERS += "tiboot3-j784s4-hs-evm.bin"
+TI_MULTICONFIGS += "j784s4-hs-evm"
+
 TFA_BOARD = "j784s4"
 
 OPTEEMACHINE = "k3-j784s4"
 
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw ti-eth-fw-j784s4"
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw ti-eth-fw"

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

@@ -0,0 +1,4 @@
+require conf/machine/include/omap-a15.inc
+SOC_FAMILY:append = ":dra7xx"
+
+MACHINE_FEATURES += "pci"

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

@@ -1,10 +1,35 @@
 require conf/machine/include/k3.inc
-require conf/machine/include/mc_k3r5.inc
-
 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_SR1_HS_FS_FILES = "tiboot3-j7200-hs-fs-evm.bin"
+IMAGE_SR1_HS_FS_FILES:bsp-mainline = ""
+MULTICONFIG_SR1_HS_FS = "j7200-hs-fs-evm"
+MULTICONFIG_SR1_HS_FS:bsp-mainline = ""
+TI_BOOTLOADERS += "${IMAGE_SR1_HS_FS_FILES}"
+TI_MULTICONFIGS += "${MULTICONFIG_SR1_HS_FS}"
+
+# Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-SE
+IMAGE_SR1_HS_SE_FILES = "tiboot3-j7200-hs-evm.bin"
+IMAGE_SR1_HS_SE_FILES:bsp-mainline = ""
+MULTICONFIG_SR1_HS_SE = "j7200-hs-evm"
+MULTICONFIG_SR1_HS_SE:bsp-mainline = ""
+TI_BOOTLOADERS += "${IMAGE_SR1_HS_SE_FILES}"
+TI_MULTICONFIGS += "${MULTICONFIG_SR1_HS_SE}"
+
+# Since default tiboot3.bin on J7200 is for GP, add a version for SR2.0 HS-FS
+TI_BOOTLOADERS += "tiboot3-j7200_sr2-hs-fs-evm.bin"
+TI_MULTICONFIGS += "j7200_sr2-hs-fs-evm"
+
+# Since default tiboot3.bin on J721e is for GP, add a version for SR2.0 HS-SE
+TI_BOOTLOADERS += "tiboot3-j7200_sr2-hs-evm.bin"
+TI_MULTICONFIGS += "j7200_sr2-hs-evm"
+
 TFA_BOARD = "generic"
 
 OPTEEMACHINE = "k3-j721e"
 
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "ti-eth-fw-j7200"
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "ti-eth-fw"

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

@@ -1,24 +1,46 @@
 require conf/machine/include/k3.inc
-require conf/machine/include/mc_k3r5.inc
-
 SOC_FAMILY:append = ":j721e"
 
-MACHINE_FEATURES += "screen"
+MACHINE_FEATURES += "screen gpu"
 
 require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
 
-# Deploy SYSFW and any variants
-IMAGE_BOOT_FILES += "sysfw.itb sysfw-*-evm.itb"
+TI_BOOTLOADERS += "sysfw.itb"
+
+# Default on J721e is for GP
+TI_BOOTLOADERS += "tiboot3-j721e-gp-evm.bin"
+TI_BOOTLOADERS += "sysfw-j721e-gp-evm.itb"
+TI_MULTICONFIGS += "j721e-gp-evm"
+
+# Since default on J721e is for GP, add a version for SR1.1 HS-FS
+IMAGE_SR1_1_HS_FS_FILES = "tiboot3-j721e_sr1_1-hs-fs-evm.bin sysfw-j721e_sr1_1-hs-fs-evm.itb"
+IMAGE_SR1_1_HS_FS_FILES:bsp-mainline = ""
+MULTICONFIG_SR1_1_HS_FS = "j721e_sr1_1-hs-fs-evm"
+MULTICONFIG_SR1_1_HS_FS:bsp-mainline = ""
+TI_BOOTLOADERS += "${IMAGE_SR1_1_HS_FS_FILES}"
+TI_MULTICONFIGS += "${MULTICONFIG_SR1_1_HS_FS}"
+
+# Since default on J721e is for GP, add a version for SR1.1 HS-SE
+IMAGE_SR1_1_HS_SE_FILES = "tiboot3-j721e_sr1_1-hs-evm.bin sysfw-j721e_sr1_1-hs-evm.itb"
+TI_BOOTLOADERS += "${IMAGE_SR1_1_HS_SE_FILES}"
+TI_MULTICONFIGS += "j721e_sr1_1-hs-evm"
+
+# Since default on J721e is for GP, add a version for SR2.0 HS-FS
+IMAGE_SR2_HS_FS_FILES = "tiboot3-j721e_sr2-hs-fs-evm.bin sysfw-j721e_sr2-hs-fs-evm.itb"
+TI_BOOTLOADERS += "${IMAGE_SR2_HS_FS_FILES}"
+TI_MULTICONFIGS += "j721e_sr2-hs-fs-evm"
+
+# Since default on J721e is for GP, add a version for SR2.0 HS-SE
+IMAGE_SR2_HS_SE_FILES = "tiboot3-j721e_sr2-hs-evm.bin sysfw-j721e_sr2-hs-evm.itb"
+IMAGE_SR2_HS_SE_FILES:bsp-mainline = ""
+MULTICONFIG_SR2_HS_SE = "j721e_sr2-hs-evm"
+MULTICONFIG_SR2_HS_SE:bsp-mainline = ""
+TI_BOOTLOADERS += "${IMAGE_SR2_HS_SE_FILES}"
+TI_MULTICONFIGS += "${MULTICONFIG_SR2_HS_SE}"
 
 TFA_BOARD = "generic"
 
 OPTEEMACHINE = "k3-j721e"
 
-TI_VXE_VXD_DRIVER = "ti-vxe-vxd-driver"
-TI_VXE_VXD_DRIVER:bsp-ti-6_6 = ""
-
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw ti-eth-fw-j721e ${TI_VXE_VXD_DRIVER}"
-
-TI_INITRAMFS_KERNEL_MODULES:append:bsp-mainline = " kernel-module-cdns-pltfrm kernel-module-ti-j721e-ufs"
-TI_INITRAMFS_KERNEL_MODULES:append:bsp-next = " kernel-module-cdns-pltfrm kernel-module-ti-j721e-ufs"
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw ti-eth-fw"

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

@@ -1,13 +1,23 @@
 require conf/machine/include/k3.inc
-require conf/machine/include/mc_k3r5.inc
-
 SOC_FAMILY:append = ":j721s2"
 
-MACHINE_FEATURES += "screen"
+MACHINE_FEATURES += "screen gpu"
 
 require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
 
+# Default tiboot3.bin on J721S2 is for GP
+TI_BOOTLOADERS += "tiboot3-j721s2-gp-evm.bin"
+TI_MULTICONFIGS += "j721s2-gp-evm"
+
+# Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-FS
+TI_BOOTLOADERS += "tiboot3-j721s2-hs-fs-evm.bin"
+TI_MULTICONFIGS += "j721s2-hs-fs-evm"
+
+# Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-SE
+TI_BOOTLOADERS += "tiboot3-j721s2-hs-evm.bin"
+TI_MULTICONFIGS += "j721s2-hs-evm"
+
 TFA_BOARD = "generic"
 
 OPTEEMACHINE = "k3-j784s4"

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

@@ -1,13 +1,25 @@
 require conf/machine/include/k3.inc
-require conf/machine/include/mc_k3r5.inc
-
 SOC_FAMILY:append = ":j722s"
 
-MACHINE_FEATURES += "screen"
+MACHINE_FEATURES += "screen gpu"
 
 require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
 
+# Default tiboot3.bin on J722S is for HS-FS
+TI_BOOTLOADERS += "tiboot3-j722s-hs-fs-evm.bin"
+TI_MULTICONFIGS += "j722s-hs-fs-evm"
+
+# Since default tiboot3.bin on J722S is for HS-FS, add a version for HS-SE
+IMAGE_SR1_HS_SE_FILES = "tiboot3-j722s-hs-evm.bin"
+IMAGE_SR1_HS_SE_FILES:bsp-mainline = ""
+IMAGE_SR1_HS_SE_FILES:bsp-next = ""
+MULTICONFIG_SR1_HS_SE = "j722s-hs-evm"
+MULTICONFIG_SR1_HS_SE:bsp-mainline = ""
+MULTICONFIG_SR1_HS_SE:bsp-next = ""
+TI_BOOTLOADERS += "${IMAGE_SR1_HS_SE_FILES}"
+TI_MULTICONFIGS += "${MULTICONFIG_SR1_HS_SE}"
+
 TFA_BOARD = "lite"
 TFA_K3_SYSTEM_SUSPEND = "1"
 

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

@@ -1,13 +1,19 @@
 require conf/machine/include/k3.inc
-require conf/machine/include/mc_k3r5.inc
-
 SOC_FAMILY:append = ":j742s2"
 
-MACHINE_FEATURES += "screen"
+MACHINE_FEATURES += "screen gpu"
 
 require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
 
+# Default tiboot3.bin on J742S2 is for HS-FS
+TI_BOOTLOADERS += "tiboot3-j742s2-hs-fs-evm.bin"
+TI_MULTICONFIGS += "j742s2-hs-fs-evm"
+
+# Since default tiboot3.bin on J742S2 is for HS-FS, add a version for SR1.0 HS-SE
+TI_BOOTLOADERS += "tiboot3-j742s2-hs-evm.bin"
+TI_MULTICONFIGS += "j742s2-hs-evm"
+
 TFA_BOARD = "j784s4"
 
 OPTEEMACHINE = "k3-j784s4"

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

@@ -1,18 +1,25 @@
 require conf/machine/include/k3.inc
-require conf/machine/include/mc_k3r5.inc
-
 SOC_FAMILY:append = ":j784s4"
 
-MACHINE_FEATURES += "screen"
+MACHINE_FEATURES += "screen gpu"
 
 require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
 
+# Default tiboot3.bin on J784S4 is for GP
+TI_BOOTLOADERS += "tiboot3-j784s4-gp-evm.bin"
+TI_MULTICONFIGS += "j784s4-gp-evm"
+
+# Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-FS
+TI_BOOTLOADERS += "tiboot3-j784s4-hs-fs-evm.bin"
+TI_MULTICONFIGS += "j784s4-hs-fs-evm"
+
+# Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-SE
+TI_BOOTLOADERS += "tiboot3-j784s4-hs-evm.bin"
+TI_MULTICONFIGS += "j784s4-hs-evm"
+
 TFA_BOARD = "j784s4"
 
 OPTEEMACHINE = "k3-j784s4"
 
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw ti-eth-fw-j784s4"
-
-TI_INITRAMFS_KERNEL_MODULES:append:bsp-mainline = " kernel-module-cdns-pltfrm kernel-module-ti-j721e-ufs"
-TI_INITRAMFS_KERNEL_MODULES:append:bsp-next = " kernel-module-cdns-pltfrm kernel-module-ti-j721e-ufs"
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw ti-eth-fw"

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

@@ -3,33 +3,39 @@
 require conf/machine/include/ti-soc.inc
 SOC_FAMILY:append = ":k3"
 
-DEFAULTTUNE ?= "aarch64"
-require conf/machine/include/arm/armv8a/tune-cortexa72-cortexa53.inc
+require conf/machine/include/arm/arch-arm64.inc
+
+BBMULTICONFIG += "k3r5"
 
 require conf/machine/include/ti-bsp.inc
 
 KERNEL_IMAGETYPE = "Image"
-KERNEL_CLASSES += "kernel-fit-extra-artifacts"
+KERNEL_IMAGETYPES = "Image fitImage"
+KERNEL_CLASSES += "kernel-fitimage"
 
 UBOOT_ARCH = "arm"
-UBOOT_DTB_LOADADDRESS = "0x88000000"
-UBOOT_DTBO_LOADADDRESS = "0x88080000"
+UBOOT_ENTRYPOINT = "0x81000000"
+UBOOT_LOADADDRESS = "0x81000000"
+UBOOT_RD_LOADADDRESS = "0x84000000"
+UBOOT_RD_ENTRYPOINT = "0x84000000"
+UBOOT_DTB_LOADADDRESS = "0x83000000"
+UBOOT_DTBO_LOADADDRESS = "0x83080000"
 UBOOT_DTBO_OFFSET = "0x00010000"
 
 SPL_BINARY = "tispl.bin"
 SPL_BINARYNAME = "tispl.bin"
 UBOOT_SUFFIX = "img"
 
-FIT_KERNEL_SIGN_ENABLE = "1"
-FIT_KERNEL_SIGN_KEYNAME ?= "custMpk"
-FIT_KERNEL_SIGN_KEYDIR ?= "${TI_SECURE_DEV_PKG}/keys"
+UBOOT_SIGN_ENABLE = "1"
 UBOOT_MKIMAGE_DTCOPTS = "-I dts -O dtb"
+UBOOT_SIGN_KEYNAME ?= "custMpk"
+UBOOT_SIGN_KEYDIR ?= "${TI_SECURE_DEV_PKG}/keys"
 FIT_HASH_ALG ?= "sha512"
 FIT_SIGN_ALG ?= "rsa4096"
 
 EXTRA_IMAGEDEPENDS += "virtual/bootloader"
 
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-image ti-kernel-fitimage"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-image"
 
 TFA_PLATFORM = "k3"
 
@@ -38,12 +44,14 @@ TFA_PLATFORM = "k3"
 UBI_VOLNAME = "rootfs"
 
 # List common SoC features, may need to add touchscreen for specific machines
-MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa pci optee-ftpm"
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "ti-pka-fw"
+MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa pci"
 
 IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
 
-IMAGE_BOOT_FILES ?= "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin tiboot3-*-evm.bin"
+TI_BOOTLOADERS ?= "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin"
+TI_MULTICONFIGS = ""
+
+IMAGE_BOOT_FILES ?= "${TI_BOOTLOADERS}"
 IMAGE_EFI_BOOT_FILES ?= "${IMAGE_BOOT_FILES}"
 
 EFI_PROVIDER ?= "grub-efi"
@@ -51,13 +59,7 @@ MACHINE_FEATURES += "efi"
 
 WKS_FILE ?= "${@bb.utils.contains("MACHINE_FEATURES", "efi", "sdimage-2part-efi.wks.in", "sdimage-2part.wks", d)}"
 
-TI_WKS_BOOTLOADER_APPEND ?= ""
-
 do_image_wic[depends] += "virtual/bootloader:do_deploy"
+do_image[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"
 
 SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2"
-
-FALCON_INCLUDE = ""
-FALCON_INCLUDE:ti-falcon = "conf/machine/include/ti-falcon.inc"
-
-require ${FALCON_INCLUDE}

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

@@ -15,8 +15,13 @@ require conf/machine/include/arm/armv7a/tune-cortexa8.inc
 require conf/machine/include/ti-bsp.inc
 PREFERRED_PROVIDER_virtual/kernel = "linux-dummy"
 
+SPL_SUFFIX = "bin"
+SPL_BINARY = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.${SPL_SUFFIX}"
+SPL_SYMLINK = "tiboot3.${SPL_SUFFIX}"
 UBOOT_SUFFIX = "bin"
-UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
+UBOOT_BINARY = "u-boot-r5spl.${UBOOT_SUFFIX}"
+UBOOT_IMAGE = "u-boot-r5spl-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
+UBOOT_SYMLINK = "u-boot-r5spl-${MAINMACHINE}.${UBOOT_SUFFIX}"
 
 PACKAGECONFIG:pn-u-boot-ti-staging = ""
 PACKAGECONFIG:pn-u-boot-ti-mainline = ""

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

@@ -1,3 +0,0 @@
-BBMULTICONFIG += "k3r5"
-
-do_image[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"

meta-ti-bsp/conf/machine/include/omap-a15.inc

@@ -0,0 +1,53 @@
+require conf/machine/include/ti-soc.inc
+SOC_FAMILY:append = ":omap-a15"
+
+DEFAULTTUNE ?= "armv7athf-neon"
+require conf/machine/include/arm/armv7a/tune-cortexa15.inc
+
+require conf/machine/include/ti-bsp.inc
+
+# Graphics providers and variables
+require conf/machine/include/mesa-pvr.inc
+PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}"
+PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm"
+
+KERNEL_IMAGETYPE = "zImage"
+KERNEL_IMAGETYPES = "zImage uImage"
+KERNEL_CLASSES += "kernel-uimage"
+
+UBOOT_ARCH = "arm"
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+
+DEVICETREE_FILE = "${@(d.getVar('KERNEL_DEVICETREE') or "").replace("ti/omap/","").replace("ti/","")}"
+
+# Generate an extlinux.conf file
+UBOOT_EXTLINUX = "1"
+UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}"
+UBOOT_EXTLINUX_BOOT_FILES = " \
+    extlinux.conf;extlinux/extlinux.conf \
+    ${KERNEL_IMAGETYPE} \
+    ${DEVICETREE_FILE} \
+"
+
+SPL_BINARY = "MLO"
+UBOOT_SUFFIX = "img"
+
+EXTRA_IMAGEDEPENDS += "virtual/bootloader"
+
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-zimage"
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "vpdma-fw goodix-fw"
+
+# Use the expected value of the ubifs filesystem's volume name in the kernel
+# and u-boot.
+UBI_VOLNAME = "rootfs"
+
+# List common SoC features, may need to add touchscreen for specific machines
+MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 screen alsa gpu mmip dsp gc320"
+
+IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
+WKS_FILE ?= "sdimage-2part.wks"
+TI_BOOTLOADERS ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
+TI_MULTICONFIGS = ""
+do_image_wic[depends] += "virtual/bootloader:do_deploy"

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

@@ -3,8 +3,8 @@
 # preferences for kernel, bootloader and graphics components, as
 # well as a dedicated machine override.
 
-# Supported options are: mainline, next, ti-6_18, ti-6_12, ti-6_6
-TI_PREFERRED_BSP ??= "ti-6_12"
+# Supported options are: mainline, next, ti-6_6, ti-6_1, bb_org
+TI_PREFERRED_BSP ??= "ti-6_6"
 
 # Use bsp-* namespace for overrides
 MACHINEOVERRIDES =. "bsp-${TI_PREFERRED_BSP}:"
@@ -18,8 +18,9 @@ BSP_KERNEL_VERSION:bsp-mainline = "%"
 BSP_BOOTLOADER_PROVIDER:bsp-mainline = "u-boot-ti-mainline"
 BSP_BOOTLOADER_VERSION:bsp-mainline = "%"
 
-# GC320 support requires out-of-tree drivers not available in mainline
-MACHINE_FEATURES:remove:bsp-mainline = "gc320"
+# GPU support requires out-of-tree SGX and Rogue drivers not available
+# in mainline, usually present in TI staging or derivative like BB.org
+MACHINE_FEATURES:remove:bsp-mainline = "gpu"
 
 # ==========
 # next
@@ -27,53 +28,63 @@ MACHINE_FEATURES:remove:bsp-mainline = "gc320"
 # ==========
 BSP_KERNEL_PROVIDER:bsp-next = "linux-ti-next"
 BSP_KERNEL_VERSION:bsp-next = "%"
-BSP_BOOTLOADER_PROVIDER:bsp-next = "u-boot-ti-next"
+BSP_BOOTLOADER_PROVIDER:bsp-next = "u-boot-ti-mainline"
 BSP_BOOTLOADER_VERSION:bsp-next = "%"
 
-# GC320 support requires out-of-tree drivers not yet available in next
-MACHINE_FEATURES:remove:bsp-next = "gc320"
-
-# ==========
-# ti-6_18
-# TI staging kernel 6.18, u-boot 2026.01
-# ==========
-BSP_KERNEL_PROVIDER:bsp-ti-6_18 = "linux-ti-staging"
-BSP_KERNEL_VERSION:bsp-ti-6_18 = "6.18%"
-BSP_BOOTLOADER_PROVIDER:bsp-ti-6_18 = "u-boot-ti-staging"
-BSP_BOOTLOADER_VERSION:bsp-ti-6_18 = "2026.01%"
-
-# ==========
-# ti-6_12
-# TI staging kernel 6.12, u-boot 2025.01
-# ==========
-BSP_KERNEL_PROVIDER:bsp-ti-6_12 = "linux-ti-staging"
-BSP_KERNEL_VERSION:bsp-ti-6_12 = "6.12%"
-BSP_BOOTLOADER_PROVIDER:bsp-ti-6_12 = "u-boot-ti-staging"
-BSP_BOOTLOADER_VERSION:bsp-ti-6_12 = "2025.01%"
-
-BSP_SGX_DRIVER_PROVIDER:bsp-ti-6_12 = "ti-sgx-ddk-km"
-BSP_SGX_DRIVER_VERSION:bsp-ti-6_12 = "1.17%"
-BSP_ROGUE_DRIVER_PROVIDER:bsp-ti-6_12 = "ti-img-rogue-driver"
-BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_12 = "25%"
-BSP_MESA_PVR_VERSION:bsp-ti-6_12 = "24%"
+# GPU support requires out-of-tree SGX and Rogue drivers not available
+# in next, usually present in TI staging or derivative like BB.org
+MACHINE_FEATURES:remove:bsp-next = "gpu"
 
 # ==========
 # ti-6_6
 # TI staging kernel 6.6, u-boot 2024.04
 # ==========
 BSP_KERNEL_PROVIDER:bsp-ti-6_6 = "linux-ti-staging"
-BSP_KERNEL_VERSION:bsp-ti-6_6 = "6.6.%"
+BSP_KERNEL_VERSION:bsp-ti-6_6 = "6.6%"
 BSP_BOOTLOADER_PROVIDER:bsp-ti-6_6 = "u-boot-ti-staging"
-BSP_BOOTLOADER_VERSION:bsp-ti-6_6 = "2024.04%"
+BSP_BOOTLOADER_VERSION:bsp-ti-6_6 = "2024%"
 
-BSP_SGX_DRIVER_PROVIDER:bsp-ti-6_6 = "ti-sgx-ddk-km"
-BSP_SGX_DRIVER_VERSION:bsp-ti-6_6 = "1.17%"
+# Only Rogue is enabled so far, SGX falls back to SW rendering
 BSP_ROGUE_DRIVER_PROVIDER:bsp-ti-6_6 = "ti-img-rogue-driver"
-BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_6 = "25%"
-BSP_MESA_PVR_VERSION:bsp-ti-6_6 = "24%"
+BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_6 = "24%"
+BSP_ROGUE_UMLIBS_VERSION:bsp-ti-6_6 = "24%"
+BSP_MESA_PVR_VERSION:bsp-ti-6_6 = "23%"
 
-# GC320 support requires out-of-tree drivers not yet available in 6.6
-MACHINE_FEATURES:remove:bsp-ti-6_6 = "gc320"
+# ==========
+# ti-6_1
+# TI staging kernel 6.1, u-boot 2023.04
+# ==========
+BSP_KERNEL_PROVIDER:bsp-ti-6_1 = "linux-ti-staging"
+BSP_KERNEL_VERSION:bsp-ti-6_1 = "6.1%"
+BSP_BOOTLOADER_PROVIDER:bsp-ti-6_1 = "u-boot-ti-staging"
+BSP_BOOTLOADER_VERSION:bsp-ti-6_1 = "2023%"
+
+BSP_SGX_DRIVER_PROVIDER:bsp-ti-6_1 = "ti-sgx-ddk-km"
+BSP_SGX_DRIVER_VERSION:bsp-ti-6_1 = "1.17%"
+BSP_SGX_UMLIBS_VERSION:bsp-ti-6_1 = "1.17%"
+BSP_ROGUE_DRIVER_PROVIDER:bsp-ti-6_1 = "ti-img-rogue-driver"
+BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_1 = "23%"
+BSP_ROGUE_UMLIBS_VERSION:bsp-ti-6_1 = "23%"
+BSP_MESA_PVR_VERSION:bsp-ti-6_1 = "22%"
+
+# ==========
+# bb_org
+# BeagleBoard.org kernel 6.1, u-boot 2023.04
+# based on TI staging trees with extra Beagle-specific features
+# but may not be up-to-date with TI version
+# ==========
+BSP_KERNEL_PROVIDER:bsp-bb_org = "linux-bb.org"
+BSP_KERNEL_VERSION:bsp-bb_org = "%"
+BSP_BOOTLOADER_PROVIDER:bsp-bb_org = "u-boot-bb.org"
+BSP_BOOTLOADER_VERSION:bsp-bb_org = "%"
+
+BSP_SGX_DRIVER_PROVIDER:bsp-bb_org = "ti-sgx-ddk-km"
+BSP_SGX_DRIVER_VERSION:bsp-bb_org = "1.17%"
+BSP_SGX_UMLIBS_VERSION:bsp-bb_org = "1.17%"
+BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org = "ti-img-rogue-driver"
+BSP_ROGUE_DRIVER_VERSION:bsp-bb_org = "23%"
+BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org = "23%"
+BSP_MESA_PVR_VERSION:bsp-bb_org = "22%"
 
 # ==========
 # sane fallback defaults
@@ -89,6 +100,8 @@ BSP_SGX_DRIVER_PROVIDER ?= ""
 BSP_SGX_DRIVER_VERSION ?= ""
 BSP_ROGUE_DRIVER_PROVIDER ?= ""
 BSP_ROGUE_DRIVER_VERSION ?= ""
+BSP_SGX_UMLIBS_VERSION ?= ""
+BSP_ROGUE_UMLIBS_VERSION ?= ""
 BSP_MESA_PVR_VERSION ?= ""
 
 # ==========
@@ -96,7 +109,6 @@ BSP_MESA_PVR_VERSION ?= ""
 # ==========
 PREFERRED_PROVIDER_virtual/kernel ?= "${BSP_KERNEL_PROVIDER}"
 PREFERRED_VERSION_${BSP_KERNEL_PROVIDER} ?= "${BSP_KERNEL_VERSION}"
-PREFERRED_VERSION_${BSP_KERNEL_PROVIDER}-rt ?= "${BSP_KERNEL_VERSION}"
 PREFERRED_PROVIDER_virtual/bootloader ?= "${BSP_BOOTLOADER_PROVIDER}"
 PREFERRED_PROVIDER_u-boot ?= "${BSP_BOOTLOADER_PROVIDER}"
 PREFERRED_VERSION_${BSP_BOOTLOADER_PROVIDER} ?= "${BSP_BOOTLOADER_VERSION}"
@@ -104,7 +116,7 @@ PREFERRED_VERSION_${BSP_BOOTLOADER_PROVIDER} ?= "${BSP_BOOTLOADER_VERSION}"
 # GPU provider gets set in machine configs, as some machines are headless
 # Select default preferred versions here
 PREFERRED_VERSION_ti-sgx-ddk-km ?= "${BSP_SGX_DRIVER_VERSION}"
-PREFERRED_VERSION_ti-sgx-ddk-um ?= "${BSP_SGX_DRIVER_VERSION}"
+PREFERRED_VERSION_ti-sgx-ddk-um ?= "${BSP_SGX_UMLIBS_VERSION}"
 PREFERRED_VERSION_ti-img-rogue-driver ?= "${BSP_ROGUE_DRIVER_VERSION}"
-PREFERRED_VERSION_ti-img-rogue-umlibs ?= "${BSP_ROGUE_DRIVER_VERSION}"
+PREFERRED_VERSION_ti-img-rogue-umlibs ?= "${BSP_ROGUE_UMLIBS_VERSION}"
 PREFERRED_VERSION_mesa-pvr ?= "${BSP_MESA_PVR_VERSION}"

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

@@ -1,4 +1,4 @@
 # Add TI_EXTRAS to machine overrides so we get access to e.g. 'jailhouse'
 
 TI_EXTRAS ??= ""
-MACHINEOVERRIDES =. "${@ ':'.join('${TI_EXTRAS}'.strip().split()) + ':' if d.getVar('TI_EXTRAS') else ''}"
+MACHINEOVERRIDES =. "${@ '${TI_EXTRAS}:' if d.getVar('TI_EXTRAS').startswith('tie-') else ''}"

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

@@ -1,5 +0,0 @@
-IMAGE_INSTALL:append = " u-boot-ti-staging-falcon"
-KERNEL_CLASSES:remove = "kernel-fit-extra-artifacts"
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS:remove = "ti-kernel-fitimage"
-KERNEL_CLASSES += "kernel-fitimage-legacyhs"
-FIT_KERNEL_COMP_ALG = "none"

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

@@ -2,45 +2,7 @@
 # and platforms defined in meta-ti to allow BSP-level overrides.
 SOC_FAMILY = "ti-soc"
 require conf/machine/include/soc-family.inc
-require conf/machine/include/ti-extras.inc
-
-# kernel, initrd load addresses for the fitImage in all TI platforms
-UBOOT_ENTRYPOINT = "0x82000000"
-UBOOT_LOADADDRESS = "0x82000000"
-UBOOT_RD_LOADADDRESS = "0x84000000"
-UBOOT_RD_ENTRYPOINT = "0x84000000"
 
 # TI platforms all use devicetrees with overlays
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree"
-
-# Tell the kernel class to install the DTBs in the same directory structure as
-# the kernel
-KERNEL_DTBDEST = "${KERNEL_IMAGEDEST}/dtb"
-KERNEL_DTBVENDORED = "1"
-
-# Also build a non-vendored list w/o dir structure
-DEVICETREE_FILES = "${@' '.join([os.path.basename(f) for f in d.getVar("KERNEL_DEVICETREE").split()])}"
-
-KERNEL_DEVICETREE_DTBMERGE ?= ""
-
-# Dynamically build DTBs list based on prefix matching
-CLASS_DEVICETREE_PREFIX = "${@ 'ti-devicetree-prefix' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''}"
-
-KERNEL_CLASSES += "${CLASS_DEVICETREE_PREFIX}"
-IMAGE_CLASSES += "${CLASS_DEVICETREE_PREFIX}"
-
-BUILD_CORE_INITRAMFS_IMAGE = "ti-core-initramfs"
-BUILD_CORE_INITRAMFS_IMAGE_FILE = "${BUILD_CORE_INITRAMFS_IMAGE}.cpio.xz"
-
-BUILD_CORE_INITRAMFS_IMAGE_STEP ?= ""
-BUILD_CORE_INITRAMFS_IMAGE_STEP:bsp-mainline = "${BUILD_CORE_INITRAMFS_IMAGE}:do_image_complete"
-BUILD_CORE_INITRAMFS_IMAGE_STEP:bsp-next = "${BUILD_CORE_INITRAMFS_IMAGE}:do_image_complete"
-
-do_image_wic[depends] += "${BUILD_CORE_INITRAMFS_IMAGE_STEP}"
-
-TI_WKS_INITRAMFS ?= ""
-TI_WKS_INITRAMFS:bsp-mainline = ",initrd=${BUILD_CORE_INITRAMFS_IMAGE_FILE}"
-TI_WKS_INITRAMFS:bsp-next = ",initrd=${BUILD_CORE_INITRAMFS_IMAGE_FILE}"
-
-IMAGE_BOOT_FILES:append:bsp-mainline = " ${BUILD_CORE_INITRAMFS_IMAGE_FILE}"
-IMAGE_BOOT_FILES:append:bsp-next = " ${BUILD_CORE_INITRAMFS_IMAGE_FILE}"
+KERNEL_DTB_OVERLAY_SUPPORT ?= "1"

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

@@ -9,6 +9,7 @@ require conf/machine/include/ti-bsp.inc
 # Graphics providers and variables
 require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}"
+PVR_DISPLAY_CONTROLLER_ALIAS ?= "tilcdc"
 
 KERNEL_IMAGETYPE = "zImage"
 
@@ -63,6 +64,8 @@ UBOOT_MACHINE = "am335x_evm_config"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"
 
+DEVICETREE_FILE = "${@(d.getVar('KERNEL_DEVICETREE') or "").replace("ti/omap/","")}"
+
 # Generate an extlinux.conf file
 UBOOT_EXTLINUX = "1"
 UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}"
@@ -70,7 +73,7 @@ UBOOT_EXTLINUX_KERNEL_ARGS = "rootwait rw earlycon"
 UBOOT_EXTLINUX_BOOT_FILES = " \
     extlinux.conf;extlinux/extlinux.conf \
     ${KERNEL_IMAGETYPE} \
-    ${DEVICETREE_FILES} \
+    ${DEVICETREE_FILE} \
 "
 
 SPL_BINARY = "MLO"
@@ -87,9 +90,10 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-zimage"
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "amx3-cm3 prueth-fw pruhsr-fw pruprp-fw"
 
 # List common SoC features, may need to add touchscreen for specific machines
-MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa"
+MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa gpu"
 
 IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
 WKS_FILE ?= "sdimage-2part.wks"
-IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
+TI_BOOTLOADERS ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
+TI_MULTICONFIGS = ""
 do_image_wic[depends] += "virtual/bootloader:do_deploy"

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

@@ -9,6 +9,7 @@ require conf/machine/include/ti-bsp.inc
 # Graphics providers and variables
 require conf/machine/include/mesa-pvr.inc
 PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}"
+PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm"
 
 KERNEL_IMAGETYPE = "zImage"
 
@@ -36,13 +37,15 @@ UBOOT_MACHINE = "am43xx_evm_config"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"
 
+DEVICETREE_FILE = "${@(d.getVar('KERNEL_DEVICETREE') or "").replace("ti/omap/","")}"
+
 # Generate an extlinux.conf file
 UBOOT_EXTLINUX = "1"
 UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}"
 UBOOT_EXTLINUX_BOOT_FILES = " \
     extlinux.conf;extlinux/extlinux.conf \
     ${KERNEL_IMAGETYPE} \
-    ${DEVICETREE_FILES} \
+    ${DEVICETREE_FILE} \
 "
 
 SPL_BINARY = "MLO"
@@ -59,9 +62,10 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-zimage"
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "amx3-cm3 prueth-fw pruhsr-fw pruprp-fw"
 
 # List common SoC features, may need to add touchscreen for specific machines
-MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 screen alsa"
+MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 screen alsa gpu"
 
 IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
 WKS_FILE ?= "sdimage-2part.wks"
-IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
+TI_BOOTLOADERS ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
+TI_MULTICONFIGS = ""
 do_image_wic[depends] += "virtual/bootloader:do_deploy"

meta-ti-bsp/conf/machine/j7200-evm-k3r5.conf

@@ -4,4 +4,8 @@
 
 require conf/machine/include/k3r5.inc
 
+SYSFW_SOC = "j7200"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "gp"
+
 UBOOT_MACHINE = "j7200_evm_r5_defconfig"

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

@@ -6,10 +6,6 @@ require conf/machine/include/j7200.inc
 
 KERNEL_DEVICETREE_PREFIX = "ti/k3-j7200"
 
-KERNEL_DEVICETREE_DTBMERGE = " \
-    ti/k3-j7200-evm.dtb \
-"
-
 KERNEL_DEVICETREE = " \
     ti/k3-j7200-common-proc-board.dtb \
     ti/k3-j7200-evm-quad-port-eth-exp.dtbo \

meta-ti-bsp/conf/machine/j7200-hs-evm-k3r5.conf

@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: J7200 HS EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI J7200 HS EVM (R5F core)
+
+require conf/machine/include/k3r5.inc
+
+SYSFW_SOC = "j7200_sr2"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs"
+
+UBOOT_MACHINE = "j7200_evm_r5_defconfig"

meta-ti-bsp/conf/machine/j7200-hs-evm.conf

@@ -0,0 +1,7 @@
+#@TYPE: Machine
+#@NAME: J7200 HS EVM
+#@DESCRIPTION: Machine configuration for the TI J7200 HS EVM
+
+require conf/machine/j7200-evm.conf
+
+UBOOT_MACHINE = "j7200_evm_a72_defconfig"