6 files changed, 37 insertions, 9 deletions

diff --git a/conf/layer.conf b/conf/layer.conf
index 039abe682..7f0934dd8 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -8,7 +8,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "freescale-layer"
 BBFILE_PATTERN_freescale-layer := "^${LAYERDIR}/"
 BBFILE_PRIORITY_freescale-layer = "5"
-LAYERSERIES_COMPAT_freescale-layer = "langdale mickledore"
+LAYERSERIES_COMPAT_freescale-layer = "kirkstone langdale mickledore"
 LAYERDEPENDS_freescale-layer = "core"
 
 # Add the Freescale-specific licenses into the metadata
diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2023.04.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2023.04.inc
index ab7b44f97..36f0b87af 100644
--- a/recipes-bsp/u-boot/u-boot-fslc-common_2023.04.inc
+++ b/recipes-bsp/u-boot/u-boot-fslc-common_2023.04.inc
@@ -10,7 +10,7 @@ DEPENDS += "flex-native bison-native"
 
 SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH};protocol=https"
 
-SRCREV = "1f4890c59efba516f432697fe7235a5296df6f54"
+SRCREV = "7341fbb267e0cdb031c6ba6aa6572fe4be75d3c6"
 SRCBRANCH = "2023.04+fslc"
 
 PV = "2023.04+git${SRCPV}"
diff --git a/recipes-devtools/uuu/uuu_git.bb b/recipes-devtools/uuu/uuu_git.bb
index 08fa51c24..6b1ecb1f6 100644
--- a/recipes-devtools/uuu/uuu_git.bb
+++ b/recipes-devtools/uuu/uuu_git.bb
@@ -15,6 +15,4 @@ S = "${WORKDIR}/git"
 
 DEPENDS = "libusb zlib bzip2 openssl"
 
-COMPATIBLE_MACHINE   = "(imx-generic-bsp)"
-
 BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
index 34034537d..94d70564b 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -107,7 +107,7 @@ PACKAGES =+ " \
 PACKAGES_GBM                  = ""
 PACKAGES_GBM:mx8-nxp-bsp      = "libgbm-imx libgbm-imx-dev"
 
-PACKAGES_OPENCL               = "libclc-imx libclc-imx-dev libopencl-imx libopencl-imx-dev"
+PACKAGES_OPENCL               = "libclc-imx libopencl-imx libopencl-imx-dev"
 PACKAGES_OPENCL:mx7-nxp-bsp   = ""
 PACKAGES_OPENCL:mx8mm-nxp-bsp = ""
 
@@ -188,6 +188,10 @@ IMX_SOC:mx8ulp-nxp-bsp = "mx8ulp"
 
 LIBVULKAN_API_VERSION   = "1.2.182"
 
+SUPPORTS_OPENCL_VX_INTRINSIC_EXTENSION               = "false"
+SUPPORTS_OPENCL_VX_INTRINSIC_EXTENSION:mx8qm-nxp-bsp = "true"
+SUPPORTS_OPENCL_VX_INTRINSIC_EXTENSION:mx8mp-nxp-bsp = "true"
+
 do_install () {
     install -d ${D}${libdir}
     install -d ${D}${includedir}
@@ -248,7 +252,7 @@ do_install () {
 
     if [ -z "${PACKAGES_OPENCL}" ]; then
         set -f
-        for f in ${FILES:libopencl-imx} ${FILES:libopencl-imx-dev} ${FILES:libclc-imx} ${FILES:libclc-imx-dev}; do
+        for f in ${FILES:libopencl-imx} ${FILES:libopencl-imx-dev} ${FILES:libclc-imx}; do
             set +f
             rm -rf ${D}$f
         done
@@ -257,6 +261,10 @@ do_install () {
         # Install Vendor ICDs for OpenCL's installable client driver loader (ICDs Loader)
         install -d ${D}${sysconfdir}/OpenCL/vendors/
         install -m 0644 ${S}/gpu-core/etc/Vivante.icd ${D}${sysconfdir}/OpenCL/vendors/Vivante.icd
+
+        if ! ${SUPPORTS_OPENCL_VX_INTRINSIC_EXTENSION}; then
+            rm -f ${D}${includedir}/CL/cl_viv_vx_ext.h
+        fi
     fi
 
     if [ -z "${PACKAGES_OPENVX}" ]; then
@@ -328,7 +336,6 @@ do_install:append:libc-musl() {
 ALLOW_EMPTY:${PN} = "1"
 
 FILES:libclc-imx = "${libdir}/libCLC${SOLIBS}"
-FILES:libclc-imx-dev = "${includedir}/CL/cl_viv_vx_ext.h"
 
 # libEGL.so is used by some demo apps from Freescale
 INSANE_SKIP:libegl-imx += "dev-so"
diff --git a/recipes-kernel/linux/linux-fslc_6.1.bb b/recipes-kernel/linux/linux-fslc_6.1.bb
index 7f59d6898..e87b001a8 100644
--- a/recipes-kernel/linux/linux-fslc_6.1.bb
+++ b/recipes-kernel/linux/linux-fslc_6.1.bb
@@ -19,10 +19,10 @@ SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=
 #
 # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
 # should be updated once patchlevel is merged.
-LINUX_VERSION = "6.1.29"
+LINUX_VERSION = "6.1.31"
 
 KBRANCH = "6.1.x+fslc"
-SRCREV = "9dd7c6bd8a02e7c5b745b18cfec8bce73feb6de7"
+SRCREV = "58cb4aeaeec012a2d36b29531a5e48093f7183ef"
 
 KBUILD_DEFCONFIG:mx27-generic-bsp = "imx_v4_v5_defconfig"
 KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig"
diff --git a/recipes-security/swm/keyctl-caam_git.bb b/recipes-security/swm/keyctl-caam_git.bb
new file mode 100644
index 000000000..25a5f656a
--- /dev/null
+++ b/recipes-security/swm/keyctl-caam_git.bb
@@ -0,0 +1,23 @@
+# Copyright 2020-2022 NXP
+
+SUMMARY = "NXP i.MX CAAM Keyctl"
+DESCRIPTION = "NXP i.MX keyctl tool to manage CAAM Keys"
+SECTION = "base"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8636bd68fc00cc6a3809b7b58b45f982"
+
+SRCBRANCH = "master"
+SRC_URI = "git://github.com/nxp-imx/keyctl_caam.git;protocol=https;branch=${SRCBRANCH}"
+
+SRCREV = "81dc06cdb9c4d0d4ba10459d85af9a8603774948"
+
+S = "${WORKDIR}/git"
+
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+do_install () {
+        oe_runmake DESTDIR=${D} install
+}
+
+COMPATIBLE_MACHINE = "(imx-generic-bsp)"
+