Scarthgap part4

meta-lmp-base/conf/distro/include/non-clangable.inc

@@ -110,8 +110,6 @@ OBJCOPY:pn-linux-lmp-fslc-imx:toolchain-clang = "${HOST_PREFIX}objcopy"
 STRIP:pn-linux-lmp-fslc-imx:toolchain-clang = "${HOST_PREFIX}strip"
 OBJCOPY:pn-linux-lmp-fslc-imx-rt:toolchain-clang = "${HOST_PREFIX}objcopy"
 STRIP:pn-linux-lmp-fslc-imx-rt:toolchain-clang = "${HOST_PREFIX}strip"
-OBJCOPY:pn-linux-lmp-fslc-imx-xeno4:toolchain-clang = "${HOST_PREFIX}objcopy"
-STRIP:pn-linux-lmp-fslc-imx-xeno4:toolchain-clang = "${HOST_PREFIX}strip"
 OBJCOPY:pn-linux-lmp-ti-staging:toolchain-clang = "${HOST_PREFIX}objcopy"
 STRIP:pn-linux-lmp-ti-staging:toolchain-clang = "${HOST_PREFIX}strip"
 OBJCOPY:pn-linux-tegra:toolchain-clang = "${HOST_PREFIX}objcopy"
@@ -123,7 +121,6 @@ STRIP:pn-linux-tegra-rt:toolchain-clang = "${HOST_PREFIX}strip"
 # error: passing 'unsigned int *' to parameter of type 'int *' converts between pointers to integer types with different sign [-Werror,-Wpointer-sign]
 # error: fields must have a constant size: 'variable length array in structure' extension will never be supported
 # error: passing 'typeof (((fundle_t)0)) *' (aka 'unsigned int *') to parameter of type '__s32 *' (aka 'int *') converts between pointers to integer types with different sign [-Werror,-Wpointer-sign]
-TOOLCHAIN:pn-xenomai4 = "gcc"
 
 # qemuarm64-secureboot
 # | ld.lld: error: cannot open /usr/lib/clang/14.0.3/lib/linux/libclang_rt.builtins-aarch64.a: No such file or directory

meta-lmp-base/recipes-kernel/linux/kmeta-linux-lmp-6.6.y.inc

@@ -1,4 +1,4 @@
 KERNEL_META_REPO ?= "git://github.com/foundriesio/lmp-kernel-cache.git"
 KERNEL_META_REPO_PROTOCOL ?= "https"
 KERNEL_META_BRANCH ?= "linux-v6.6.y"
-KERNEL_META_COMMIT ?= "16feae8a4ea6595371ff285c89648c196fe35ccf"
+KERNEL_META_COMMIT ?= "b968a4e3dfade014a8732c733de6e344bf040bfd"

meta-lmp-base/recipes-kernel/linux/linux-lmp-dev-mfgtool_git.bb

@@ -5,9 +5,9 @@ compatible Linux Kernel to be used in updater environment"
 # Use Freescale kernel by default
 KERNEL_REPO ?= "git://github.com/Freescale/linux-fslc.git"
 KERNEL_REPO_PROTOCOL ?= "https"
-LINUX_VERSION ?= "6.1.70"
-KERNEL_BRANCH ?= "6.1-2.2.x-imx"
-KERNEL_COMMIT ?= "4e3fc5471376a15279ee5c99e791a7c7b065cbc1"
+LINUX_VERSION ?= "6.6.54"
+KERNEL_BRANCH ?= "6.6-2.1.x-imx"
+KERNEL_COMMIT ?= "6605f549a71ef3af9c65609cba985086ac4edf2b"
 
 # Drop features that are appended by other layers (not required here)
 KERNEL_FEATURES:remove = "cfg/fs/vfat.scc"

meta-lmp-base/recipes-samples/images/lmp-base-console-image.bb

@@ -12,7 +12,6 @@ require lmp-feature-ota-utils.inc
 require lmp-feature-softhsm.inc
 require lmp-feature-jobserv.inc
 
-require ${@bb.utils.contains('MACHINE_FEATURES', 'xeno4', 'lmp-feature-xeno4.inc', '', d)}
 require ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'lmp-feature-optee.inc', '', d)}
 require ${@bb.utils.contains('MACHINE_FEATURES', 'se05x', 'lmp-feature-se05x.inc', '', d)}
 require ${@bb.utils.contains('MACHINE_FEATURES', 'tpm2', 'lmp-feature-tpm2.inc', '', d)}

meta-lmp-base/recipes-sota/ostreeuploader/ostreeuploader_git.bb

@@ -2,7 +2,7 @@ DESCRIPTION = "Tools used to push an ostree repo to and check if it is synced wi
 HOMEPAGE = "https://github.com/foundriesio/ostreeuploader"
 SECTION = "devel"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=2a944942e1496af1886903d274dedb13"
+LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=6da28bf14f8fa478195ced00edf4ab7b"
 
 GO_IMPORT = "github.com/foundriesio/ostreeuploader"
 GO_IMPORT_PROTO ?= "https"

meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc

@@ -7,7 +7,7 @@ WKS_FILE_DEPENDS:append:beaglebone-yocto = " u-boot-default-script"
 PREFERRED_PROVIDER_u-boot-default-script:beaglebone-yocto = "u-boot-ostree-scr-fit"
 SOTA_CLIENT_FEATURES:append:beaglebone-yocto = " ubootenv"
 OSTREE_KERNEL_ARGS:beaglebone-yocto ?= "console=ttyS0,115200n8 ${OSTREE_KERNEL_ARGS_COMMON}"
-KERNEL_DEVICETREE:append:beaglebone-yocto = " am335x-boneblack-wireless.dtb"
+KERNEL_DEVICETREE:beaglebone-yocto = "${DTB_FILES} am335x-boneblack-wireless.dtb"
 IMAGE_BOOT_FILES:beaglebone-yocto = "u-boot.img MLO boot.itb"
 KERNEL_IMAGETYPE:beaglebone-yocto = "fitImage"
 KERNEL_CLASSES:beaglebone-yocto = " kernel-lmp-fitimage "
@@ -192,7 +192,6 @@ PREFERRED_VERSION_u-boot-fio:mx6ul-nxp-bsp ?= "imx-2023.04"
 # iMX6UL EVK
 UBOOT_SIGN_ENABLE:sota:imx6ulevk ?= "1"
 SOTA_CLIENT_FEATURES:append:imx6ulevk = " ubootenv"
-KERNEL_DEVICETREE:imx6ulevk = "imx6ul-14x14-evk.dtb"
 BOOTSCR_LOAD_ADDR:imx6ulevk = "0x85000000"
 
 # iMX6ULL
@@ -220,7 +219,6 @@ PREFERRED_VERSION_u-boot-fio:mx6ull-nxp-bsp ?= "imx-2023.04"
 # iMX6ULL EVK
 UBOOT_SIGN_ENABLE:sota:imx6ullevk ?= "1"
 SOTA_CLIENT_FEATURES:append:imx6ullevk = " ubootenv"
-KERNEL_DEVICETREE:imx6ullevk = "imx6ull-14x14-evk.dtb"
 BOOTSCR_LOAD_ADDR:imx6ullevk = "0x85000000"
 
 # iMX8QM
@@ -363,7 +361,6 @@ MACHINE_FIRMWARE:append:imx8mm-lpddr4-evk = " linux-firmware-qca"
 KERNEL_DEVICETREE:append:imx8mm-lpddr4-evk = " freescale/imx8mm-evkb.dtb"
 KMACHINE:imx8mm-lpddr4-evk = "imx8mmevk"
 OSTREE_KERNEL_ARGS:imx8mm-lpddr4-evk ?= "console=tty1 console=ttymxc1,115200 earlycon=ec_imx6q,0x30890000,115200 rootfstype=ext4"
-PREFERRED_PROVIDER_virtual/dtb:imx8mm-lpddr4-evk ?= "lmp-device-tree"
 SOTA_CLIENT_FEATURES:append:imx8mm-lpddr4-evk = " ubootenv"
 BOOTSCR_LOAD_ADDR:imx8mm-lpddr4-evk = "0x44800000"
 ## iMX8MM EVK with secure boot support
@@ -705,15 +702,14 @@ DEPLOY_DIR_SPDX:append = "${@'/${MACHINE}' if 'ti-soc' in (d.getVar('SOC_FAMILY'
 LICENSE_DIRECTORY:append = "${@'/${MACHINE}' if 'ti-soc' in (d.getVar('SOC_FAMILY') or '').split(':') else ''}"
 UBOOT_SIGN_ENABLE:sota:k3 = "1"
 UBOOT_SIGN_KEYDIR:k3 ?= "${TOPDIR}/conf/keys"
-FIT_HASH_ALG:sota:k3 ?= "sha256"
-FIT_SIGN_ALG:sota:k3 ?= "rsa2048"
+FIT_HASH_ALG:k3 ?= "sha256"
+FIT_SIGN_ALG:k3 ?= "rsa2048"
 KERNEL_IMAGETYPE:sota:k3 = "fitImage"
 KERNEL_IMAGETYPES:sota:k3 = "${KERNEL_IMAGETYPE}"
 PREFERRED_PROVIDER_virtual/kernel:k3 ?= "linux-lmp-ti-staging"
 WKS_FILE_DEPENDS:append:k3 = " virtual/bootloader"
 OSTREE_DEPLOY_USR_OSTREE_BOOT:k3 = "${@bb.utils.contains('DISTRO_FEATURES', 'luks', '1', '0', d)}"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS:remove:k3 = "kernel-image-image"
-KERNEL_DEVICETREE:beaglebone-yocto = "${DTB_FILES}"
 
 # TI AM62x
 MACHINE_FEATURES:append:am62xx = " optee"

meta-lmp-bsp/dynamic-layers/meta-ti-bsp/recipes-kernel/linux/linux-lmp-ti-staging_6.6.bb

@@ -20,6 +20,8 @@ KMETA = "kernel-meta"
 
 include recipes-kernel/linux/linux-lmp.inc
 
+include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''}
+
 # Special configuration for remoteproc/rpmsg IPC modules
 module_conf_rpmsg_client_sample = "blacklist rpmsg_client_sample"
 module_conf_ti_k3_r5_remoteproc = "softdep ti_k3_r5_remoteproc pre: virtio_rpmsg_bus"

meta-lmp-bsp/recipes-bsp/device-tree/lmp-device-tree.bbappend

@@ -7,9 +7,3 @@ SRC_URI:append:rpi = " \
         file://overlays_spi0.dts \
 "
 COMPATIBLE_MACHINE:rpi = ".*"
-
-# Name compatible with 4.19-based BSP
-SRC_URI:append:imx8mm-lpddr4-evk = " \
-        file://freescale_fsl-imx8mm-evk.dts \
-"
-COMPATIBLE_MACHINE:imx8mm-lpddr4-evk = ".*"

meta-lmp-bsp/recipes-bsp/u-boot/u-boot-ostree-scr-fit/imx6ulevk/boot.cmd

@@ -2,7 +2,7 @@
 run findfdt
 echo "Using ${fdt_file}"
 
-setenv fdt_file_final ${fdt_file}
+setenv fdt_file_final nxp_imx_${fdt_file}
 
 # Default boot type and device
 setenv bootlimit 3

meta-lmp-bsp/recipes-bsp/u-boot/u-boot-ostree-scr-fit/imx6ullevk/boot.cmd

@@ -2,7 +2,7 @@
 run findfdt
 echo "Using ${fdt_file}"
 
-setenv fdt_file_final ${fdt_file}
+setenv fdt_file_final nxp_imx_${fdt_file}
 
 # Default boot type and device
 setenv bootlimit 3