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

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

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

TODO

@@ -0,0 +1,2 @@
+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,49 +0,0 @@
-{
-    "APPEND-1" : {
-        "skip_vars" : [ "ALTERNATIVE", "FILES", "INSANE_SKIP", "RDEPENDS", "RRECOMMENDS" ]
-    },
-    "APPEND-2" : {
-        "skip_vars" : [ "KERNEL_LOCALVERSION", "PR", "PV" ],
-        "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"
-        ]
-    },
-    "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-multimedia/ti-multimedia-udev/ti-multimedia-udev.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/beagleboard/gadget-init.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 = "scarthgap"
-
-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.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,15 +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
-
-SYSFW_SOC = "j722s"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
-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,12 +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
-
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
-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,12 +0,0 @@
-require recipes-bsp/u-boot/u-boot-ti.inc
-
-SUMMARY = "BeagleBoard.org U-Boot"
-
-COMPATIBLE_MACHINE = "beagle.*"
-
-PV = "2024.10"
-
-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_DTC_ARGS}"
-
-# 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 = "${WORKDIR}/git"
-
-# 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_DTC_ARGS}"
-
-# 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 = "${WORKDIR}/git"
-
-# 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 += "${WORKDIR}/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: scarthgap
+branch: master
 
 URI: git://git.yoctoproject.org/meta-arm
 layers: meta-arm
-branch: scarthgap
+branch: master
 
 
 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

@@ -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/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 = "scarthgap"
+LAYERSERIES_COMPAT_meta-ti-bsp = "scarthgap styhead"
 
 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,6 +10,11 @@ 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_CLASSES += " kernel-fitimage-legacyhs"
 KERNEL_IMAGETYPES += " fitImage"

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

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

@@ -25,22 +25,13 @@ KERNEL_DEVICETREE_DTBMERGE = " \
 "
 
 KERNEL_DEVICETREE = " \
-    ti/omap/am571x-idk-touchscreen.dtbo \
-    ti/omap/am571x-idk.dtb \
-    ti/omap/am5729-beagleboneai.dtb \
-    ti/omap/am572x-idk-touchscreen.dtbo \
-    ti/omap/am572x-idk.dtb \
-    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-beagle-x15.dtb \
-    ti/omap/am57xx-cl-som-am57x.dtb \
-    ti/omap/am57xx-evm-reva3.dtb \
-    ti/omap/am57xx-evm.dtb \
-    ti/omap/am57xx-evm.dtbo \
-    ti/omap/am57xx-idk-lcd-osd101t2045.dtbo \
-    ti/omap/am57xx-idk-lcd-osd101t2587.dtbo \
-    ti/omap/am57xx-sbc-am57x.dtb \
+    ti/omap/am5729-beagleboneai.dtb \
+    ti/omap/am571x-idk.dtb \
+    ti/omap/am572x-idk.dtb \
+    ti/omap/am574x-idk.dtb \
 "
 
 UBOOT_MACHINE = "am57xx_evm_config"

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"

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

@@ -9,5 +9,3 @@ SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "hs-fs"
 
 UBOOT_MACHINE = "am62ax_evm_r5_defconfig"
-
-UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"

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

@@ -11,19 +11,8 @@ 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 \
-    ti/k3-am62x-sk-csi2-tevi-ov5640.dtbo \
-    ti/k3-am62x-sk-hdmi-audio.dtbo \
 "
 
-FIT_CONF_DEFAULT_DTB = "ti/k3-am62a7-sk.dtb"
-
 UBOOT_MACHINE = "am62ax_evm_a53_defconfig"

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

@@ -1,11 +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
-
-SYSFW_SOC = "am62dx"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
-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 = "ti/k3-am62d2-evm.dtb"
-
-UBOOT_MACHINE = "am62dx_evm_a53_defconfig"
-
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "ti-dac-fw ti-adc-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,11 +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,26 +3,19 @@
 #@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 = " \
     ti/k3-am62p5-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 \
 "
 
-FIT_CONF_DEFAULT_DTB = "ti/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
@@ -31,3 +24,5 @@ UBOOT_MACHINE = "am62px_evm_a53_defconfig"
 # 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_CONFIG_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

@@ -3,11 +3,10 @@
 #@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 = "am62x_evm_r5_defconfig"
-
-UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"

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

@@ -3,6 +3,7 @@
 #@DESCRIPTION: Machine configuration for the TI AM62XX EVM
 
 require conf/machine/include/am62xx.inc
+require conf/machine/include/ti-extras.inc
 
 KERNEL_DEVICETREE_PREFIX = " \
     ti/k3-am625 \
@@ -10,26 +11,7 @@ KERNEL_DEVICETREE_PREFIX = " \
 "
 
 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 \
-    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 \
 "
 
-FIT_CONF_DEFAULT_DTB = "ti/k3-am625-sk.dtb"
-
 UBOOT_MACHINE = "am62x_evm_a53_defconfig"

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

@@ -3,11 +3,10 @@
 #@DESCRIPTION: Machine configuration for the TI AM62xx LP GP EVM (R5F core)
 
 require conf/machine/include/k3r5.inc
+require conf/machine/include/ti-extras.inc
 
 SYSFW_SOC = "am62x"
 SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "hs-fs"
 
 UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"
-
-UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"

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

@@ -3,26 +3,18 @@
 #@DESCRIPTION: Machine configuration for the TI AM62XX LP EVM
 
 require conf/machine/include/am62xx.inc
+require conf/machine/include/ti-extras.inc
 
 KERNEL_DEVICETREE_PREFIX = " \
     ti/k3-am62-lp \
     ti/k3-am625-sk \
-    ti/k3-am62x-sk-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 = "ti/k3-am62-lp-sk.dtb"
-
 UBOOT_MACHINE = "am62x_lpsk_a53_defconfig"

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

@@ -8,5 +8,8 @@ SYSFW_SOC = "am62x"
 SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "hs-fs"
 
-UBOOT_MACHINE = "am6254xxl_evm_r5_defconfig"
-UBOOT_MACHINE:bsp-ti-6_6 = "am62xsip_evm_r5_defconfig"
+UBOOT_MACHINE = "am62xsip_evm_r5_defconfig"
+
+UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_r5_defconfig"
+
+UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "am62xsip_sk_r5.config"

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

@@ -4,15 +4,6 @@
 
 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 = ""
-
 KERNEL_DEVICETREE_PREFIX = " \
     ti/k3-am625 \
     ti/k3-am62x-sk \
@@ -22,8 +13,6 @@ KERNEL_DEVICETREE = " \
     ti/k3-am625-sk.dtb \
 "
 
-FIT_CONF_DEFAULT_DTB = "ti/k3-am6254xxl-sk.dtb"
-FIT_CONF_DEFAULT_DTB:bsp-ti-6_6 = "ti/k3-am625-sk.dtb"
+UBOOT_MACHINE = "am62xsip_evm_a53_defconfig"
 
-UBOOT_MACHINE = "am6254xxl_evm_a53_defconfig"
-UBOOT_MACHINE:bsp-ti-6_6 = "am62xsip_evm_a53_defconfig"
+UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_a53_defconfig"

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

@@ -17,7 +17,6 @@ KERNEL_DEVICETREE_PREFIX = " \
 
 KERNEL_DEVICETREE = " \
     ti/k3-am68-sk-base-board.dtb \
-    ti/k3-j721e-sk-csi2-dual-imx219.dtbo \
 "
 
 UBOOT_MACHINE = "am68_sk_a72_defconfig"

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

@@ -18,7 +18,6 @@ KERNEL_DEVICETREE_PREFIX = " \
 
 KERNEL_DEVICETREE = " \
     ti/k3-am69-sk.dtb \
-    ti/k3-j721e-sk-csi2-dual-imx219.dtbo \
 "
 
 UBOOT_MACHINE = "am69_sk_a72_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

@@ -2,8 +2,9 @@
 #@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
-require conf/machine/include/beagle-bsp.inc
 
 SYSFW_SOC = "j721e"
 SYSFW_CONFIG = "evm"
@@ -15,4 +16,8 @@ UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
 UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
 UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
 
-UBOOT_MACHINE = "j721e_beagleboneai64_r5_defconfig"
+UBOOT_MACHINE = "j721e_evm_r5_defconfig"
+UBOOT_MACHINE:bsp-ti-6_6 = "j721e_beagleboneai64_r5_defconfig"
+
+UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "j721e_beagleboneai64_r5.config"
+UBOOT_CONFIG_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_CONFIG_FRAGMENTS:bsp-ti-6_1 = "j721e_beagleboneai64_a72.config"
+UBOOT_CONFIG_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_CONFIG_FRAGMENTS:bsp-bb_org = "am625_beagleplay_r5.config"
+UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "am625_beagleplay_r5.config"
+UBOOT_CONFIG_FRAGMENTS:bsp-mainline = "beagleplay_r5.config"

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

@@ -1,11 +0,0 @@
-#@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_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,78 @@
+#@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_CONFIG_FRAGMENTS:bsp-ti-6_1 = "am625_beagleplay_a53.config"
+UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "am625_beagleplay_a53.config"
+UBOOT_CONFIG_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.dtb \
+ti/k3-am625-sk.dtb \
+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-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/am62axx.inc

@@ -1,12 +1,19 @@
 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
+IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-fs-evm.bin"
+
+# Since default tiboot3.bin on AM62A is for HS-FS, add a version for GP
+IMAGE_BOOT_FILES += "tiboot3-am62ax-gp-evm.bin"
+
+# Since default tiboot3.bin on AM62A is for HS-FS, add a version for HS-SE
+IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-evm.bin"
+
 TFA_BOARD = "lite"
 OPTEEMACHINE = "k3-am62x"
 

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,14 @@
 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
+IMAGE_BOOT_FILES += "tiboot3-am62px-hs-fs-evm.bin"
+
 TFA_BOARD = "lite"
 TFA_K3_SYSTEM_SUSPEND = "1"
 

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

@@ -1,13 +1,20 @@
 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
+IMAGE_BOOT_FILES += "tiboot3-am62x-hs-fs-evm.bin"
+
+# Since default tiboot3.bin on AM62x is for HS-FS, add a version for GP
+IMAGE_BOOT_FILES += "tiboot3-am62x-gp-evm.bin"
+
+# Since default tiboot3.bin on AM62x is for HS-FS, add a version for HS-SE
+IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin"
+
 # 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,24 @@
 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.dtb \
+    ti/k3-am642-sk.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
+IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-fs-evm.bin"
+
+# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP
+IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin"
+
+# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for SR2.0 HS-SE
+IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin"
 
 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,40 +1,26 @@
 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 \
-    ti/k3-am654-icssg2.dtbo \
-    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
+IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-gp-evm.bin"
+IMAGE_BOOT_FILES += "sysfw-am65x_sr2-gp-evm.itb"
+
+# Since default on AM65x is for GP, add a version for HS-SE
+IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-hs-evm.bin"
+IMAGE_BOOT_FILES += "sysfw-am65x_sr2-hs-evm.itb"
 
 TFA_BOARD = "generic"
 

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

@@ -1,13 +1,17 @@
 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
+IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin"
+
+# Since default tiboot3.bin on AM68 is for HS-FS, add a version for SR1.0 HS-SE
+IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-evm.bin"
+
 TFA_BOARD = "generic"
 
 OPTEEMACHINE = "k3-j784s4"

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

@@ -1,15 +1,19 @@
 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
+IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin"
+
+# Since default tiboot3.bin on AM69 is for HS-FS, add a version for SR1.0 HS-SE
+IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-evm.bin"
+
 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/j7200.inc

@@ -1,10 +1,27 @@
 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 = ""
+IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_FS_FILES}"
+
+# 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 = ""
+IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_SE_FILES}"
+
+# Since default tiboot3.bin on J7200 is for GP, add a version for SR2.0 HS-FS
+IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-fs-evm.bin"
+
+# Since default tiboot3.bin on J721e is for GP, add a version for SR2.0 HS-SE
+IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-evm.bin"
+
 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,21 +1,37 @@
 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"
+IMAGE_BOOT_FILES += "sysfw.itb"
+
+# Default on J721e is for GP
+IMAGE_BOOT_FILES += "tiboot3-j721e-gp-evm.bin"
+IMAGE_BOOT_FILES += "sysfw-j721e-gp-evm.itb"
+
+# Since default on J721e is for GP, add a version for 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 = ""
+IMAGE_BOOT_FILES += "${IMAGE_SR1_1_HS_FS_FILES}"
+
+# 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"
+IMAGE_BOOT_FILES += "${IMAGE_SR1_1_HS_SE_FILES}"
+
+# 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"
+IMAGE_BOOT_FILES += "${IMAGE_SR2_HS_FS_FILES}"
+
+# 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 = ""
+IMAGE_BOOT_FILES += "${IMAGE_SR2_HS_SE_FILES}"
 
 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}"
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw ti-eth-fw"

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

@@ -1,13 +1,20 @@
 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
+IMAGE_BOOT_FILES += "tiboot3-j721s2-gp-evm.bin"
+
+# Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-FS
+IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin"
+
+# Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-SE
+IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-evm.bin"
+
 TFA_BOARD = "generic"
 
 OPTEEMACHINE = "k3-j784s4"

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

@@ -1,13 +1,19 @@
 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
+IMAGE_BOOT_FILES += "tiboot3-j722s-hs-fs-evm.bin"
+
+# Since default tiboot3.bin on J722S is for HS-FS, add a version for HS-SE
+IMAGE_SR1_HS_SE_FILES = "tiboot3-j722s-hs-evm.bin"
+IMAGE_SR1_HS_SE_FILES:bsp-next = ""
+IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_SE_FILES}"
+
 TFA_BOARD = "lite"
 TFA_K3_SYSTEM_SUSPEND = "1"
 

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

@@ -1,15 +0,0 @@
-require conf/machine/include/k3.inc
-require conf/machine/include/mc_k3r5.inc
-
-SOC_FAMILY:append = ":j742s2"
-
-MACHINE_FEATURES += "screen"
-
-require conf/machine/include/mesa-pvr.inc
-PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
-
-TFA_BOARD = "j784s4"
-
-OPTEEMACHINE = "k3-j784s4"
-
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw"

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

@@ -1,15 +1,22 @@
 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
+IMAGE_BOOT_FILES += "tiboot3-j784s4-gp-evm.bin"
+
+# Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-FS
+IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin"
+
+# Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-SE
+IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-evm.bin"
+
 TFA_BOARD = "j784s4"
 
 OPTEEMACHINE = "k3-j784s4"
 
-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/k3.inc

@@ -3,8 +3,9 @@
 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
 
@@ -13,8 +14,12 @@ 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"
@@ -39,12 +44,11 @@ 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"
+IMAGE_BOOT_FILES ?= "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin"
 IMAGE_EFI_BOOT_FILES ?= "${IMAGE_BOOT_FILES}"
 
 EFI_PROVIDER ?= "grub-efi"
@@ -52,13 +56,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/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

@@ -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"
 KERNEL_IMAGETYPES = "zImage uImage"
@@ -18,13 +19,15 @@ 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_FILES} \
+    ${DEVICETREE_FILE} \
 "
 
 SPL_BINARY = "MLO"
@@ -41,10 +44,9 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "vpdma-fw goodix-fw"
 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"
+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"
-IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES} ipc/dra7-ipu1-fw.xem4;dra7-ipu1-fw.xem4"
+IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
 do_image_wic[depends] += "virtual/bootloader:do_deploy"
-do_image_wic[depends] += "ti-rtos-messageq-test-fw: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_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,44 +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 available in next
-MACHINE_FEATURES:remove:bsp-next = "gc320"
-
-# ==========
-# 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
@@ -80,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 ?= ""
 
 # ==========
@@ -87,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}"
@@ -95,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,4 +0,0 @@
-IMAGE_INSTALL:append = " u-boot-ti-staging-falcon"
-KERNEL_CLASSES:remove = "kernel-fitimage"
-KERNEL_CLASSES += "kernel-fitimage-legacyhs"
-FIT_KERNEL_COMP_ALG = "none"

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

@@ -2,29 +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}"
+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"
 
@@ -18,43 +19,17 @@ KERNEL_DEVICETREE_PREFIX = " \
 "
 
 KERNEL_DEVICETREE = " \
-    ti/omap/am335x-baltos-ir2110.dtb \
-    ti/omap/am335x-baltos-ir3220.dtb \
-    ti/omap/am335x-baltos-ir5221.dtb \
-    ti/omap/am335x-base0033.dtb \
-    ti/omap/am335x-bone.dtb \
-    ti/omap/am335x-boneblack-wireless.dtb \
-    ti/omap/am335x-boneblack.dtb \
-    ti/omap/am335x-boneblue.dtb \
-    ti/omap/am335x-bonegreen-wireless.dtb \
-    ti/omap/am335x-bonegreen.dtb \
-    ti/omap/am335x-chiliboard.dtb \
-    ti/omap/am335x-cm-t335.dtb \
     ti/omap/am335x-evm.dtb \
     ti/omap/am335x-evmsk.dtb \
-    ti/omap/am335x-guardian.dtb \
     ti/omap/am335x-icev2.dtb \
-    ti/omap/am335x-lxm.dtb \
-    ti/omap/am335x-moxa-uc-2101.dtb \
-    ti/omap/am335x-moxa-uc-8100-me-t.dtb \
-    ti/omap/am335x-myirtech-myd.dtb \
-    ti/omap/am335x-nano.dtb \
-    ti/omap/am335x-netcan-plus-1xx.dtb \
-    ti/omap/am335x-netcom-plus-2xx.dtb \
-    ti/omap/am335x-netcom-plus-8xx.dtb \
-    ti/omap/am335x-osd3358-sm-red.dtb \
-    ti/omap/am335x-pdu001.dtb \
-    ti/omap/am335x-pepper.dtb \
-    ti/omap/am335x-phycore-rdk.dtb \
     ti/omap/am335x-pocketbeagle.dtb \
-    ti/omap/am335x-regor-rdk.dtb \
-    ti/omap/am335x-sancloud-bbe-extended-wifi.dtb \
-    ti/omap/am335x-sancloud-bbe-lite.dtb \
+    ti/omap/am335x-bone.dtb \
+    ti/omap/am335x-boneblue.dtb \
+    ti/omap/am335x-bonegreen.dtb \
+    ti/omap/am335x-bonegreen-wireless.dtb \
+    ti/omap/am335x-boneblack.dtb \
+    ti/omap/am335x-boneblack-wireless.dtb \
     ti/omap/am335x-sancloud-bbe.dtb \
-    ti/omap/am335x-sbc-t335.dtb \
-    ti/omap/am335x-shc.dtb \
-    ti/omap/am335x-sl50.dtb \
-    ti/omap/am335x-wega-rdk.dtb \
 "
 
 UBOOT_ARCH = "arm"
@@ -63,6 +38,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 +47,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,7 +64,7 @@ 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"

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"
 
@@ -20,11 +21,9 @@ KERNEL_DEVICETREE_PREFIX = " \
 "
 
 KERNEL_DEVICETREE = " \
-    ti/omap/am437x-cm-t43.dtb \
     ti/omap/am437x-gp-evm.dtb \
-    ti/omap/am437x-idk-evm.dtb \
-    ti/omap/am437x-sbc-t43.dtb \
     ti/omap/am437x-sk-evm.dtb \
+    ti/omap/am437x-idk-evm.dtb \
     ti/omap/am43x-epos-evm.dtb \
 "
 
@@ -36,13 +35,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,7 +60,7 @@ 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"

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

@@ -6,13 +6,8 @@ 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 \
 "
 
 UBOOT_MACHINE = "j7200_evm_a72_config"

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

@@ -10,18 +10,8 @@ KERNEL_DEVICETREE_PREFIX = " \
     ti/k3-j7200-evm-mcspi-loopback \
 "
 
-KERNEL_DEVICETREE_DTBMERGE = " \
-    ti/k3-j721e-evm.dtb \
-"
-
 KERNEL_DEVICETREE = " \
-    ti/k3-j721e-beagleboneai64.dtb \
-    ti/k3-j721e-common-proc-board-infotainment.dtbo \
     ti/k3-j721e-common-proc-board.dtb \
-    ti/k3-j721e-evm-gesi-exp-board.dtbo \
-    ti/k3-j721e-evm-pcie0-ep.dtbo \
-    ti/k3-j721e-evm-quad-port-eth-exp.dtbo \
-    ti/k3-j721e-sk-csi2-dual-imx219.dtbo \
     ti/k3-j721e-sk.dtb \
 "
 

meta-ti-bsp/conf/machine/j721e-sk.conf

@@ -10,7 +10,6 @@ KERNEL_DEVICETREE_PREFIX = " \
 "
 
 KERNEL_DEVICETREE = " \
-    ti/k3-j721e-sk-csi2-dual-imx219.dtbo \
     ti/k3-j721e-sk.dtb \
 "
 

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

@@ -15,15 +15,8 @@ KERNEL_DEVICETREE_PREFIX = " \
     ti/k3-v3link \
 "
 
-KERNEL_DEVICETREE_DTBMERGE = " \
-    ti/k3-j721s2-evm.dtb \
-"
-
 KERNEL_DEVICETREE = " \
-    ti/k3-am68-sk-base-board.dtb \
     ti/k3-j721s2-common-proc-board.dtb \
-    ti/k3-j721s2-evm-gesi-exp-board.dtbo \
-    ti/k3-j721s2-evm-pcie1-ep.dtbo \
 "
 
 UBOOT_MACHINE = "j721s2_evm_a72_defconfig"

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

@@ -7,12 +7,9 @@ require conf/machine/include/j722s.inc
 KERNEL_DEVICETREE_PREFIX = " \
     ti/k3-j722s \
     ti/k3-fpdlink \
-    ti/k3-am62x-sk-mcspi-loopback \
     ti/k3-v3link \
 "
 
-KERNEL_DEVICETREE = " \
-    ti/k3-j722s-evm.dtb \
-"
+KERNEL_DEVICETREE = ""
 
 UBOOT_MACHINE = "j722s_evm_a53_defconfig"

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

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

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

@@ -1,22 +0,0 @@
-#@TYPE: Machine
-#@NAME: J742S2 EVM
-#@DESCRIPTION: Machine configuration for the TI J742S2 EVM
-
-require conf/machine/include/j742s2.inc
-
-TFA_K3_USART = "0x8"
-OPTEE_K3_USART = "0x8"
-
-KERNEL_DEVICETREE_PREFIX = " \
-    ti/k3-j742s2 \
-    ti/k3-j784s4 \
-    ti/k3-fpdlink \
-    ti/k3-j7200-evm-mcspi-loopback \
-    ti/k3-j721s2-evm-csi2-ov5640 \
-    ti/k3-j721s2-evm-fusion \
-    ti/k3-v3link \
-"
-
-KERNEL_DEVICETREE = ""
-
-UBOOT_MACHINE = "j742s2_evm_a72_defconfig"

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

@@ -13,16 +13,11 @@ KERNEL_DEVICETREE_PREFIX = " \
     ti/k3-j7200-evm-mcspi-loopback \
     ti/k3-j721s2-evm-csi2-ov5640 \
     ti/k3-j721s2-evm-fusion \
-    ti/k3-j721s2-evm-ub954 \
     ti/k3-am69-sk \
     ti/k3-v3link \
 "
 
 KERNEL_DEVICETREE = " \
-    ti/k3-am69-sk.dtb \
-    ti/k3-j784s4-evm-pcie0-pcie1-ep.dtbo \
-    ti/k3-j784s4-evm-quad-port-eth-exp1.dtbo \
-    ti/k3-j784s4-evm-usxgmii-exp1-exp2.dtbo \
     ti/k3-j784s4-evm.dtb \
 "
 

meta-ti-bsp/conf/machine/omapl138-lcdk.conf

@@ -21,6 +21,6 @@ KERNEL_DEVICETREE_PREFIX = " \
 "
 
 KERNEL_DEVICETREE = " \
-    ti/davinci/da850-evm.dtb \
-    ti/davinci/da850-lcdk.dtb \
+    da850-evm.dtb \
+    da850-lcdk.dtb \
 "

meta-ti-bsp/dynamic-layers/clang-layer/recipes-graphics/mesa/mesa-pvr_%.bbappend

@@ -0,0 +1,14 @@
+# This is a copy of meta-clang/recipes-graphics/mesa/mesa_%.bbappend required
+# for llvmpipe when using pvr-mesa since we aren't caught by that glob.
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+LDFLAGS:append:toolchain-clang = " -latomic -lm"
+DEPENDS:append:toolchain-clang = " libatomic-ops"
+
+EXTRA_OEMASON:append:toolchain-clang:x86 = " -Dasm=false"
+EXTRA_OEMASON:append:toolchain-clang:x86-64 = " -Dasm=false"
+
+export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_LIBDIR}/llvm-config"
+
+PACKAGECONFIG[gallium-llvm] = "-Dllvm=true -Dshared-llvm=true -Ddraw-use-llvm=true,-Dllvm=false,clang clang-native elfutils"

meta-ti-bsp/dynamic-layers/openembedded-layer/recipes-bsp/u-boot/u-boot-ti-%.bbappend

@@ -1,5 +0,0 @@
-
-inherit gitpkgv
-PKGV = "${PV}${GITPKGV}"
-UBOOT_VERSION = "${PKGV}-${PKGR}"
-

meta-ti-bsp/licenses/INSIDE-Secure

@@ -1,19 +0,0 @@
-//---------------------------------------------------------------------
-//Inside Secure Copyright Notice for PKA Firmware
-//---------------------------------------------------------------------
-
-/* */
-/* Copyright (c) 2004-2015 INSIDE Secure B.V. All Rights Reserved */
-/* */
-/* This confidential and proprietary software may be used only as authorized */
-/* by a licensing agreement from INSIDE Secure. */
-/* */
-/* The entire notice above must be reproduced on all authorized copies that */
-/* may only be made to the extent permitted by a licensing agreement from */
-/* INSIDE Secure. */
-/* */
-/* For more information or support, please go to our online support system at */
-/* https://essoemsupport.insidesecure.com. */
-/* In case you do not have an account for this system, please send an e-mail */
-/* to ESSEmbeddedHW-Support.com. */
-/*----------------------------------------------------------------------------*/

meta-ti-bsp/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb

@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.cadence;md5=009f46816f6956cfb75ede13d3e1cee0"
 PV = "${CADENCE_MHDP_FW_VERSION}"
 PR = "${INC_PR}.0"
 
-COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|j742s2"
+COMPATIBLE_MACHINE = "j721e|j721s2|j784s4"
 
 TARGET = "mhdp8546.bin"
 

meta-ti-bsp/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb

@@ -1,4 +1,4 @@
-SUMMARY = "Cortex-M3 binary blob for suspend-resume"
+DESCRIPTION = "Cortex-M3 binary blob for suspend-resume"
 
 LICENSE = "TI-TSPA"
 LIC_FILES_CHKSUM = "file://License.txt;md5=7bdc54a749ab7a7dea999d25d99a41b8"
@@ -14,7 +14,7 @@ SRC_URI = "git://git.ti.com/git/processor-firmware/ti-amx3-cm3-pm-firmware.git;p
 S = "${WORKDIR}/git"
 
 do_compile() {
-	make CROSS_COMPILE="${TARGET_PREFIX}" CC="${TARGET_PREFIX}gcc -std=gnu11 ${TOOLCHAIN_OPTIONS} ${SECURITY_NOPIE_CFLAGS} ${DEBUG_PREFIX_MAP}"
+	make CROSS_COMPILE="${TARGET_PREFIX}" CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${SECURITY_NOPIE_CFLAGS} ${DEBUG_PREFIX_MAP}"
 }
 
 do_install() {

meta-ti-bsp/recipes-bsp/cmem/cmem.inc

@@ -0,0 +1,16 @@
+HOMEPAGE = "http://processors.wiki.ti.com/index.php/Category:CMEM"
+
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://include/ti/cmem.h;beginline=1;endline=30;md5=26be509e4bb413905bda8309e338e2b1"
+
+BRANCH = "master"
+# This corresponds to version 4.20.00.01
+SRCREV = "86269258a48e0a9008dd9d5ebfae9da7ce843393"
+
+PV = "4.20.00.01+git"
+
+SRC_URI = "git://git.ti.com/git/ipc/ludev.git;protocol=https;branch=${BRANCH}"
+
+S = "${WORKDIR}/git"
+COMPATIBLE_HOST ?= "null"
+COMPATIBLE_HOST:ti-soc = "(.*)"

meta-ti-bsp/recipes-bsp/cmem/cmem_git.bb

@@ -0,0 +1,11 @@
+DESCRIPTION = "The cmem component supports contiguous memory allocation from userspace"
+
+include cmem.inc
+
+PR = "r0"
+
+PACKAGES =+ "${PN}-test"
+
+FILES:${PN}-test = "${bindir}/*"
+
+inherit autotools

meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb

@@ -5,12 +5,12 @@ require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
 inherit update-alternatives
 
 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENCE.cnm;md5=df3992006621b797e36de43f36336e36"
+LIC_FILES_CHKSUM = "file://LICENCE.cnm;md5=93b67e6bac7f8fec22b96b8ad0a1a9d0"
 
 PV = "${CNM_WAVE521_FW_VERSION}"
 PR = "${INC_PR}.1"
 
-COMPATIBLE_MACHINE = "j721s2|j784s4|j722s|j742s2|am62axx|am62pxx"
+COMPATIBLE_MACHINE = "j721s2|j784s4|j722s|am62axx|am62pxx"
 
 TARGET_WAVE521C = "wave521c_k3_codec_fw.bin"
 
@@ -27,5 +27,3 @@ do_install() {
 	install -d ${D}${nonarch_base_libdir}/firmware/cnm
 	install -m 0644 ${S}/cnm/${SOURCE_WAVE521C} ${D}${nonarch_base_libdir}/firmware/cnm/${TARGET_WAVE521C}
 }
-
-RDEPENDS:${PN} += "ti-multimedia-udev"

meta-ti-bsp/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb

@@ -1,4 +1,4 @@
-SUMMARY = "Kernel drivers for the Vivante GC320 chipset found in TI SoCs"
+DESCRIPTION = "Kernel drivers for the Vivante GC320 chipset found in TI SoCs"
 HOMEPAGE = "https://git.ti.com/graphics/ti-gc320-driver"
 LICENSE = "MIT | GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://../LICENSE;md5=78d9818a51b9a8e9bb89dea418bac297"
@@ -8,9 +8,9 @@ inherit module features_check
 REQUIRED_MACHINE_FEATURES = "gc320"
 
 # Need to branch out with ${PV} var
-BRANCH = "ti-${PV}-k6.12"
+BRANCH = "ti-${PV}-k5.10"
 
-SRCREV = "83afddf9dbf6a8458267b4dae21ee35bfb11f3d1"
+SRCREV = "e2a10f31e255a65ec30a6e10b890e77d7e9cb107"
 
 SRC_URI = "git://git.ti.com/git/graphics/ti-gc320-driver.git;protocol=https;branch=${BRANCH}"