266 files changed, 3045 insertions, 1782 deletions
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..51367ad58
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,32 @@
+# EditorConfig: deterministic whitespace enforcement for a Yocto/OE layer.
+# https://editorconfig.org — every modern editor applies these on save, and CI
+# can gate them with `editorconfig-checker`. Mirrors meta-openembedded's config
+# and the Yocto Recipe Style Guide: spaces, 4 wide, no tabs, trimmed, LF, final
+# newline. This complements oelint-adv (which handles semantic rules) and removes
+# the need for oelint's non-deterministic whitespace auto-fixes.
+root = true
+[*]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+charset = utf-8
+indent_style = space
+indent_size = 4
+# Makefiles require literal tabs.
+[Makefile]
+indent_style = tab
+# Markdown uses trailing whitespace for hard line breaks.
+[*.md]
+trim_trailing_whitespace = false
+# Never normalise patches — their bytes must match upstream exactly.
+[*.{patch,diff}]
+end_of_line = unset
+insert_final_newline = unset
+trim_trailing_whitespace = unset
+charset = unset
+indent_style = unset
+indent_size = unset
diff --git a/.oelint.cfg b/.oelint.cfg
new file mode 100644
index 000000000..37c94ca3c
--- /dev/null
+++ b/.oelint.cfg
@@ -0,0 +1,24 @@
+# oelint-adv defaults for this layer. Auto-loaded when oelint-adv runs with this
+# directory as the working directory (see contrib/oelint/run-oelint.sh).
+#
+# Layer-specific parser hints live in oelint.constants.json and are passed by
+# contrib/oelint/run-oelint.sh. Per-recipe exceptions should stay inline as
+# '# nooelint: <rule.id>' comments next to the finding, so new recipes are fully
+# linted and each exception is documented in place. Only rules that provably
+# never apply to the whole layer are suppressed here:
+#
+#   * oelint.var.bbclassextend - meta-freescale is a BSP layer; the bulk of its
+#     recipes package machine-specific firmware and prebuilt binaries that are
+#     not cross-compilable libraries, so BBCLASSEXTEND (native/nativesdk) does
+#     not apply.
+#   * oelint.var.suggestedvar.CVE_PRODUCT / .BUGTRACKER - advisory 'suggested'
+#     variables. Most recipes here package NXP firmware/BSP components with no
+#     upstream bug tracker and no meaningful NVD CPE product; guessing a
+#     CVE_PRODUCT would create false or missed CVE matches, which is worse than
+#     leaving it unset. Set them inline on the rare recipe that has a real value.
+[oelint]
+release = wrynose
+suppress =
+    oelint.var.bbclassextend
+    oelint.var.suggestedvar.CVE_PRODUCT
+    oelint.var.suggestedvar.BUGTRACKER
diff --git a/LICENSE b/LICENSE
index 69b1cd2fd..97324c84c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -7,7 +7,7 @@ This file lists all licenses used by recipes in the meta-freescale layer.
 ./dynamic-layers/openembedded-layer/recipes-devtools/utp-com/utp-com_git.bb: LICENSE = "GPL-2.0-only"
 ./dynamic-layers/openembedded-layer/recipes-devtools/uuu/uuu_git.bb: LICENSE = "BSD-3-Clause"
 ./dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb: LICENSE = "MIT"
-./dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_4.6.0.imx.bb: LICENSE = "Apache-2.0"
+./dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_4.13.0.imx.bb: LICENSE = "Apache-2.0"
 ./recipes-bsp/atf/qoriq-atf-2.12.inc: LICENSE = "BSD-3-Clause"
 ./recipes-bsp/boot-format/boot-format_git.bb: LICENSE = "GPL-2.0-only"
 ./recipes-bsp/ddr-phy/ddr-phy_git.bb: LICENSE = "NXP-Binary-EULA"
@@ -60,7 +60,7 @@ This file lists all licenses used by recipes in the meta-freescale layer.
 ./recipes-devtools/uuu/uuu-bin_1.5.233.bb: LICENSE = "BSD-3-Clause & LGPL-2.1-or-later"
 ./recipes-downgrade/glslang/glslang_1.3.275.0.imx.bb: LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exception"
 ./recipes-downgrade/spir/spirv-headers_1.3.275.0.imx.bb: LICENSE = "MIT"
-./recipes-downgrade/spir/spirv-tools_1.3.275.0.imx.bb: LICENSE  = "Apache-2.0"
+./recipes-downgrade/spir/spirv-tools_1.3.275.0.imx.bb: LICENSE = "Apache-2.0"
 ./recipes-downgrade/vulkan/vulkan-headers_1.3.275.0.imx.bb: LICENSE = "Apache-2.0 & MIT"
 ./recipes-downgrade/vulkan/vulkan-loader_1.3.275.0.imx.bb: LICENSE = "Apache-2.0"
 ./recipes-downgrade/vulkan/vulkan-tools_1.3.275.0.imx.bb: LICENSE = "Apache-2.0"
diff --git a/classes/fsl-eula-unpack.bbclass b/classes/fsl-eula-unpack.bbclass
index db9d9a412..ee938a74d 100644
--- a/classes/fsl-eula-unpack.bbclass
+++ b/classes/fsl-eula-unpack.bbclass
@@ -6,25 +6,25 @@
 #
 #  SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV};fsl-eula=true"
-FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V8          = "01ba08a2b77c3a0a9d0ab5d4d83fed64"
+FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V8 = "01ba08a2b77c3a0a9d0ab5d4d83fed64"
-FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V10         = "3880bb9c943b135a30fad5e8aabd3ee9"
+FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V10 = "3880bb9c943b135a30fad5e8aabd3ee9"
-FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V11         = "a31dce3023402a821cfcdc1bb8dbdbc0"
+FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V11 = "a31dce3023402a821cfcdc1bb8dbdbc0"
-FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V12         = "8cf95184c220e247b9917e7244124c5a"
+FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V12 = "8cf95184c220e247b9917e7244124c5a"
-FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V13         = "102094e9e695888c6a9f9fda9004165d"
+FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V13 = "102094e9e695888c6a9f9fda9004165d"
-FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V14         = "d4f548f93b5fe0ee2bc86758c344412d"
+FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V14 = "d4f548f93b5fe0ee2bc86758c344412d"
-FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V16         = "be67a88e9e6c841043b005ad7bcf8309"
+FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V16 = "be67a88e9e6c841043b005ad7bcf8309"
-FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V17         = "88595f92466edd79be7f4f9547ffa0ef"
+FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V17 = "88595f92466edd79be7f4f9547ffa0ef"
-FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V18         = "6b552f505eedab4a11ab538cf3db743a"
+FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V18 = "6b552f505eedab4a11ab538cf3db743a"
-FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V20         = "08fd295cce89b0a9c74b9b83ed74f671"
+FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V20 = "08fd295cce89b0a9c74b9b83ed74f671"
-FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V21         = "6bd2df2910a2234bf6f419b7d2f531a3"
+FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V21 = "6bd2df2910a2234bf6f419b7d2f531a3"
-FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V22         = "75abe2fa1d16ca79f87cde926f05f72d"
+FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V22 = "75abe2fa1d16ca79f87cde926f05f72d"
-FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V24         = "ab61cab9599935bfe9f700405ef00f28"
+FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V24 = "ab61cab9599935bfe9f700405ef00f28"
-FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V26         = "5ab1a30d0cd181e3408077727ea5a2db"
+FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V26 = "5ab1a30d0cd181e3408077727ea5a2db"
-FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V3  = "6dfb32a488e5fd6bae52fbf6c7ebb086"
+FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V3 = "6dfb32a488e5fd6bae52fbf6c7ebb086"
-FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V5  = "80c0478f4339af024519b3723023fe28"
+FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V5 = "80c0478f4339af024519b3723023fe28"
-FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V7  = "fb0303e4ee8b0e71c094171e2272bd44"
+FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V7 = "fb0303e4ee8b0e71c094171e2272bd44"
-FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V8  = "72c0f70181bb6e83eee6aab8de12a9f3"
+FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V8 = "72c0f70181bb6e83eee6aab8de12a9f3"
-FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V9  = "6c12031a11b81db21cdfe0be88cac4b3"
+FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V9 = "6c12031a11b81db21cdfe0be88cac4b3"
 FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V10 = "fd4b227530cd88a82af6a5982cfb724d"
 FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V11 = "228c72f2a91452b8a03c4cab30f30ef9"
 FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V13 = "1b4db4b25c3a1e422c0c0ed64feb65d2"
@@ -66,7 +66,7 @@ FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V60 = "cf2070b16b9d4acf60a98e8c
 FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V62 = "a93b654673e1bc8398ed1f30e0813359"
 FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V63 = "bc649096ad3928ec06a8713b8d787eac"
-FSL_EULA_FILE_MD5SUMS = " \
+FSL_EULA_FILE_MD5SUMS = "\
    ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V8} \
    ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V10} \
    ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V11} \
@@ -129,8 +129,7 @@ FSL_EULA_FILE_MD5SUMS = " \
 "
 # The checksum for the EULA in the layer
-FSL_EULA_FILE_MD5SUM ?= \
+FSL_EULA_FILE_MD5SUM ?= "${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V63}"
-    "${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V63}"
 LIC_FILES_CHKSUM_LAYER ?= "file://${FSL_EULA_FILE};md5=${FSL_EULA_FILE_MD5SUM}"
 LIC_FILES_CHKSUM_LAYER[vardepsexclude] += "FSL_EULA_FILE"
diff --git a/classes/fsl-kernel-localversion.bbclass b/classes/fsl-kernel-localversion.bbclass
index fae3fe1d9..9b44fe194 100644
--- a/classes/fsl-kernel-localversion.bbclass
+++ b/classes/fsl-kernel-localversion.bbclass
@@ -13,36 +13,35 @@ SCMVERSION ??= "y"
 LOCALVERSION ??= "+fslc"
 # LINUX_VERSION_EXTENSION is used as CONFIG_LOCALVERSION by kernel-yocto class
-LINUX_VERSION_EXTENSION ?= \
+LINUX_VERSION_EXTENSION ?= "${@bb.utils.contains('SCMVERSION', 'y', '', '${LOCALVERSION}', d)}"
-    "${@bb.utils.contains('SCMVERSION', 'y', '', '${LOCALVERSION}', d)}"
 do_kernel_localversion[dirs] += "${S} ${B}"
 do_kernel_localversion() {
-        # Fallback for recipes not able to use LINUX_VERSION_EXTENSION
+    # Fallback for recipes not able to use LINUX_VERSION_EXTENSION
-        if [ "${@bb.data.inherits_class('kernel-yocto', d)}" = "False" ]; then
+    if [ "${@bb.data.inherits_class('kernel-yocto', d)}" = "False" ]; then
-                echo 'CONFIG_LOCALVERSION="${LOCALVERSION}"' >> ${B}/.config
+        echo 'CONFIG_LOCALVERSION="${LOCALVERSION}"' >> ${B}/.config
-        fi
+    fi
-        if [ "${SCMVERSION}" = "y" ]; then
+    if [ "${SCMVERSION}" = "y" ]; then
-                # Add GIT revision to the local version
+        # Add GIT revision to the local version
-                if [ "${SRCREV}" = "INVALID" ]; then
+        if [ "${SRCREV}" = "INVALID" ]; then
-                        hash=${SRCREV_machine}
+            hash=${SRCREV_machine}
-                else
+        else
-                        hash=${SRCREV}
+            hash=${SRCREV}
-                fi
+        fi
-                if [ "$hash" = "AUTOINC" ]; then
+        if [ "$hash" = "AUTOINC" ]; then
-                        branch=`git --git-dir=${S}/.git  symbolic-ref --short -q HEAD`
+            branch=`git --git-dir=${S}/.git  symbolic-ref --short -q HEAD`
-                        head=`git --git-dir=${S}/.git rev-parse --verify --short origin/${branch} 2> /dev/null`
+            head=`git --git-dir=${S}/.git rev-parse --verify --short origin/${branch} 2> /dev/null`
-                else
+        else
-                        head=`git --git-dir=${S}/.git rev-parse --verify --short $hash 2> /dev/null`
+            head=`git --git-dir=${S}/.git rev-parse --verify --short $hash 2> /dev/null`
-                fi
+        fi
-                patches=`git --git-dir=${S}/.git rev-list --count $head..HEAD 2> /dev/null`
+        patches=`git --git-dir=${S}/.git rev-list --count $head..HEAD 2> /dev/null`
-                printf "%s%s%s%s" +g $head +p $patches > ${S}/.scmversion
+        printf "%s%s%s%s" +g $head +p $patches > ${S}/.scmversion
-                sed -i -e "/CONFIG_LOCALVERSION_AUTO[ =]/d" ${B}/.config
+        sed -i -e "/CONFIG_LOCALVERSION_AUTO[ =]/d" ${B}/.config
-                echo "CONFIG_LOCALVERSION_AUTO=y" >> ${B}/.config
+        echo "CONFIG_LOCALVERSION_AUTO=y" >> ${B}/.config
-        fi
+    fi
 }
 addtask kernel_localversion before do_configure after do_patch do_kernel_configme
diff --git a/classes/fsl-u-boot-localversion.bbclass b/classes/fsl-u-boot-localversion.bbclass
index df4ac5fbf..c867c9f85 100644
--- a/classes/fsl-u-boot-localversion.bbclass
+++ b/classes/fsl-u-boot-localversion.bbclass
@@ -15,24 +15,24 @@ LOCALVERSION ??= "+fslc"
 UBOOT_LOCALVERSION = "${LOCALVERSION}"
 do_compile:prepend() {
-        if [ "${SCMVERSION}" = "y" ]; then
+    if [ "${SCMVERSION}" = "y" ]; then
-                # Add GIT revision to the local version
+        # Add GIT revision to the local version
-                if [ "${SRCREV}" = "INVALID" ]; then
+        if [ "${SRCREV}" = "INVALID" ]; then
-                        hash=${SRCREV_machine}
+            hash=${SRCREV_machine}
-                else
+        else
-                        hash=${SRCREV}
+            hash=${SRCREV}
-                fi
+        fi
-                if [ "$hash" = "AUTOINC" ]; then
+        if [ "$hash" = "AUTOINC" ]; then
-                        branch=`git --git-dir=${S}/.git  symbolic-ref --short -q HEAD`
+            branch=`git --git-dir=${S}/.git  symbolic-ref --short -q HEAD`
-                        head=`git --git-dir=${S}/.git rev-parse --verify --short origin/${branch} 2> /dev/null`
+            head=`git --git-dir=${S}/.git rev-parse --verify --short origin/${branch} 2> /dev/null`
-                else
+        else
-                        head=`git --git-dir=${S}/.git rev-parse --verify --short $hash 2> /dev/null`
+            head=`git --git-dir=${S}/.git rev-parse --verify --short $hash 2> /dev/null`
-                fi
+        fi
-                patches=`git --git-dir=${S}/.git rev-list --count $head..HEAD 2> /dev/null`
+        patches=`git --git-dir=${S}/.git rev-list --count $head..HEAD 2> /dev/null`
-                printf "%s%s%s%s%s" "${UBOOT_LOCALVERSION}" +g $head +p $patches > ${S}/.scmversion
+        printf "%s%s%s%s%s" "${UBOOT_LOCALVERSION}" +g $head +p $patches > ${S}/.scmversion
-                printf "%s%s%s%s%s" "${UBOOT_LOCALVERSION}" +g $head +p $patches > ${B}/.scmversion
+        printf "%s%s%s%s%s" "${UBOOT_LOCALVERSION}" +g $head +p $patches > ${B}/.scmversion
-        else
+    else
-                printf "%s" "${UBOOT_LOCALVERSION}" > ${S}/.scmversion
+        printf "%s" "${UBOOT_LOCALVERSION}" > ${S}/.scmversion
-                printf "%s" "${UBOOT_LOCALVERSION}" > ${B}/.scmversion
+        printf "%s" "${UBOOT_LOCALVERSION}" > ${B}/.scmversion
-        fi
+    fi
 }
diff --git a/classes/image_populate_mfgtool.bbclass b/classes/image_populate_mfgtool.bbclass
index d30b47a3b..2c9b44f44 100644
--- a/classes/image_populate_mfgtool.bbclass
+++ b/classes/image_populate_mfgtool.bbclass
@@ -41,8 +41,8 @@
 #
 # SPDX-License-Identifier: MIT
-MFGTOOL_FILESPATH ??= " \
+MFGTOOL_FILESPATH ??= "\
-    ${@base_set_filespath(["%s/mfgtool" % p for p in "${BBPATH}".split(":")] \
+    ${@base_set_filespath(["%s/mfgtool"% p for p in "${BBPATH}".split(":")] \
                             + ["${FILE_DIRNAME}/${BP}/mfgtool", \
                                "${FILE_DIRNAME}/${BPN}/mfgtool", \
                                "${FILE_DIRNAME}/files/mfgtool"] \
diff --git a/classes/image_types_fsl.bbclass b/classes/image_types_fsl.bbclass
index 63a10f303..65b6a5dbd 100644
--- a/classes/image_types_fsl.bbclass
+++ b/classes/image_types_fsl.bbclass
@@ -38,7 +38,7 @@ do_image_wic[depends] += " \
 # We need to apply a fixup inside of the partition table
 IMAGE_CMD:wic:append:mxs-generic-bsp() {
-        # Change partition type for mxs processor family
+    # Change partition type for mxs processor family
-        bbnote "Setting partition type to 0x53 as required for mxs' SoC family."
+    bbnote "Setting partition type to 0x53 as required for mxs' SoC family."
-        echo -n S | dd of=$out.wic bs=1 count=1 seek=450 conv=notrunc
+    echo -n S | dd of=$out.wic bs=1 count=1 seek=450 conv=notrunc
 }
diff --git a/classes/imx-boot-container.bbclass b/classes/imx-boot-container.bbclass
index 5365e5fd7..345f71035 100644
--- a/classes/imx-boot-container.bbclass
+++ b/classes/imx-boot-container.bbclass
@@ -32,21 +32,21 @@ ATF_MACHINE_NAME:append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', '-o
 OEI_NAME ?= "oei-${OEI_CORE}-*.bin"
 IMX_BOOT_CONTAINER_FIRMWARE_SOC ?= ""
-IMX_BOOT_CONTAINER_FIRMWARE_SOC:mx8mq-generic-bsp = " \
+IMX_BOOT_CONTAINER_FIRMWARE_SOC:mx8mq-generic-bsp = "\
    signed_dp_imx8m.bin \
    signed_hdmi_imx8m.bin \
 "
-IMX_BOOT_CONTAINER_FIRMWARE_SOC:mx91-generic-bsp = " \
+IMX_BOOT_CONTAINER_FIRMWARE_SOC:mx91-generic-bsp = "\
    ${SECO_FIRMWARE_NAME} \
 "
-IMX_BOOT_CONTAINER_FIRMWARE_SOC:mx93-generic-bsp = " \
+IMX_BOOT_CONTAINER_FIRMWARE_SOC:mx93-generic-bsp = "\
    ${SECO_FIRMWARE_NAME} \
 "
-IMX_BOOT_CONTAINER_FIRMWARE_SOC:mx95-generic-bsp = " \
+IMX_BOOT_CONTAINER_FIRMWARE_SOC:mx95-generic-bsp = "\
    ${SECO_FIRMWARE_NAME} \
    ${OEI_NAME} \
 "
-IMX_BOOT_CONTAINER_FIRMWARE ?= " \
+IMX_BOOT_CONTAINER_FIRMWARE ?= "\
    ${IMX_BOOT_CONTAINER_FIRMWARE_SOC} \
    ${DDR_FIRMWARE_NAME} \
 "
diff --git a/classes/kernel-imximage.bbclass b/classes/kernel-imximage.bbclass
index ccf7ec53b..999840f69 100644
--- a/classes/kernel-imximage.bbclass
+++ b/classes/kernel-imximage.bbclass
@@ -17,44 +17,44 @@
 #
 # Copyright 2017 (C) O.S. Systems Software LTDA.
-DEPENDS:append = ' u-boot-mkimage-native'
+DEPENDS:append = " u-boot-mkimage-native"
 IMXIMAGE_ENTRYPOINT ?= "${UBOOT_ENTRYPOINT}"
 imx_mkimage() {
-        uboot-mkimage -n $1 -T imximage -e ${IMXIMAGE_ENTRYPOINT} -d $2 $2.imx
+    uboot-mkimage -n $1 -T imximage -e ${IMXIMAGE_ENTRYPOINT} -d $2 $2.imx
 }
 gen_imximage() {
-        if [ -z "${IMXIMAGE_ENTRYPOINT}" ]; then
+    if [ -z "${IMXIMAGE_ENTRYPOINT}" ]; then
-                bbfatal "IMXIMAGE_ENTRYPOINT must have a valid value"
+        bbfatal "IMXIMAGE_ENTRYPOINT must have a valid value"
-        fi
+    fi
-        for DTB in ${KERNEL_DEVICETREE}; do
+    for DTB in ${KERNEL_DEVICETREE}; do
-                DTB=`normalize_dtb "${DTB}"`
+        DTB=`normalize_dtb "${DTB}"`
-                DTB_EXT=${DTB##*.}
+        DTB_EXT=${DTB##*.}
-                DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"`
+        DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"`
-                base_name="zImage-"${KERNEL_IMAGE_BASE_NAME}
+        base_name="zImage-"${KERNEL_IMAGE_BASE_NAME}
-                symlink_name="zImage-"${KERNEL_IMAGE_SYMLINK_NAME}
+        symlink_name="zImage-"${KERNEL_IMAGE_SYMLINK_NAME}
-                DTB_NAME=`echo ${base_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"`
+        DTB_NAME=`echo ${base_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"`
-                DTB_SYMLINK_NAME=`echo ${symlink_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"`
+        DTB_SYMLINK_NAME=`echo ${symlink_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"`
-                for DCD in dcd-${DTB}.cfg dcd.cfg; do
+        for DCD in dcd-${DTB}.cfg dcd.cfg; do
-                        if [ -e "${WORKDIR}/${DCD}" ]; then
+            if [ -e "${WORKDIR}/${DCD}" ]; then
-                                if [ -e ${DEPLOYDIR}/${DTB_NAME}.${DTB_EXT}.bin ]; then
+                if [ -e ${DEPLOYDIR}/${DTB_NAME}.${DTB_EXT}.bin ]; then
-                                        imx_mkimage ${WORKDIR}/${DCD} ${DEPLOYDIR}/${DTB_NAME}.${DTB_EXT}.bin
+                    imx_mkimage ${WORKDIR}/${DCD} ${DEPLOYDIR}/${DTB_NAME}.${DTB_EXT}.bin
-                                        ln -sf ${DTB_NAME}.${DTB_EXT}.bin.imx ${DEPLOYDIR}/$type-${DTB_BASE_NAME}.${DTB_EXT}.bin.imx
+                    ln -sf ${DTB_NAME}.${DTB_EXT}.bin.imx ${DEPLOYDIR}/$type-${DTB_BASE_NAME}.${DTB_EXT}.bin.imx
-                                fi
+                fi
-                                if [ -e ${DEPLOYDIR}/zImage-${INITRAMFS_BASE_NAME}-${DTB_BASE_NAME}.${DTB_EXT}.bin ]; then
+                if [ -e ${DEPLOYDIR}/zImage-${INITRAMFS_BASE_NAME}-${DTB_BASE_NAME}.${DTB_EXT}.bin ]; then
-                                        imx_mkimage ${WORKDIR}/${DCD} ${DEPLOYDIR}/zImage-${INITRAMFS_BASE_NAME}-${DTB_BASE_NAME}.${DTB_EXT}.bin
+                    imx_mkimage ${WORKDIR}/${DCD} ${DEPLOYDIR}/zImage-${INITRAMFS_BASE_NAME}-${DTB_BASE_NAME}.${DTB_EXT}.bin
-                                        ln -sf zImage-${INITRAMFS_BASE_NAME}-${DTB_BASE_NAME}.${DTB_EXT}.bin.imx \
+                    ln -sf zImage-${INITRAMFS_BASE_NAME}-${DTB_BASE_NAME}.${DTB_EXT}.bin.imx \
-                                           ${DEPLOYDIR}/zImage-initramfs-${DTB_BASE_NAME}.${DTB_EXT}-${MACHINE}.bin.imx
+                       ${DEPLOYDIR}/zImage-initramfs-${DTB_BASE_NAME}.${DTB_EXT}-${MACHINE}.bin.imx
-                                fi
+                fi
-                        fi
+            fi
-                done
+        done
-        done
+    done
 }
 do_deploy:append() {
-        gen_imximage
+    gen_imximage
 }
diff --git a/classes/mfgtool-initramfs-image.bbclass b/classes/mfgtool-initramfs-image.bbclass
index f338bf829..38a607778 100644
--- a/classes/mfgtool-initramfs-image.bbclass
+++ b/classes/mfgtool-initramfs-image.bbclass
@@ -19,12 +19,12 @@ IMAGE_ROOTFS_SIZE ?= "8192"
 IMAGE_NAME_SUFFIX = ""
 # Filesystems enabled by default
-DEFAULT_FS_SUPPORT = " \
+DEFAULT_FS_SUPPORT = "\
    mtd \
    extfs \
 "
-IMAGE_FEATURES = " \
+IMAGE_FEATURES = "\
    ${DEFAULT_FS_SUPPORT} \
    \
    read-only-rootfs \
@@ -38,6 +38,6 @@ USE_DEVFS = "1"
 inherit core-image
-CORE_IMAGE_BASE_INSTALL = " \
+CORE_IMAGE_BASE_INSTALL = "\
    ${CORE_IMAGE_EXTRA_INSTALL} \
 "
diff --git a/classes/use-imx-security-controller-firmware.bbclass b/classes/use-imx-security-controller-firmware.bbclass
index 975dd77c1..6a39bb684 100644
--- a/classes/use-imx-security-controller-firmware.bbclass
+++ b/classes/use-imx-security-controller-firmware.bbclass
@@ -16,15 +16,15 @@
 # This behavior ensures that derivatives which requires SECO Firmware to be
 # present in the image file have it properly defined.
-SECO_FIRMWARE_NAME                    ?= ""
+SECO_FIRMWARE_NAME ?= ""
-SECO_FIRMWARE_NAME:mx8qm-generic-bsp  ?= "mx8qm${IMX_SOC_REV_LOWER}-ahab-container.img"
+SECO_FIRMWARE_NAME:mx8qm-generic-bsp ?= "mx8qm${IMX_SOC_REV_LOWER}-ahab-container.img"
 SECO_FIRMWARE_NAME:mx8qxp-generic-bsp ?= "mx8qx${IMX_SOC_REV_LOWER}-ahab-container.img"
-SECO_FIRMWARE_NAME:mx8dx-generic-bsp  ?= "mx8qx${IMX_SOC_REV_LOWER}-ahab-container.img"
+SECO_FIRMWARE_NAME:mx8dx-generic-bsp ?= "mx8qx${IMX_SOC_REV_LOWER}-ahab-container.img"
 SECO_FIRMWARE_NAME:mx8dxl-generic-bsp ?= "mx8dxl${IMX_SOC_REV_LOWER}-ahab-container.img"
 SECO_FIRMWARE_NAME:mx8ulp-generic-bsp ?= "mx8ulp${IMX_SOC_REV_LOWER}-ahab-container.img"
-SECO_FIRMWARE_NAME:mx91-generic-bsp   ?= "mx91${IMX_SOC_REV_LOWER}-ahab-container.img"
+SECO_FIRMWARE_NAME:mx91-generic-bsp ?= "mx91${IMX_SOC_REV_LOWER}-ahab-container.img"
-SECO_FIRMWARE_NAME:mx93-generic-bsp   ?= "mx93${IMX_SOC_REV_LOWER}-ahab-container.img"
+SECO_FIRMWARE_NAME:mx93-generic-bsp ?= "mx93${IMX_SOC_REV_LOWER}-ahab-container.img"
-SECO_FIRMWARE_NAME:mx95-generic-bsp   ?= "mx95${IMX_SOC_REV_LOWER}-ahab-container.img"
+SECO_FIRMWARE_NAME:mx95-generic-bsp ?= "mx95${IMX_SOC_REV_LOWER}-ahab-container.img"
 python () {
    if "mx8m-generic-bsp" in d.getVar('MACHINEOVERRIDES').split(":"):
diff --git a/classes/uuu_bootloader_tag.bbclass b/classes/uuu_bootloader_tag.bbclass
index b41d22a92..54d9c1902 100644
--- a/classes/uuu_bootloader_tag.bbclass
+++ b/classes/uuu_bootloader_tag.bbclass
@@ -5,7 +5,7 @@
 # IMPORTANT: The tagged boot partition file should never be used directly with
 #            UUU, as it can cause UUU to hang.
-UUU_BOOTLOADER                 = "${UBOOT_BINARY}"
+UUU_BOOTLOADER = "${UBOOT_BINARY}"
 UUU_BOOTLOADER:mx8-generic-bsp = "${@d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '0' and 'imx-boot' or 'flash.bin'}"
 UUU_BOOTLOADER:mx9-generic-bsp = "${@d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '0' and 'imx-boot' or 'flash.bin'}"
diff --git a/conf/layer.conf b/conf/layer.conf
index c91f4c4f8..9fcb322fe 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -24,6 +24,11 @@ FSL_MIRROR ?= "${IMX_MIRROR}"
 MIRRORS += " \
 ${IMX_MIRROR}   http://download.ossystems.com.br/bsp/freescale/source/ \n \
 "
+SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS:append = " \
+    linux-firmware->firmware-nxp-wifi \
+"
 # Needs gbm_bo_create_with_modifiers2() API which is not
 # implemented in imx GL driver implementation
 COMPATIBLE_HOST:pn-xdg-desktop-portal-wlr:imxgpu = "(null)"
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 6a0fe3f11..916db91cf 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -618,8 +618,8 @@ PREFERRED_VERSION_optee-test:imx-nxp-bsp   ??= "4.8.0.imx"
 PREFERRED_VERSION_optee-os-tadevkit:imx-nxp-bsp   ??= "4.8.0.imx"
 # Use i.MX opencv Version
-PREFERRED_VERSION_opencv:mx8-nxp-bsp ??= "4.6.0.imx"
+PREFERRED_VERSION_opencv:mx8-nxp-bsp ??= "4.13.0.imx"
-PREFERRED_VERSION_opencv:mx9-nxp-bsp ??= "4.6.0.imx"
+PREFERRED_VERSION_opencv:mx9-nxp-bsp ??= "4.13.0.imx"
 # Handle default kernel
 IMX_DEFAULT_KERNEL:imx-mainline-bsp ??= "linux-fslc"
diff --git a/contrib/oelint/run-oelint.sh b/contrib/oelint/run-oelint.sh
new file mode 100755
index 000000000..d09f2a45d
--- /dev/null
+++ b/contrib/oelint/run-oelint.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+# Run oelint-adv over meta-freescale. Requires oelint-adv on PATH.
+#
+# All linter configuration is declarative and lives at the layer root, so this
+# script only has to enumerate the files (oelint-adv does not recurse into
+# directories):
+#   * .oelint.cfg           - sets '--release'; auto-loaded from the working
+#                             directory
+#   * oelint.constants.json - the layer constant-DB additions, passed via
+#                             --constantmods for compatibility with oelint-adv
+#                             versions that do not auto-load layer constants
+#
+# Exceptions should stay inline as '# nooelint: <rule.id>' comments next to the
+# finding, so new recipes are fully linted and each exception is documented in
+# place (and flagged by oelint.file.inlinesuppress_na once stale).
+set -eu
+# Neutralise CDPATH so 'cd' below can't print or jump to an unexpected dir.
+unset CDPATH
+here=$(cd -- "$(dirname -- "$0")" && pwd)
+layer=$(cd -- "$here/../.." && pwd)
+# Run from the layer root so '.oelint.cfg' is probed in the working directory
+# and the relative constants path below is stable.
+cd -- "$layer"
+files=$(find . \
+    \( -name '*.bb' -o -name '*.bbappend' -o -name '*.bbclass' -o -name '*.inc' \) \
+    | sort)
+# Run serially: oelint-adv's parallel workers race while loading the layer
+# constants, intermittently emitting false "unknown variable/override" findings.
+# Serial execution is deterministic. Pass '--jobs N' to override.
+# Keep files before --constantmods: that option accepts one or more arguments
+# and otherwise consumes the entire generated file list.
+# shellcheck disable=SC2086
+exec oelint-adv --jobs 1 $files --constantmods +oelint.constants.json "$@"
diff --git a/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei.inc b/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei.inc
index 7c5303066..2bcbea653 100644
--- a/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei.inc
+++ b/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei.inc
@@ -3,7 +3,7 @@ DEPENDS = "gcc-arm-none-eabi-native"
 inherit deploy
-PACKAGECONFIG ??= " \
+PACKAGECONFIG ??= "\
    ${@bb.utils.contains('UBOOT_CONFIG', 'sd-ecc', 'ecc', '', d)}"
 PACKAGECONFIG[ecc] = ""
@@ -12,11 +12,11 @@ PACKAGECONFIG[tcm] = ""
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 OEI_CONFIGS ?= "ddr ${@bb.utils.filter('PACKAGECONFIG', 'tcm', d)}"
-OEI_CORE    ?= "UNDEFINED"
+OEI_CORE ?= "UNDEFINED"
-OEI_SOC     ?= "UNDEFINED"
+OEI_SOC ?= "UNDEFINED"
-OEI_BOARD   ?= "UNDEFINED"
+OEI_BOARD ?= "UNDEFINED"
-OEI_DDR_CONFIG  ?= ""
+OEI_DDR_CONFIG ?= ""
-OEI_DEBUG   ?= "0"
+OEI_DEBUG ?= "0"
 LDFLAGS[unexport] = "1"
diff --git a/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei_1.0.0.bb b/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei_1.0.0.bb
index 2962a1acc..c7edeebed 100644
--- a/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei_1.0.0.bb
+++ b/dynamic-layers/arm-toolchain/recipes-bsp/imx-oei/imx-oei_1.0.0.bb
@@ -1,11 +1,12 @@
 SUMMARY = "i.MX Optional Execution Image"
 DESCRIPTION = "\
-The Optional Executable Image (OEI) is an optional plugin loaded and executed \
+    The Optional Executable Image (OEI) is an optional plugin loaded and executed \
-by Cortex-M processor ROM on many NXP i.MX processors. The Cortex-M is the \
+    by Cortex-M processor ROM on many NXP i.MX processors. The Cortex-M is the \
-boot core, runs the boot ROM which loads the OEI, and then branches to the \
+    boot core, runs the boot ROM which loads the OEI, and then branches to the \
-OEI. The OEI then configures some aspects of the hardware such as DDR config, \
+    OEI. The OEI then configures some aspects of the hardware such as DDR config, \
-init TCM ECC, etc. There could be multiple OEI images in the boot container. \
+    init TCM ECC, etc. There could be multiple OEI images in the boot container. \
-After execution of OEI, the processor returns to ROM execution."
+    After execution of OEI, the processor returns to ROM execution."
+HOMEPAGE = "https://github.com/nxp-imx/imx-oei"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b66f32a90f9577a5a3255c21d79bc619"
diff --git a/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager.inc b/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager.inc
index 65f0a0e0c..e33cd1829 100644
--- a/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager.inc
+++ b/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager.inc
@@ -18,7 +18,7 @@ SYSTEM_MANAGER_CONFIG ?= "INVALID"
 LDFLAGS[unexport] = "1"
-EXTRA_OEMAKE = " \
+EXTRA_OEMAKE = "\
    CONFIG=${SYSTEM_MANAGER_CONFIG} \
    SM_CROSS_COMPILE=arm-none-eabi- \
    V=1 \
diff --git a/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager_2026q1.bb b/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager_2026q1.bb
index 888b883bc..874727666 100644
--- a/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager_2026q1.bb
+++ b/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager_2026q1.bb
@@ -1,13 +1,14 @@
 SUMMARY = "i.MX System Manager Firmware"
 DESCRIPTION = "\
-The System Manager (SM) is a firmware that runs on a Cortex-M processor on \
+    The System Manager (SM) is a firmware that runs on a Cortex-M processor on \
-many NXP i.MX processors. The Cortex-M is the boot core, runs the boot ROM \
+    many NXP i.MX processors. The Cortex-M is the boot core, runs the boot ROM \
-which loads the SM (and other boot code), and then branches to the SM. The \
+    which loads the SM (and other boot code), and then branches to the SM. The \
-SM then configures some aspects of the hardware such as isolation mechanisms \
+    SM then configures some aspects of the hardware such as isolation mechanisms \
-and then starts other cores in the system. After starting these cores, it \
+    and then starts other cores in the system. After starting these cores, it \
-enters a service mode where it provides access to clocking, power, sensor, \
+    enters a service mode where it provides access to clocking, power, sensor, \
-and pin control via a client RPC API based on ARM's System Control and \
+    and pin control via a client RPC API based on ARM's System Control and \
-Management Interface (SCMI)."
+    Management Interface (SCMI)."
+HOMEPAGE = "https://github.com/nxp-imx/imx-sm"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f2a70813bc08547f509361c08b718861"
diff --git a/dynamic-layers/filesystem-layer/recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bbappend b/dynamic-layers/filesystem-layer/recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bbappend
index 563c9e763..5490f6881 100644
--- a/dynamic-layers/filesystem-layer/recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bbappend
+++ b/dynamic-layers/filesystem-layer/recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bbappend
@@ -1,10 +1,10 @@
 # Copyright (C) 2015 O.S. Systems Software LTDA.
-PACKAGES += " \
+PACKAGES += "\
    ${PN}-f2fs \
 "
-RDEPENDS:${PN}-f2fs = " \
+RDEPENDS:${PN}-f2fs = "\
    ${PN}-base \
    f2fs-tools \
 "
diff --git a/dynamic-layers/gnome-layer/recipes-graphics/clutter/clutter-1.0_%.bbappend b/dynamic-layers/gnome-layer/recipes-graphics/clutter/clutter-1.0_%.bbappend
index fb90c73e1..20b03e12a 100644
--- a/dynamic-layers/gnome-layer/recipes-graphics/clutter/clutter-1.0_%.bbappend
+++ b/dynamic-layers/gnome-layer/recipes-graphics/clutter/clutter-1.0_%.bbappend
@@ -1,4 +1,4 @@
-PACKAGECONFIG:imxgpu3d ??= " \
+PACKAGECONFIG:imxgpu3d ??= "\
    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', \
       bb.utils.contains('DISTRO_FEATURES',     'x11', 'glx x11', \
                                                       '', d), d)} \
diff --git a/dynamic-layers/gnome-layer/recipes-graphics/cogl/cogl-1.0_%.bbappend b/dynamic-layers/gnome-layer/recipes-graphics/cogl/cogl-1.0_%.bbappend
index e07d0d542..e4401bf9a 100644
--- a/dynamic-layers/gnome-layer/recipes-graphics/cogl/cogl-1.0_%.bbappend
+++ b/dynamic-layers/gnome-layer/recipes-graphics/cogl/cogl-1.0_%.bbappend
@@ -1,4 +1,4 @@
-PACKAGECONFIG:imxgpu3d ??= " \
+PACKAGECONFIG:imxgpu3d ??= "\
    cogl-pango gles2 \
    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', \
       bb.utils.contains('DISTRO_FEATURES',     'x11', 'egl-x11', \
diff --git a/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire_%.bbappend b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire_%.bbappend
index 2c28aca5f..44fed544b 100644
--- a/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire_%.bbappend
+++ b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire_%.bbappend
@@ -11,9 +11,9 @@ SRC_URI:append:mx95-nxp-bsp = " \
 DEPENDS:append:mx95-nxp-bsp = " libdrm"
 PACKAGECONFIG:remove = "${PACKAGECONFIG_REMOVE}"
-PACKAGECONFIG_REMOVE              ?= ""
+PACKAGECONFIG_REMOVE ?= ""
-PACKAGECONFIG_REMOVE:mx6-nxp-bsp  ?= "gstreamer"
+PACKAGECONFIG_REMOVE:mx6-nxp-bsp ?= "gstreamer"
-PACKAGECONFIG_REMOVE:mx7-nxp-bsp  ?= "gstreamer"
+PACKAGECONFIG_REMOVE:mx7-nxp-bsp ?= "gstreamer"
 PACKAGECONFIG:class-target:append:imx-nxp-bsp = " ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez-lc3', '', d)}"
diff --git a/dynamic-layers/multimedia-layer/recipes-multimedia/wireplumber/wireplumber_%.bbappend b/dynamic-layers/multimedia-layer/recipes-multimedia/wireplumber/wireplumber_%.bbappend
index e79e98cfe..891620f07 100644
--- a/dynamic-layers/multimedia-layer/recipes-multimedia/wireplumber/wireplumber_%.bbappend
+++ b/dynamic-layers/multimedia-layer/recipes-multimedia/wireplumber/wireplumber_%.bbappend
@@ -1,9 +1,9 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 SRC_URI:append:imx-nxp-bsp = " file://51-bluez-imx.conf \
-                               file://80-disable-logind.conf \
+                              file://80-disable-logind.conf \
-                               file://0001-wpctl-fix-set-default-Segmentation-fault-on-32bit-pl.patch \
+                              file://0001-wpctl-fix-set-default-Segmentation-fault-on-32bit-pl.patch \
-                             "
+                              "
 do_install:append:imx-nxp-bsp () {
diff --git a/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend b/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend
index dfedc062e..9f6c55be0 100644
--- a/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend
+++ b/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend
@@ -1,5 +1,5 @@
 # 6 and 7 Vivante do not provide virtual/libgbm required for any drm* flavour
-DRM-REMOVE                    = ""
+DRM-REMOVE = ""
 DRM-REMOVE:imxgpu:mx6-nxp-bsp = "drm-gl drm-gles2"
 DRM-REMOVE:imxgpu:mx7-nxp-bsp = "drm-gl drm-gles2"
 PACKAGECONFIG:remove = "${DRM-REMOVE}"
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/utp-com/utp-com_git.bb b/dynamic-layers/openembedded-layer/recipes-devtools/utp-com/utp-com_git.bb
index 364c91bcc..4c9620f91 100644
--- a/dynamic-layers/openembedded-layer/recipes-devtools/utp-com/utp-com_git.bb
+++ b/dynamic-layers/openembedded-layer/recipes-devtools/utp-com/utp-com_git.bb
@@ -1,20 +1,22 @@
+SUMMARY = "NXP UTP protocol command-line tool"
 DESCRIPTION = "Tool used to send commands to hardware via NXP's UTP protocol"
+HOMEPAGE = "https://github.com/Freescale/utp_com"
+SECTION = "devel"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022"
 DEPENDS = "sg3-utils"
-SRCREV = "dee512ced1e9367d223d22f10797fbf9aeacfab6"
+PV = "1.0+git${SRCPV}"
-SRC_URI = " \
+SRC_URI = "\
    git://github.com/Freescale/utp_com;protocol=https;branch=master \
 "
+SRCREV = "dee512ced1e9367d223d22f10797fbf9aeacfab6"
-PV = "1.0+git${SRCPV}"
 do_configure[noexec] = "1"
 do_compile () {
-        oe_runmake
+    oe_runmake
 }
 do_install () {
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/uuu/uuu_git.bb b/dynamic-layers/openembedded-layer/recipes-devtools/uuu/uuu_git.bb
index 3af8bc569..036d0284f 100644
--- a/dynamic-layers/openembedded-layer/recipes-devtools/uuu/uuu_git.bb
+++ b/dynamic-layers/openembedded-layer/recipes-devtools/uuu/uuu_git.bb
@@ -11,6 +11,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=38ec0c18112e9a92cffc4951661e85a5"
 inherit cmake pkgconfig
-DEPENDS = "libusb zlib bzip2 openssl zstd libtinyxml2"
+DEPENDS = "bzip2 libtinyxml2 libusb openssl zlib zstd"
 BBCLASSEXTEND = "native nativesdk"
diff --git a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb
index 227b6291b..6a52f67a6 100644
--- a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb
+++ b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb
@@ -1,20 +1,21 @@
 SUMMARY = "Frame Manager Configuration tool"
+HOMEPAGE = "https://github.com/nxp-qoriq/fmc"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=a504ab5a8ff235e67c7301214749346c"
 PR = "r2"
-DEPENDS = "libxml2 fmlib tclap"
+DEPENDS = "fmlib libxml2 tclap"
 SRC_URI = "git://github.com/nxp-qoriq/fmc;protocol=https;nobranch=1"
 SRCREV = "5b9f4b16a864e9dfa58cdcc860be278a7f66ac18"
 EXTRA_OEMAKE = 'FMD_USPACE_HEADER_PATH="${STAGING_INCDIR}/fmd" \
-    FMD_USPACE_LIB_PATH="${STAGING_LIBDIR}" LIBXML2_HEADER_PATH="${STAGING_INCDIR}/libxml2" \
+               FMD_USPACE_LIB_PATH="${STAGING_LIBDIR}" LIBXML2_HEADER_PATH="${STAGING_INCDIR}/libxml2" \
-    TCLAP_HEADER_PATH="${STAGING_INCDIR}" '
+               TCLAP_HEADER_PATH="${STAGING_INCDIR}" '
 EXTRA_OEMAKE:class-native = 'FMCHOSTMODE=1 FMD_USPACE_HEADER_PATH="${STAGING_INCDIR}/fmd" \
-    FMD_USPACE_LIB_PATH="${STAGING_LIBDIR}" LIBXML2_HEADER_PATH="${STAGING_INCDIR}/libxml2" \
+                            FMD_USPACE_LIB_PATH="${STAGING_LIBDIR}" LIBXML2_HEADER_PATH="${STAGING_INCDIR}/libxml2" \
-    TCLAP_HEADER_PATH="${STAGING_INCDIR}" '
+                            TCLAP_HEADER_PATH="${STAGING_INCDIR}" '
 EXTRA_OEMAKE_PLATFORM ?= ""
 EXTRA_OEMAKE_PLATFORM:ls1043a = "ls1043"
@@ -27,7 +28,6 @@ EXTRA_OEMAKE_PLATFORM:p3041 = "p4080ds"
 EXTRA_OEMAKE_PLATFORM:p4080 = "p4080ds"
 EXTRA_OEMAKE_PLATFORM:p5040 = "p4080ds"
 do_compile () {
    oe_runmake MACHINE=${EXTRA_OEMAKE_PLATFORM} -C source
 }
diff --git a/dynamic-layers/openembedded-layer/recipes-fsl/packagegroups/packagegroup-fsl-opencv-imx.bb b/dynamic-layers/openembedded-layer/recipes-fsl/packagegroups/packagegroup-fsl-opencv-imx.bb
index 724d0ff53..2b766b199 100644
--- a/dynamic-layers/openembedded-layer/recipes-fsl/packagegroups/packagegroup-fsl-opencv-imx.bb
+++ b/dynamic-layers/openembedded-layer/recipes-fsl/packagegroups/packagegroup-fsl-opencv-imx.bb
@@ -2,11 +2,11 @@ DESCRIPTION = "Add packages for opencv i.MX build"
 inherit packagegroup
-OPENCV_PKGS = " \
+OPENCV_PKGS = "\
    opencv-apps \
    opencv-samples \
    python3-opencv \
 "
-RDEPENDS:${PN} = " \
+RDEPENDS:${PN} = "\
    ${OPENCV_PKGS} \
 "
diff --git a/dynamic-layers/openembedded-layer/recipes-fsl/packagegroups/packagegroup-fsl-tools-benchmark.bb b/dynamic-layers/openembedded-layer/recipes-fsl/packagegroups/packagegroup-fsl-tools-benchmark.bb
index 534d37627..111bd931a 100644
--- a/dynamic-layers/openembedded-layer/recipes-fsl/packagegroups/packagegroup-fsl-tools-benchmark.bb
+++ b/dynamic-layers/openembedded-layer/recipes-fsl/packagegroups/packagegroup-fsl-tools-benchmark.bb
@@ -8,7 +8,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 inherit packagegroup
-RDEPENDS:${PN} = " \
+RDEPENDS:${PN} = "\
    lmbench \
    bonnie++ \
    dbench \
diff --git a/dynamic-layers/openembedded-layer/recipes-fsl/packagegroups/packagegroup-fsl-tools-testapps.bb b/dynamic-layers/openembedded-layer/recipes-fsl/packagegroups/packagegroup-fsl-tools-testapps.bb
index 2706dca97..4f151ac47 100644
--- a/dynamic-layers/openembedded-layer/recipes-fsl/packagegroups/packagegroup-fsl-tools-testapps.bb
+++ b/dynamic-layers/openembedded-layer/recipes-fsl/packagegroups/packagegroup-fsl-tools-testapps.bb
@@ -3,7 +3,7 @@
 # Released under the MIT license (see COPYING.MIT for the terms)
 DESCRIPTION = "Packagegroup used by FSL Community to provide a set of packages and utilities \
-for hardware test."
+               for hardware test."
 SUMMARY = "FSL Community packagegroup - tools/testapps"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -12,10 +12,10 @@ inherit packagegroup
 SOC_TOOLS_TEST = ""
 SOC_TOOLS_TEST:imx-nxp-bsp = "imx-test"
-SOC_TOOLS_TEST:imxgpu  = "imx-test imx-gpu-viv-demos"
+SOC_TOOLS_TEST:imxgpu = "imx-test imx-gpu-viv-demos"
 SOC_TOOLS_TEST:qoriq = "ceetm optee-test-qoriq"
-RDEPENDS:${PN} = " \
+RDEPENDS:${PN} = "\
    alsa-utils \
    alsa-tools \
    dosfstools \
diff --git a/dynamic-layers/openembedded-layer/recipes-multimedia/mpv/mpv_%.bbappend b/dynamic-layers/openembedded-layer/recipes-multimedia/mpv/mpv_%.bbappend
index 5cf6d411c..9bc613e1f 100644
--- a/dynamic-layers/openembedded-layer/recipes-multimedia/mpv/mpv_%.bbappend
+++ b/dynamic-layers/openembedded-layer/recipes-multimedia/mpv/mpv_%.bbappend
@@ -1,2 +1,2 @@
-# testbuild/../test.c:10: undefined reference to `glXCreateContext' 
+# testbuild/../test.c:10: undefined reference to `glXCreateContext'
 PACKAGECONFIG:remove:imxgpu = "x11"
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch
deleted file mode 100644
index b1b00623d..000000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 9b4959b97d2e95d4b49cf6ca2a3fce3cdb484f2d Mon Sep 17 00:00:00 2001
-From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
-Date: Thu, 31 Mar 2016 00:20:15 +0200
-Subject: [PATCH] 3rdparty/ippicv: Use pre-downloaded ipp
-Upstream-Status: Pending
-Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
-Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>
---
- 3rdparty/ippicv/ippicv.cmake | 15 +--------------
- 1 file changed, 1 insertion(+), 14 deletions(-)
-diff --git a/3rdparty/ippicv/ippicv.cmake b/3rdparty/ippicv/ippicv.cmake
-index 257af6fcc6..f88460450f 100644
--- a/3rdparty/ippicv/ippicv.cmake
-+++ b/3rdparty/ippicv/ippicv.cmake
-@@ -34,18 +34,5 @@ function(download_ippicv root_var)
-   endif()
- 
-   set(THE_ROOT "${OpenCV_BINARY_DIR}/3rdparty/ippicv")
-  ocv_download(FILENAME ${OPENCV_ICV_NAME}
-               HASH ${OPENCV_ICV_HASH}
-               URL
-                 "${OPENCV_IPPICV_URL}"
-                 "$ENV{OPENCV_IPPICV_URL}"
-                 "https://raw.githubusercontent.com/opencv/opencv_3rdparty/${IPPICV_COMMIT}/ippicv/"
-               DESTINATION_DIR "${THE_ROOT}"
-               ID IPPICV
-               STATUS res
-               UNPACK RELATIVE_URL)
-
-  if(res)
-    set(${root_var} "${THE_ROOT}/${OPENCV_ICV_PACKAGE_SUBDIR}" PARENT_SCOPE)
-  endif()
-+  set(${root_var} "${THE_ROOT}/${OPENCV_ICV_PACKAGE_SUBDIR}" PARENT_SCOPE)
- endfunction()
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch
deleted file mode 100644
index 59da6ab32..000000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d6bdd0a91eb0ed57688c0af5ba5088cf0afdc0a0 Mon Sep 17 00:00:00 2001
-From: Jochen Sprickerhof <jspricke@debian.org>
-Date: Mon, 8 Aug 2022 21:10:13 +0200
-Subject: [PATCH] Add missing header for LIBAVCODEC_VERSION_INT
-Upstream-Status: Backport [https://github.com/opencv/opencv/pull/22357]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- modules/videoio/src/ffmpeg_codecs.hpp | 1 +
- 1 file changed, 1 insertion(+)
-diff --git a/modules/videoio/src/ffmpeg_codecs.hpp b/modules/videoio/src/ffmpeg_codecs.hpp
-index 61788e0345..faad2596ed 100644
--- a/modules/videoio/src/ffmpeg_codecs.hpp
-+++ b/modules/videoio/src/ffmpeg_codecs.hpp
-@@ -60,6 +60,7 @@ extern "C" {
- #include <errno.h>
- #endif
- 
-+#include <libavcodec/version.h>
- #include <libavformat/avformat.h>
- 
- #ifdef __cplusplus
-- 
-2.38.1
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Add-smaller-version-of-download_models.py.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Add-smaller-version-of-download_models.py.patch
index 46232ec5c..29e0d5f95 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Add-smaller-version-of-download_models.py.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Add-smaller-version-of-download_models.py.patch
@@ -4,6 +4,7 @@ Date: Tue, 1 Sep 2020 14:57:07 -0500
 Subject: [PATCH] Add smaller version of download_models.py
 Upstream-Status: Pending
 Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
 ---
 testdata/dnn/download_models_basic.py | 159 ++++++++++++++++++++++++++
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch
index d56b8ae67..9e72fe2f5 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch
@@ -7,7 +7,7 @@ Make ts module external
 Reference: https://github.com/qbonnard/opencv/commit/6b229c5834cb9a0930425e762a6c7b03244d7abb
-Upstream-Status: Submitted [https://github.com/opencv/opencv/issues/8408]
+Upstream-Status: Denied [https://github.com/opencv/opencv/issues/8408]
 Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
 ---
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Renamed-templated-BlocksCompensator-feed-method-to-e.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Renamed-templated-BlocksCompensator-feed-method-to-e.patch
new file mode 100644
index 000000000..ec2bb2d10
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Renamed-templated-BlocksCompensator-feed-method-to-e.patch
@@ -0,0 +1,55 @@
+From b28d9bef1d96d10e9a47d55a63d9f1443e6e3d2b Mon Sep 17 00:00:00 2001
+From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
+Date: Mon, 8 Sep 2025 14:52:58 +0300
+Subject: [PATCH] Renamed templated BlocksCompensator::feed method to exclude
+ claches with base class pure virtual method.
+Upstream-Status: Backport [https://github.com/opencv/opencv/commit/b28d9bef1d96d10e9a47d55a63d9f1443e6e3d2b]
+Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
+---
+ .../opencv2/stitching/detail/exposure_compensate.hpp        | 2 +-
+ modules/stitching/src/exposure_compensate.cpp               | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+diff --git a/modules/stitching/include/opencv2/stitching/detail/exposure_compensate.hpp b/modules/stitching/include/opencv2/stitching/detail/exposure_compensate.hpp
+index dea76c957b..2954f32ca3 100644
+--- a/modules/stitching/include/opencv2/stitching/detail/exposure_compensate.hpp
+++ b/modules/stitching/include/opencv2/stitching/detail/exposure_compensate.hpp
+@@ -187,7 +187,7 @@ public:
+ 
+ protected:
+     template<class Compensator>
+-    void feed(const std::vector<Point> &corners, const std::vector<UMat> &images,
+    void feedWithStrategy(const std::vector<Point> &corners, const std::vector<UMat> &images,
+               const std::vector<std::pair<UMat,uchar> > &masks);
+ 
+ private:
+diff --git a/modules/stitching/src/exposure_compensate.cpp b/modules/stitching/src/exposure_compensate.cpp
+index 59542d95ba..f7c33fa4ef 100644
+--- a/modules/stitching/src/exposure_compensate.cpp
+++ b/modules/stitching/src/exposure_compensate.cpp
+@@ -460,7 +460,7 @@ void ChannelsCompensator::setMatGains(std::vector<Mat>& umv)
+ 
+ 
+ template<class Compensator>
+-void BlocksCompensator::feed(const std::vector<Point> &corners, const std::vector<UMat> &images,
+void BlocksCompensator::feedWithStrategy(const std::vector<Point> &corners, const std::vector<UMat> &images,
+                              const std::vector<std::pair<UMat,uchar> > &masks)
+ {
+     CV_Assert(corners.size() == images.size() && images.size() == masks.size());
+@@ -605,13 +605,13 @@ void BlocksCompensator::setMatGains(std::vector<Mat>& umv)
+ void BlocksGainCompensator::feed(const std::vector<Point> &corners, const std::vector<UMat> &images,
+                                  const std::vector<std::pair<UMat,uchar> > &masks)
+ {
+-    BlocksCompensator::feed<GainCompensator>(corners, images, masks);
+    BlocksCompensator::feedWithStrategy<GainCompensator>(corners, images, masks);
+ }
+ 
+ void BlocksChannelsCompensator::feed(const std::vector<Point> &corners, const std::vector<UMat> &images,
+                                      const std::vector<std::pair<UMat,uchar> > &masks)
+ {
+-    BlocksCompensator::feed<ChannelsCompensator>(corners, images, masks);
+    BlocksCompensator::feedWithStrategy<ChannelsCompensator>(corners, images, masks);
+ }
+ 
+ 
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch
index aa7d335ea..a3bbefaab 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch
@@ -4,10 +4,11 @@ Date: Wed, 9 May 2018 13:33:59 -0700
 Subject: [PATCH] Temporarliy work around deprecated ffmpeg RAW function
 compile failure until next uprev
-Upstream-Status: Inappropriate [platform specific]
 Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
 ---
+Upstream-Status: Pending
 modules/videoio/src/cap_ffmpeg_impl.hpp | 8 ++++++++
 1 file changed, 8 insertions(+)
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch
deleted file mode 100644
index 5d88d1a6a..000000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 9cfa84313c5833d7295fcf57be93d5d2aaadfd88 Mon Sep 17 00:00:00 2001
-From: Vincent Rabaud <vrabaud@google.com>
-Date: Sat, 10 Jul 2021 00:21:52 +0200
-Subject: [PATCH] Use the one argument version of SetTotalBytesLimit.
-The two argument versions has been deprecated, cf
-https://developers.google.com/protocol-buffers/docs/reference/cpp/google.protobuf.io.coded_stream
-Upstream-Status: Backport [9cfa84313c5833d7295fcf57be93d5d2aaadfd88 - from master after 4.5.3 tag]
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
- modules/dnn/src/caffe/caffe_io.cpp | 5 +++++
- 1 file changed, 5 insertions(+)
-diff --git a/modules/dnn/src/caffe/caffe_io.cpp b/modules/dnn/src/caffe/caffe_io.cpp
-index 2fc4d84f46..ebecf95eea 100644
--- a/modules/dnn/src/caffe/caffe_io.cpp
-+++ b/modules/dnn/src/caffe/caffe_io.cpp
-@@ -92,6 +92,7 @@
- #ifdef HAVE_PROTOBUF
- #include <google/protobuf/io/coded_stream.h>
- #include <google/protobuf/io/zero_copy_stream_impl.h>
-+#include <google/protobuf/stubs/common.h>
- #include <google/protobuf/text_format.h>
- 
- #include <opencv2/core.hpp>
-@@ -1111,7 +1112,11 @@ static const int kProtoReadBytesLimit = INT_MAX;  // Max size of 2 GB minus 1 by
- 
- bool ReadProtoFromBinary(ZeroCopyInputStream* input, Message *proto) {
-     CodedInputStream coded_input(input);
-+#if GOOGLE_PROTOBUF_VERSION >= 3006000
-+    coded_input.SetTotalBytesLimit(kProtoReadBytesLimit);
-+#else
-     coded_input.SetTotalBytesLimit(kProtoReadBytesLimit, 536870912);
-+#endif
- 
-     return proto->ParseFromCodedStream(&coded_input);
- }
-- 
-2.32.0
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch
deleted file mode 100644
index 7b2c4100a..000000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From ffe20fc4ec46c6b491eff29a38f90686d4d035f6 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Mon, 12 Apr 2021 20:37:40 +0000
-Subject: [PATCH] sfm: link with Glog_LIBS
-* in 4.5.0 there was explicit linkage with GLOG_LIBRARY, but since 4.5.1 with:
-  https://github.com/opencv/opencv_contrib/commit/23ee62a19b7a3e50d6dbf295359d8b1aff2e03fd
-  it's gone, probably because Glog_FOUND is already set from Ceres,
-  but then GLOG_LIBRARIES is empty in LIBMV_LIGHT_LIBS and build with gold fails:
-FAILED: bin/example_tutorial_perspective_correction
-: && TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/x86_64-oe-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -ITOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/git/include  -fstack-protector-strong  -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security  --sysroot=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot  -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0=/usr/src/debug/opencv/4.5.2-r0                      -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0=/usr/src/debug/opencv/4.5.2-r0                      -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot=                      -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot-native=  -fvisibility-inlines-hidden  -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -ITOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/git/include  -fstack-protector-strong  -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security  --sysroot=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot   -fsigned-char -W -Wall -Werror=return-type -Werror=non-virtual-dtor -Werror=address -Werror=sequence-point -Wformat -Werror=format-security -Wmissing-declarations -Wundef -Winit-self -Wpointer-arith -Wshadow -Wsign-promo -Wuninitialized -Wsuggest-override -Wno-delete-non-virtual-dtor -Wno-comment -Wimplicit-fallthrough=3 -Wno-strict-overflow -fdiagnostics-show-option -Wno-long-long -pthread -fomit-frame-pointer -ffunction-sections -fdata-sections  -msse -msse2 -msse3 -mssse3 -DNDEBUG  -DNDEBUG  -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -ITOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/git/include  -fstack-protector-strong  -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security  --sysroot=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot  -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0=/usr/src/debug/opencv/4.5.2-r0                      -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0=/usr/src/debug/opencv/4.5.2-r0                      -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot=                      -fdebug-prefix-map=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot-native=  -fvisibility-inlines-hidden  -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -ITOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/git/include  -fstack-protector-strong  -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security  --sysroot=TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/recipe-sysroot -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now  -Wl,--gc-sections -Wl,--as-needed samples/cpp/CMakeFiles/example_tutorial_perspective_correction.dir/tutorial_code/features2D/Homography/perspective_correction.cpp.o -o bin/example_tutorial_perspective_correction  -ldl  -lm  -lpthread  -lrt  lib/libopencv_gapi.so.4.5.2  lib/libopencv_stitching.so.4.5.2  lib/libopencv_ts.so.4.5.2  lib/libopencv_alphamat.so.4.5.2  lib/libopencv_aruco.so.4.5.2  lib/libopencv_bgsegm.so.4.5.2  lib/libopencv_bioinspired.so.4.5.2  lib/libopencv_ccalib.so.4.5.2  lib/libopencv_dnn_objdetect.so.4.5.2  lib/libopencv_dnn_superres.so.4.5.2  lib/libopencv_dpm.so.4.5.2  lib/libopencv_face.so.4.5.2  lib/libopencv_fuzzy.so.4.5.2  lib/libopencv_hfs.so.4.5.2  lib/libopencv_img_hash.so.4.5.2  lib/libopencv_intensity_transform.so.4.5.2  lib/libopencv_line_descriptor.so.4.5.2  lib/libopencv_mcc.so.4.5.2  lib/libopencv_quality.so.4.5.2  lib/libopencv_rapid.so.4.5.2  lib/libopencv_reg.so.4.5.2  lib/libopencv_rgbd.so.4.5.2  lib/libopencv_saliency.so.4.5.2  lib/libopencv_sfm.so.4.5.2  lib/libopencv_stereo.so.4.5.2  lib/libopencv_structured_light.so.4.5.2  lib/libopencv_superres.so.4.5.2  lib/libopencv_surface_matching.so.4.5.2  lib/libopencv_tracking.so.4.5.2  lib/libopencv_videostab.so.4.5.2  lib/libopencv_wechat_qrcode.so.4.5.2  lib/libopencv_xfeatures2d.so.4.5.2  lib/libopencv_xobjdetect.so.4.5.2  lib/libopencv_xphoto.so.4.5.2  lib/libopencv_shape.so.4.5.2  lib/libopencv_highgui.so.4.5.2  lib/libopencv_datasets.so.4.5.2  lib/libopencv_ml.so.4.5.2  lib/libopencv_plot.so.4.5.2  lib/libopencv_phase_unwrapping.so.4.5.2  lib/libopencv_optflow.so.4.5.2  lib/libopencv_ximgproc.so.4.5.2  lib/libopencv_videoio.so.4.5.2  lib/libopencv_video.so.4.5.2  lib/libopencv_dnn.so.4.5.2  lib/libopencv_imgcodecs.so.4.5.2  lib/libopencv_objdetect.so.4.5.2  lib/libopencv_calib3d.so.4.5.2  lib/libopencv_features2d.so.4.5.2  lib/libopencv_flann.so.4.5.2  lib/libopencv_photo.so.4.5.2  lib/libopencv_imgproc.so.4.5.2  lib/libopencv_core.so.4.5.2  -Wl,-rpath-link,TOPDIR/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/build/lib && :
-lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessage::LogMessage(char const*, int)'
-lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessage::stream()'
-lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessage::~LogMessage()'
-lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::kLogSiteUninitialized'
-lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'fLI::FLAGS_v'
-lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::InitVLOG3__(int**, int*, char const*, int)'
-lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessageFatal::LogMessageFatal(char const*, int)'
-lib/libopencv_sfm.so.4.5.2: error: undefined reference to 'google::LogMessageFatal::~LogMessageFatal()'
-collect2: error: ld returned 1 exit status
-  Add Glog_LIBS which is set to the same value as GLOG_LIBRARIES used to be.
-Upstream-Status: Submitted [https://github.com/opencv/opencv_contrib/pull/2923]
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
- modules/sfm/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-diff --git a/modules/sfm/CMakeLists.txt b/modules/sfm/CMakeLists.txt
-index 045a1fe6e..ee7cecdac 100644
--- a/modules/sfm/CMakeLists.txt
-+++ b/modules/sfm/CMakeLists.txt
-@@ -84,6 +84,7 @@ set(LIBMV_LIGHT_LIBS
-   multiview
-   numeric
-   ${GLOG_LIBRARIES}
-+  ${Glog_LIBS}
-   ${GFLAGS_LIBRARIES}
- )
- 
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch
index d39c05822..9df419d0b 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch
@@ -7,7 +7,6 @@ Subject: [PATCH] To fix errors as following:
 "perf_abs.cpp:13: undefined reference to `cvtest::param_seed'"
 "test_superres.cpp:270: undefined reference to `checkIppStatus()'"
-Upstream-Status: Pending
 Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
 Also add the visibility changes for certain OpenCL-related functions in
@@ -16,6 +15,8 @@ ts module.
 Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>
 ---
+Upstream-Status: Pending
 modules/ts/include/opencv2/ts.hpp          | 4 ++--
 modules/ts/include/opencv2/ts/ocl_test.hpp | 2 +-
 modules/ts/include/opencv2/ts/ts_ext.hpp   | 2 +-
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0008-Do-not-embed-build-directory-in-binaries.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0008-Do-not-embed-build-directory-in-binaries.patch
new file mode 100644
index 000000000..8fda85708
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0008-Do-not-embed-build-directory-in-binaries.patch
@@ -0,0 +1,138 @@
+From: Victor Westerhuis <victor@westerhu.is>
+Date: Sat, 19 Nov 2022 21:45:39 +0100
+Subject: Do not embed build directory in binaries
+This makes the opencv core module build reproducibly.
+https://salsa.debian.org/science-team/opencv/-/raw/master/debian/patches/0008-Do-not-embed-build-directory-in-binaries.patch
+Upstream-Status: Backport
+Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com>
+---
+ modules/core/CMakeLists.txt                   | 10 ------
+ modules/core/include/opencv2/core/private.hpp |  4 +--
+ modules/core/include/opencv2/core/utility.hpp |  4 +--
+ modules/core/src/utils/datafile.cpp           | 48 +--------------------------
+ 4 files changed, 5 insertions(+), 61 deletions(-)
+diff --git a/modules/core/CMakeLists.txt b/modules/core/CMakeLists.txt
+index b78bb98..d96b669 100644
+--- a/modules/core/CMakeLists.txt
+++ b/modules/core/CMakeLists.txt
+@@ -188,16 +188,6 @@ if(OPENCV_OTHER_INSTALL_PATH)
+ ")
+ endif()
+ 
+-set(OPENCV_DATA_CONFIG_STR "${OPENCV_DATA_CONFIG_STR}
+-#define OPENCV_BUILD_DIR \"${CMAKE_BINARY_DIR}\"
+-")
+-
+-file(RELATIVE_PATH SOURCE_DIR_RELATIVE ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR})
+-set(OPENCV_DATA_CONFIG_STR "${OPENCV_DATA_CONFIG_STR}
+-#define OPENCV_DATA_BUILD_DIR_SEARCH_PATHS \\
+-    \"${SOURCE_DIR_RELATIVE}/\"
+-")
+-
+ if(WIN32)
+   file(RELATIVE_PATH INSTALL_DATA_DIR_RELATIVE "${CMAKE_INSTALL_PREFIX}/${OPENCV_BIN_INSTALL_PATH}" "${CMAKE_INSTALL_PREFIX}/${OPENCV_OTHER_INSTALL_PATH}")
+ else()
+diff --git a/modules/core/include/opencv2/core/private.hpp b/modules/core/include/opencv2/core/private.hpp
+index 146d37f..dd675bc 100644
+--- a/modules/core/include/opencv2/core/private.hpp
+++ b/modules/core/include/opencv2/core/private.hpp
+@@ -818,10 +818,10 @@ Search directories:
+ 2. Check path specified by configuration parameter with "_HINT" suffix (name of environment variable).
+ 3. Check path specified by configuration parameter (name of environment variable).
+    If parameter value is not empty and nothing is found then stop searching.
+-4. Detects build/install path based on:
+4. Detects install path based on:
+    a. current working directory (CWD)
+    b. and/or binary module location (opencv_core/opencv_world, doesn't work with static linkage)
+-5. Scan `<source>/{,data}` directories if build directory is detected or the current directory is in source tree.
+5. Scan `<source>/{,data}` directories if the current directory is in source tree.
+ 6. Scan `<install>/share/OpenCV` directory if install directory is detected.
+ 
+ @param relative_path Relative path to data file
+diff --git a/modules/core/include/opencv2/core/utility.hpp b/modules/core/include/opencv2/core/utility.hpp
+index 108c0d9..f15d9ea 100644
+--- a/modules/core/include/opencv2/core/utility.hpp
+++ b/modules/core/include/opencv2/core/utility.hpp
+@@ -1163,10 +1163,10 @@ Search directories:
+ 2. OPENCV_SAMPLES_DATA_PATH_HINT environment variable
+ 3. OPENCV_SAMPLES_DATA_PATH environment variable
+    If parameter value is not empty and nothing is found then stop searching.
+-4. Detects build/install path based on:
+4. Detects install path based on:
+    a. current working directory (CWD)
+    b. and/or binary module location (opencv_core/opencv_world, doesn't work with static linkage)
+-5. Scan `<source>/{,data,samples/data}` directories if build directory is detected or the current directory is in source tree.
+5. Scan `<source>/{,data,samples/data}` directories if the current directory is in source tree.
+ 6. Scan `<install>/share/OpenCV` directory if install directory is detected.
+ 
+ @see cv::utils::findDataFile
+diff --git a/modules/core/src/utils/datafile.cpp b/modules/core/src/utils/datafile.cpp
+index 3af83a5..6bda857 100644
+--- a/modules/core/src/utils/datafile.cpp
+++ b/modules/core/src/utils/datafile.cpp
+@@ -280,32 +280,8 @@ cv::String findDataFile(const cv::String& relative_path,
+ 
+ 
+     // Steps: 4, 5, 6
+-    cv::String cwd = utils::fs::getcwd();
+-    cv::String build_dir(OPENCV_BUILD_DIR);
+-    bool has_tested_build_directory = false;
+-    if (isSubDirectory(build_dir, cwd) || isSubDirectory(utils::fs::canonical(build_dir), utils::fs::canonical(cwd)))
+-    {
+-        CV_LOG_DEBUG(NULL, "utils::findDataFile(): the current directory is build sub-directory: " << cwd);
+-        const char* build_subdirs[] = { OPENCV_DATA_BUILD_DIR_SEARCH_PATHS };
+-        for (size_t k = 0; k < sizeof(build_subdirs)/sizeof(build_subdirs[0]); k++)
+-        {
+-            CV_LOG_DEBUG(NULL, "utils::findDataFile(): <build>/" << build_subdirs[k]);
+-            cv::String datapath = utils::fs::join(build_dir, build_subdirs[k]);
+-            if (utils::fs::isDirectory(datapath))
+-            {
+-                for(size_t i = search_subdir.size(); i > 0; i--)
+-                {
+-                    const cv::String& subdir = search_subdir[i - 1];
+-                    cv::String prefix = utils::fs::join(datapath, subdir);
+-                    TRY_FILE_WITH_PREFIX(prefix);
+-                }
+-            }
+-        }
+-        has_tested_build_directory = true;
+-    }
+-
+     cv::String source_dir;
+-    cv::String try_source_dir = cwd;
+    cv::String try_source_dir = utils::fs::getcwd();
+     for (int levels = 0; levels < 3; ++levels)
+     {
+         if (utils::fs::exists(utils::fs::join(try_source_dir, "modules/core/include/opencv2/core/version.hpp")))
+@@ -341,28 +317,6 @@ cv::String findDataFile(const cv::String& relative_path,
+         CV_LOG_INFO(NULL, "Can't detect module binaries location");
+     }
+ 
+-    if (!has_tested_build_directory &&
+-        (isSubDirectory(build_dir, module_path) || isSubDirectory(utils::fs::canonical(build_dir), utils::fs::canonical(module_path)))
+-    )
+-    {
+-        CV_LOG_DEBUG(NULL, "utils::findDataFile(): the binary module directory is build sub-directory: " << module_path);
+-        const char* build_subdirs[] = { OPENCV_DATA_BUILD_DIR_SEARCH_PATHS };
+-        for (size_t k = 0; k < sizeof(build_subdirs)/sizeof(build_subdirs[0]); k++)
+-        {
+-            CV_LOG_DEBUG(NULL, "utils::findDataFile(): <build>/" << build_subdirs[k]);
+-            cv::String datapath = utils::fs::join(build_dir, build_subdirs[k]);
+-            if (utils::fs::isDirectory(datapath))
+-            {
+-                for(size_t i = search_subdir.size(); i > 0; i--)
+-                {
+-                    const cv::String& subdir = search_subdir[i - 1];
+-                    cv::String prefix = utils::fs::join(datapath, subdir);
+-                    TRY_FILE_WITH_PREFIX(prefix);
+-                }
+-            }
+-        }
+-    }
+-
+ #if defined OPENCV_INSTALL_DATA_DIR_RELATIVE
+     if (!module_path.empty())  // require module path
+     {
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0101-MGS-6470-ccc-Modify-host-ptr-alignment-size-in-UMAT.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0101-MGS-6470-ccc-Modify-host-ptr-alignment-size-in-UMAT.patch
new file mode 100644
index 000000000..82afd5c72
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0101-MGS-6470-ccc-Modify-host-ptr-alignment-size-in-UMAT.patch
@@ -0,0 +1,29 @@
+From 0a1c77e4c810999632d648f63775b7ea265bc25c Mon Sep 17 00:00:00 2001
+From: Eric Guo <eric.guo@nxp.com>
+Date: Tue, 9 Nov 2021 14:38:00 +0800
+Subject: [PATCH 1/4] MGS-6470 [#ccc] Modify host ptr alignment size in UMAT
+change CV_OPENCL_ALIGNMENT_MEM_USE_HOST_PTR from 4 to 64
+Upstream-Status: Inappropriate [i.MX specific]
+Signed-off-by: Eric Guo <eric.guo@nxp.com>
+---
+ modules/core/src/ocl.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/modules/core/src/ocl.cpp b/modules/core/src/ocl.cpp
+index 8479667fd7..6eb7b5e425 100644
+--- a/modules/core/src/ocl.cpp
+++ b/modules/core/src/ocl.cpp
+@@ -245,7 +245,7 @@ static String getBuildExtraOptions()
+ }
+ 
+ static const bool CV_OPENCL_ENABLE_MEM_USE_HOST_PTR = utils::getConfigurationParameterBool("OPENCV_OPENCL_ENABLE_MEM_USE_HOST_PTR", true);
+-static const size_t CV_OPENCL_ALIGNMENT_MEM_USE_HOST_PTR = utils::getConfigurationParameterSizeT("OPENCV_OPENCL_ALIGNMENT_MEM_USE_HOST_PTR", 4);
+static const size_t CV_OPENCL_ALIGNMENT_MEM_USE_HOST_PTR = utils::getConfigurationParameterSizeT("OPENCV_OPENCL_ALIGNMENT_MEM_USE_HOST_PTR", 64);
+ 
+ 
+ struct UMat2D
+-- 
+2.34.1
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0102-MGS-6470-ccc-Add-configuration-parameter-to-force-en.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0102-MGS-6470-ccc-Add-configuration-parameter-to-force-en.patch
new file mode 100644
index 000000000..50240093c
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0102-MGS-6470-ccc-Add-configuration-parameter-to-force-en.patch
@@ -0,0 +1,32 @@
+From 965365fff0815b8afc9833102d8e4e6c4ee1dda3 Mon Sep 17 00:00:00 2001
+From: Eric Guo <eric.guo@nxp.com>
+Date: Wed, 17 Nov 2021 15:04:23 +0800
+Subject: [PATCH 2/4] MGS-6470 [#ccc] Add configuration parameter to force
+ enable hostptr in OpenCL
+USAGE: `set OPENCV_OPENCL_ALIGNMENT_MEM_ALLOC_HOST_PTR=true`
+Upstream-Status: Inappropriate [i.MX specific]
+Signed-off-by: Eric Guo <eric.guo@nxp.com>
+---
+ modules/core/src/ocl.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+diff --git a/modules/core/src/ocl.cpp b/modules/core/src/ocl.cpp
+index 6eb7b5e425..5c50b06865 100644
+--- a/modules/core/src/ocl.cpp
+++ b/modules/core/src/ocl.cpp
+@@ -5416,7 +5416,9 @@ public:
+     {
+         const Device& dev = ctx.device(0);
+         createFlags = 0;
+-        if ((usageFlags & USAGE_ALLOCATE_HOST_MEMORY) != 0)
+        bool allocHostPtr = utils::getConfigurationParameterBool("OPENCV_OPENCL_ALIGNMENT_MEM_ALLOC_HOST_PTR", false);
+
+        if ((usageFlags & USAGE_ALLOCATE_HOST_MEMORY) != 0 || allocHostPtr)
+             createFlags |= CL_MEM_ALLOC_HOST_PTR;
+ 
+         if (!isOpenCLCopyingForced() &&
+-- 
+2.34.1
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0103-MGS-6470-ccc-Change-configuration-to-enable-hostptr-.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0103-MGS-6470-ccc-Change-configuration-to-enable-hostptr-.patch
new file mode 100644
index 000000000..3b429b383
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0103-MGS-6470-ccc-Change-configuration-to-enable-hostptr-.patch
@@ -0,0 +1,28 @@
+From 352b992c7daeeede261cf52e06b5beac485df897 Mon Sep 17 00:00:00 2001
+From: Eric Guo <eric.guo@nxp.com>
+Date: Thu, 9 Dec 2021 15:25:42 +0800
+Subject: [PATCH 3/4] MGS-6470 [#ccc] Change configuration to enable hostptr in
+ OpenCL by default.
+Upstream-Status: Inappropriate [i.MX specific]
+Signed-off-by: Eric Guo <eric.guo@nxp.com>
+---
+ modules/core/src/ocl.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/modules/core/src/ocl.cpp b/modules/core/src/ocl.cpp
+index 5c50b06865..db75190f13 100644
+--- a/modules/core/src/ocl.cpp
+++ b/modules/core/src/ocl.cpp
+@@ -5416,7 +5416,7 @@ public:
+     {
+         const Device& dev = ctx.device(0);
+         createFlags = 0;
+-        bool allocHostPtr = utils::getConfigurationParameterBool("OPENCV_OPENCL_ALIGNMENT_MEM_ALLOC_HOST_PTR", false);
+        bool allocHostPtr = utils::getConfigurationParameterBool("OPENCV_OPENCL_ALIGNMENT_MEM_ALLOC_HOST_PTR", true);
+ 
+         if ((usageFlags & USAGE_ALLOCATE_HOST_MEMORY) != 0 || allocHostPtr)
+             createFlags |= CL_MEM_ALLOC_HOST_PTR;
+-- 
+2.34.1
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0104-MGS-8011-ccc-Fix-the-problem-of-syntax-error-at-doub.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0104-MGS-8011-ccc-Fix-the-problem-of-syntax-error-at-doub.patch
new file mode 100644
index 000000000..ebca4ce35
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0104-MGS-8011-ccc-Fix-the-problem-of-syntax-error-at-doub.patch
@@ -0,0 +1,43 @@
+From 2766330540d5106e1cc5c44ab14f021e306859cb Mon Sep 17 00:00:00 2001
+From: jiajia Qian <jiajia.qian@nxp.com>
+Date: Tue, 7 Jan 2025 16:42:34 +0800
+Subject: [PATCH 4/4] MGS-8011 [#ccc] Fix the problem of syntax error at
+ 'double4' in opencv_test_imgproc.
+Since our driver does not support cl_khr_fp64 format data,
+disabled the related ocl function in opencv_test_imgproc to avoid the following error log:
+error: syntax error at 'double4'
+Upstream-Status: Inappropriate [i.MX specific]
+Signed-off-by: jiajia Qian <jiajia.qian@nxp.com>
+---
+ modules/imgproc/src/imgwarp.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+diff --git a/modules/imgproc/src/imgwarp.cpp b/modules/imgproc/src/imgwarp.cpp
+index dfc718bf87..0e8b9ce142 100644
+--- a/modules/imgproc/src/imgwarp.cpp
+++ b/modules/imgproc/src/imgwarp.cpp
+@@ -1349,6 +1349,7 @@ static bool ocl_remap(InputArray _src, OutputArray _dst, InputArray _map1, Input
+     interpolation &= ~WARP_RELATIVE_MAP;
+ 
+     const ocl::Device & dev = ocl::Device::getDefault();
+    bool doubleSupport = dev.doubleFPConfig() > 0;
+     int cn = _src.channels(), type = _src.type(), depth = _src.depth(),
+             rowsPerWI = dev.isIntel() ? 4 : 1;
+ 
+@@ -1356,6 +1357,9 @@ static bool ocl_remap(InputArray _src, OutputArray _dst, InputArray _map1, Input
+             || _map1.type() == CV_16SC1 || _map2.type() == CV_16SC1)
+         return false;
+ 
+    if (!doubleSupport && depth == CV_64F )
+        return false;
+
+     UMat src = _src.getUMat(), map1 = _map1.getUMat(), map2 = _map2.getUMat();
+ 
+     if( (map1.type() == CV_16SC2 && (map2.type() == CV_16UC1 || map2.empty())) ||
+-- 
+2.34.1
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0105-MGS-8318-ccc-Fix-error-implicit-declaration-of-funct.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0105-MGS-8318-ccc-Fix-error-implicit-declaration-of-funct.patch
new file mode 100644
index 000000000..d742b9123
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0105-MGS-8318-ccc-Fix-error-implicit-declaration-of-funct.patch
@@ -0,0 +1,34 @@
+From e5d7ecd9acd3805e90f5d491044813c034d3b014 Mon Sep 17 00:00:00 2001
+From: jiajia Qian <jiajia.qian@nxp.com>
+Date: Fri, 8 Aug 2025 14:19:57 +0800
+Subject: [PATCH] MGS-8318 [#ccc] Fix error:implicit declaration of function
+ 'sub_group_reduce_add' is invalid in OpenCL.
+The OpenCL extension cl_khr_subgroups is not supported in OpenCL 1.2.
+This feature requires at least OpenCL 2.0 or higher. By default, the C++ C language standard used
+is C++ C 1.2. Therefore, specify OpenCL version to 3.0 in the build-options.
+Upstream-Status: Inappropriate [i.MX specific]
+Signed-off-by: jiajia Qian <jiajia.qian@nxp.com>
+---
+ modules/video/src/dis_flow.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/modules/video/src/dis_flow.cpp b/modules/video/src/dis_flow.cpp
+index 75090d093d..9954645ca7 100644
+--- a/modules/video/src/dis_flow.cpp
+++ b/modules/video/src/dis_flow.cpp
+@@ -1101,7 +1101,7 @@ bool DISOpticalFlowImpl::ocl_PatchInverseSearch(UMat &src_U,
+         subgroups_build_options = " -DCV_USE_SUBGROUPS=1";
+ 
+     String build_options = cv::format(
+-                "-DDIS_BORDER_SIZE=%d -DDIS_PATCH_SIZE=%d -DDIS_PATCH_STRIDE=%d",
+                "-cl-std=CL3.0 -DDIS_BORDER_SIZE=%d -DDIS_PATCH_SIZE=%d -DDIS_PATCH_STRIDE=%d",
+                 border_size, patch_size, patch_stride
+             ) + subgroups_build_options;
+ 
+-- 
+2.34.1
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0106-core-opencl-fix-inplace-transpose-race-by-enforcing-.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0106-core-opencl-fix-inplace-transpose-race-by-enforcing-.patch
new file mode 100644
index 000000000..c061342ef
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0106-core-opencl-fix-inplace-transpose-race-by-enforcing-.patch
@@ -0,0 +1,152 @@
+From 504144ee0a126e7a11a5b1751b7dc0a80ed1cd0f Mon Sep 17 00:00:00 2001
+From: jiajia Qian <jiajia.qian@nxp.com>
+Date: Tue, 17 Mar 2026 14:19:35 +0800
+Subject: [PATCH] core(opencl): fix inplace transpose race by enforcing LLSS
+ ordering via local barrier
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+The former inplace transpose implementation allowed a reordering of
+global-memory operations across work-items. Specifically, the intended
+LLSS (Load–Load–Store–Store) access pattern could be reordered by the
+GPU into LSLS (Load–Store–Load–Store), causing partially written tiles
+to be observed by other work-items and producing incorrect output.
+This patch introduces a tiled LDS-based algorithm and adds an explicit:
+    barrier(CLK_LOCAL_MEM_FENCE);
+between the load and store phases.
+Upstream-Status: Backport
+[commit a3e129aad85abcd2b61f071796ff80f9ca215619]
+Signed-off-by: jiajia Qian <jiajia.qian@nxp.com>
+---
+ modules/core/src/matrix_transform.cpp | 10 +++-
+ modules/core/src/opencl/transpose.cl  | 69 ++++++++++++++++++++++++++-
+ 2 files changed, 75 insertions(+), 4 deletions(-)
+diff --git a/modules/core/src/matrix_transform.cpp b/modules/core/src/matrix_transform.cpp
+index c52fcc1e4f..84aa5ca778 100644
+--- a/modules/core/src/matrix_transform.cpp
+++ b/modules/core/src/matrix_transform.cpp
+@@ -146,10 +146,16 @@ static bool ocl_transpose( InputArray _src, OutputArray _dst )
+             return false;
+     }
+ 
+    String deviceMacro;
+    if (dev.isIntel())
+        deviceMacro = " -D INTEL_GPU";
+    else
+        deviceMacro = "";
+
+     ocl::Kernel k(kernelName.c_str(), ocl::core::transpose_oclsrc,
+-                  format("-D T=%s -D T1=%s -D cn=%d -D TILE_DIM=%d -D BLOCK_ROWS=%d -D rowsPerWI=%d%s",
+                  format("-D T=%s -D T1=%s -D cn=%d -D TILE_DIM=%d -D BLOCK_ROWS=%d -D rowsPerWI=%d%s%s",
+                          ocl::memopTypeToStr(type), ocl::memopTypeToStr(depth),
+-                         cn, TILE_DIM, BLOCK_ROWS, rowsPerWI, inplace ? " -D INPLACE" : ""));
+                         cn, TILE_DIM, BLOCK_ROWS, rowsPerWI, inplace ? " -D INPLACE" : "", deviceMacro.c_str()));
+     if (k.empty())
+         return false;
+ 
+diff --git a/modules/core/src/opencl/transpose.cl b/modules/core/src/opencl/transpose.cl
+index 01ea7dd9d5..ae4d7f08d3 100644
+--- a/modules/core/src/opencl/transpose.cl
+++ b/modules/core/src/opencl/transpose.cl
+@@ -53,10 +53,10 @@
+ #define TSIZE ((int)sizeof(T1)*3)
+ #endif
+ 
+-#ifndef INPLACE
+-
+ #define LDS_STEP      (TILE_DIM + 1)
+ 
+#ifndef INPLACE
+
+ __kernel void transpose(__global const uchar * srcptr, int src_step, int src_offset, int src_rows, int src_cols,
+                         __global uchar * dstptr, int dst_step, int dst_offset)
+ {
+@@ -120,6 +120,7 @@ __kernel void transpose(__global const uchar * srcptr, int src_step, int src_off
+ 
+ __kernel void transpose_inplace(__global uchar * srcptr, int src_step, int src_offset, int src_rows)
+ {
+#ifdef INTEL_GPU
+     int x = get_global_id(0);
+     int y = get_global_id(1) * rowsPerWI;
+ 
+@@ -141,6 +142,70 @@ __kernel void transpose_inplace(__global uchar * srcptr, int src_step, int src_o
+                 storepix(tmp, src);
+             }
+     }
+#else
+    int gp_x = get_group_id(0);
+    int gp_y = get_group_id(1);
+    int lx = get_local_id(0);
+    int ly = get_local_id(1);
+
+    __local T tile_a[TILE_DIM * LDS_STEP];
+    __local T tile_b[TILE_DIM * LDS_STEP];
+
+    if (gp_x > gp_y)
+    {
+        int x_a = gp_x * TILE_DIM + lx;
+        int y_a = gp_y * TILE_DIM + ly;
+        int x_b = gp_y * TILE_DIM + lx;
+        int y_b = gp_x * TILE_DIM + ly;
+
+        // Load
+        #pragma unroll
+        for (int i = 0; i < TILE_DIM; i += BLOCK_ROWS)
+        {
+            if (y_a + i < src_rows && x_a < src_rows)
+                tile_a[mad24(ly + i, LDS_STEP, lx)] =
+                    loadpix(srcptr + mad24(y_a + i, src_step, mad24(x_a, TSIZE, src_offset)));
+
+            if (y_b + i < src_rows && x_b < src_rows)
+                tile_b[mad24(ly + i, LDS_STEP, lx)] =
+                    loadpix(srcptr + mad24(y_b + i, src_step, mad24(x_b, TSIZE, src_offset)));
+        }
+
+        barrier(CLK_LOCAL_MEM_FENCE);
+
+        // Store (transposed)
+        #pragma unroll
+        for (int i = 0; i < TILE_DIM; i += BLOCK_ROWS)
+        {
+            if (y_b + i < src_rows && x_b < src_rows)
+                storepix(tile_a[mad24(lx, LDS_STEP, ly + i)],
+                        srcptr + mad24(y_b + i, src_step, mad24(x_b, TSIZE, src_offset)));
+
+            if (y_a + i < src_rows && x_a < src_rows)
+                storepix(tile_b[mad24(lx, LDS_STEP, ly + i)],
+                        srcptr + mad24(y_a + i, src_step, mad24(x_a, TSIZE, src_offset)));
+        }
+    }
+    else if (gp_x == gp_y)
+    {
+        int x = gp_x * TILE_DIM + lx;
+        int y = gp_y * TILE_DIM + ly;
+
+        #pragma unroll
+        for (int i = 0; i < TILE_DIM; i += BLOCK_ROWS)
+            if (y + i < src_rows && x < src_rows)
+                tile_a[mad24(ly + i, LDS_STEP, lx)] =
+                    loadpix(srcptr + mad24(y + i, src_step, mad24(x, TSIZE, src_offset)));
+
+        barrier(CLK_LOCAL_MEM_FENCE);
+
+        #pragma unroll
+        for (int i = 0; i < TILE_DIM; i += BLOCK_ROWS)
+            if (y + i < src_rows && x < src_rows)
+                storepix(tile_a[mad24(lx, LDS_STEP, ly + i)],
+                        srcptr + mad24(y + i, src_step, mad24(x, TSIZE, src_offset)));
+    }
+#endif
+ }
+ 
+ #endif // INPLACE
+-- 
+2.34.1
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0107-imgproc-perf-HoughLines-Fix-test-tolerance-and-compa.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0107-imgproc-perf-HoughLines-Fix-test-tolerance-and-compa.patch
new file mode 100644
index 000000000..de128954a
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0107-imgproc-perf-HoughLines-Fix-test-tolerance-and-compa.patch
@@ -0,0 +1,47 @@
+From fa4b11750cfb19ccbe21a2f8d1801ba014e8b401 Mon Sep 17 00:00:00 2001
+From: Samaresh Kumar Singh <ssam3003@gmail.com>
+Date: Wed, 4 Mar 2026 13:13:52 -0600
+Subject: [PATCH 1/2] [imgproc][perf][HoughLines] Fix test tolerance and
+ comparator for cross-backend stability
+Upstream-Status: Submitted [under review]
+---
+ modules/imgproc/perf/opencl/perf_houghlines.cpp | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+diff --git a/modules/imgproc/perf/opencl/perf_houghlines.cpp b/modules/imgproc/perf/opencl/perf_houghlines.cpp
+index 0a5f3ae561..bffd895f2b 100644
+--- a/modules/imgproc/perf/opencl/perf_houghlines.cpp
+++ b/modules/imgproc/perf/opencl/perf_houghlines.cpp
+@@ -19,7 +19,7 @@ struct Vec2fComparator
+ {
+     bool operator()(const Vec2f& a, const Vec2f b) const
+     {
+-        if(a[0] != b[0]) return a[0] < b[0];
+        if(std::abs(a[0] - b[0]) > 1e-3f) return a[0] < b[0];
+         else return a[1] < b[1];
+     }
+ };
+@@ -55,7 +55,10 @@ OCL_PERF_TEST_P(HoughLinesFixture, HoughLines, Combine(OCL_TEST_SIZES,
+     lines.copyTo(result);
+     std::sort(result.begin<Vec2f>(), result.end<Vec2f>(), Vec2fComparator());
+ 
+-    SANITY_CHECK(result, 1e-6);
+    EXPECT_GE((size_t)result.total(), 6u);
+    EXPECT_LT((size_t)result.total(), 50u);
+
+    SANITY_CHECK_NOTHING();
+ }
+ 
+ ///////////// HoughLinesP /////////////////////
+@@ -88,4 +91,4 @@ OCL_PERF_TEST_P(HoughLinesPFixture, HoughLinesP, Combine(Values("cv/shared/pic5.
+ 
+ } } // namespace opencv_test::ocl
+ 
+-#endif // HAVE_OPENCL
+\ No newline at end of file
+#endif // HAVE_OPENCL
+-- 
+2.34.1
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0108-imgproc-perf-HoughLines-Fix-lower-bound-for-line-cou.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0108-imgproc-perf-HoughLines-Fix-lower-bound-for-line-cou.patch
new file mode 100644
index 000000000..bc7013481
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0108-imgproc-perf-HoughLines-Fix-lower-bound-for-line-cou.patch
@@ -0,0 +1,31 @@
+From 2751419022d65b7d9260c87c7806db0f32a1c359 Mon Sep 17 00:00:00 2001
+From: Samaresh Kumar Singh <ssam3003@gmail.com>
+Date: Thu, 5 Mar 2026 19:21:36 -0600
+Subject: [PATCH 2/2] [imgproc][perf][HoughLines] Fix lower bound for line
+ count check
+With thetaStep=0.1 rad, theta=PI/2 is not a sampled accumulator bin, so horizontal lines fall below the vote threshold and are not detected.
+Only the 3 vertical lines (at theta=0, always an exact bin) are reliably found in that case. Lower the EXPECT_GE bound from 6 to 3 to reflect the worst-case guarantee across all thetaStep values and backends.
+Fixes regression introduced in fa4b117.
+Upstream-Status: Submitted [under review]
+---
+ modules/imgproc/perf/opencl/perf_houghlines.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/modules/imgproc/perf/opencl/perf_houghlines.cpp b/modules/imgproc/perf/opencl/perf_houghlines.cpp
+index bffd895f2b..95c61667fc 100644
+--- a/modules/imgproc/perf/opencl/perf_houghlines.cpp
+++ b/modules/imgproc/perf/opencl/perf_houghlines.cpp
+@@ -55,7 +55,7 @@ OCL_PERF_TEST_P(HoughLinesFixture, HoughLines, Combine(OCL_TEST_SIZES,
+     lines.copyTo(result);
+     std::sort(result.begin<Vec2f>(), result.end<Vec2f>(), Vec2fComparator());
+ 
+-    EXPECT_GE((size_t)result.total(), 6u);
+    EXPECT_GE((size_t)result.total(), 3u);
+     EXPECT_LT((size_t)result.total(), 50u);
+ 
+     SANITY_CHECK_NOTHING();
+-- 
+2.34.1
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0109-core-ocl-fix-incorrect-results-for-in-place-flip-on-.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0109-core-ocl-fix-incorrect-results-for-in-place-flip-on-.patch
new file mode 100644
index 000000000..5a6d8891f
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0109-core-ocl-fix-incorrect-results-for-in-place-flip-on-.patch
@@ -0,0 +1,352 @@
+From ba879cd60f505c3239a6bc5c4b8eb6ca87d143c2 Mon Sep 17 00:00:00 2001
+From: jiajia Qian <jiajia.qian@nxp.com>
+Date: Thu, 16 Apr 2026 10:14:05 +0800
+Subject: [PATCH] core/ocl: fix incorrect results for in-place flip on strict
+ OpenCL implementations
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Previously, OpenCL in-place flip kernels (rows/cols/both) could produce
+incorrect results compared to the CPU implementation on strict OpenCL
+drivers such as Mesa. The kernels relied on implicit load–load–store–store
+(LLSS) ordering when src and dst alias, which is not guaranteed by the
+OpenCL memory model and may be reordered.
+Some vendor drivers happened to preserve the expected ordering, masking
+the issue, but Mesa correctly exposes the undefined behavior.
+This change introduces dedicated in-place flip kernels that:
+- Explicitly detect in-place execution (src == dst)
+- Stage data through local memory tiles
+- Enforce correct ordering with work-group barriers
+- Avoid global memory read/write aliasing hazards
+The non in-place path is unchanged.
+With this fix, OpenCL in-place flip produces correct and consistent results
+across drivers, matches CPU behavior, and complies with the OpenCL memory
+model.
+Upstream-Status: Backport [ba879cd60f505c3239a6bc5c4b8eb6ca87d143c2]
+Signed-off-by: jiajia Qian <jiajia.qian@nxp.com>
+---
+ modules/core/src/matrix_transform.cpp |  71 +++++++---
+ modules/core/src/opencl/flip.cl       | 196 ++++++++++++++++++++++++++
+ 2 files changed, 250 insertions(+), 17 deletions(-)
+diff --git a/modules/core/src/matrix_transform.cpp b/modules/core/src/matrix_transform.cpp
+index ce859e8eb8..245cd89843 100644
+--- a/modules/core/src/matrix_transform.cpp
+++ b/modules/core/src/matrix_transform.cpp
+@@ -973,7 +973,12 @@ static bool ocl_flip(InputArray _src, OutputArray _dst, int flipCode )
+     if (cn > 4)
+         return false;
+ 
+-    const char * kernelName;
+    Size size = _src.size();
+    _dst.create(size, type);
+    UMat src = _src.getUMat(), dst = _dst.getUMat();
+    bool inplace = (dst.u == src.u);
+
+    String kernelName;
+     if (flipCode == 0)
+         kernelName = "arithm_flip_rows", flipType = FLIP_ROWS;
+     else if (flipCode > 0)
+@@ -981,33 +986,65 @@ static bool ocl_flip(InputArray _src, OutputArray _dst, int flipCode )
+     else
+         kernelName = "arithm_flip_rows_cols", flipType = FLIP_BOTH;
+ 
+    if(inplace)
+        kernelName += "_inplace";
+
+     int pxPerWIy = (dev.isIntel() && (dev.type() & ocl::Device::TYPE_GPU)) ? 4 : 1;
+     kercn = (cn!=3 || flipType == FLIP_ROWS) ? std::max(kercn, cn) : cn;
+    const int TILE_SIZE = 32, BLOCK_ROWS = 8;
+ 
+-    ocl::Kernel k(kernelName, ocl::core::flip_oclsrc,
+-        format( "-D T=%s -D T1=%s -D DEPTH=%d -D cn=%d -D PIX_PER_WI_Y=%d -D kercn=%d",
+    ocl::Kernel k(kernelName.c_str(), ocl::core::flip_oclsrc,
+                format( "-D T=%s -D T1=%s -D DEPTH=%d -D cn=%d -D PIX_PER_WI_Y=%d -D kercn=%d -D TILE_SIZE=%d -D BLOCK_ROWS=%d%s",
+                 kercn != cn ? ocl::typeToStr(CV_MAKE_TYPE(depth, kercn)) : ocl::vecopTypeToStr(CV_MAKE_TYPE(depth, kercn)),
+-                kercn != cn ? ocl::typeToStr(depth) : ocl::vecopTypeToStr(depth), depth, cn, pxPerWIy, kercn));
+                kercn != cn ? ocl::typeToStr(depth) : ocl::vecopTypeToStr(depth), depth, cn, pxPerWIy, kercn, TILE_SIZE, BLOCK_ROWS,
+                inplace ? " -D INPLACE" : ""));
+     if (k.empty())
+         return false;
+ 
+-    Size size = _src.size();
+-    _dst.create(size, type);
+-    UMat src = _src.getUMat(), dst = _dst.getUMat();
+-
+     int cols = size.width * cn / kercn, rows = size.height;
+-    cols = flipType == FLIP_COLS ? (cols + 1) >> 1 : cols;
+-    rows = flipType & FLIP_ROWS ? (rows + 1) >> 1 : rows;
+    int work_cols = flipType == FLIP_COLS ? (cols + 1) >> 1 : cols;
+    int work_rows = flipType & FLIP_ROWS ? (rows + 1) >> 1 : rows;
+
+    if (inplace)
+    {
+        k.args(ocl::KernelArg::ReadWriteNoSize(dst), rows, cols);
+
+        int gs_cols, gs_rows;
+        if (flipType == FLIP_COLS)
+        {
+            gs_cols = work_cols;
+            gs_rows = rows;
+        }
+        else if (flipType == FLIP_ROWS)
+        {
+            gs_cols = cols;
+            gs_rows = work_rows;
+        }
+        else // FLIP_BOTH
+        {
+            gs_cols = cols;
+            gs_rows = rows;
+        }
+ 
+-    k.args(ocl::KernelArg::ReadOnlyNoSize(src),
+-           ocl::KernelArg::WriteOnly(dst, cn, kercn), rows, cols);
+        size_t globalsize[2] = {
+            (size_t)divUp(gs_cols, TILE_SIZE) * TILE_SIZE,
+            (size_t)divUp(gs_rows, TILE_SIZE) * BLOCK_ROWS
+        };
+        size_t localsize[2] = { TILE_SIZE, BLOCK_ROWS };
+        return k.run(2, globalsize, localsize, false);
+    }
+    else
+    {
+        k.args(ocl::KernelArg::ReadOnlyNoSize(src),
+           ocl::KernelArg::WriteOnly(dst, cn, kercn), work_rows, work_cols);
+ 
+-    size_t maxWorkGroupSize = dev.maxWorkGroupSize();
+-    CV_Assert(maxWorkGroupSize % 4 == 0);
+        size_t maxWorkGroupSize = dev.maxWorkGroupSize();
+        CV_Assert(maxWorkGroupSize % 4 == 0);
+ 
+-    size_t globalsize[2] = { (size_t)cols, ((size_t)rows + pxPerWIy - 1) / pxPerWIy },
+-            localsize[2] = { maxWorkGroupSize / 4, 4 };
+-    return k.run(2, globalsize, (flipType == FLIP_COLS) && !dev.isIntel() ? localsize : NULL, false);
+        size_t globalsize[2] = { (size_t)work_cols, ((size_t)work_rows + pxPerWIy - 1) / pxPerWIy };
+        size_t localsize[2]  = { maxWorkGroupSize / 4, 4 };
+        return k.run(2, globalsize, (flipType == FLIP_COLS) && !dev.isIntel() ? localsize : NULL, false);
+    }
+ }
+ 
+ #endif
+diff --git a/modules/core/src/opencl/flip.cl b/modules/core/src/opencl/flip.cl
+index afd14e4e1f..dbe23c73a4 100644
+--- a/modules/core/src/opencl/flip.cl
+++ b/modules/core/src/opencl/flip.cl
+@@ -63,6 +63,9 @@
+ #endif
+ #define TSIZE ((int)sizeof(T1)*3)
+ #endif
+#define LDS_STEP (TILE_SIZE + 1)
+
+#ifndef INPLACE
+ 
+ __kernel void arithm_flip_rows(__global const uchar * srcptr, int src_step, int src_offset,
+                                __global uchar * dstptr, int dst_step, int dst_offset,
+@@ -183,3 +186,196 @@ __kernel void arithm_flip_cols(__global const uchar * srcptr, int src_step, int
+         }
+     }
+ }
+
+#else
+
+__kernel void arithm_flip_rows_inplace(__global uchar * srcptr, int src_step, int src_offset,
+                                       int rows, int cols)
+{
+    int gp_x = get_group_id(0);
+    int gp_y = get_group_id(1);
+    int lx = get_local_id(0);
+    int ly = get_local_id(1);
+
+    __local T tile_top[TILE_SIZE * LDS_STEP];
+    __local T tile_bottom[TILE_SIZE * LDS_STEP];
+
+    int half_rows = (rows + 1) / 2;
+
+    int x = gp_x * TILE_SIZE + lx;
+    int y_top = gp_y * TILE_SIZE + ly;
+    int y_bottom = rows - 1 - y_top;
+
+    #pragma unroll
+    for (int i = 0; i < TILE_SIZE; i += BLOCK_ROWS)
+    {
+        if (x < cols && y_top + i < half_rows)
+        {
+            int curr_y_top = y_top + i;
+            int curr_y_bottom = rows - 1 - curr_y_top;
+
+            T val_top = loadpix(srcptr + mad24(curr_y_top, src_step, mad24(x, TSIZE, src_offset)));
+            T val_bottom = loadpix(srcptr + mad24(curr_y_bottom, src_step, mad24(x, TSIZE, src_offset)));
+
+            tile_top[mad24(ly + i, LDS_STEP, lx)] = val_top;
+            tile_bottom[mad24(ly + i, LDS_STEP, lx)] = val_bottom;
+        }
+    }
+    barrier(CLK_LOCAL_MEM_FENCE);
+
+    #pragma unroll
+    for (int i = 0; i < TILE_SIZE; i += BLOCK_ROWS)
+    {
+        if (x < cols && y_top + i < half_rows)
+        {
+            int curr_y_top = y_top + i;
+            int curr_y_bottom = rows - 1 - curr_y_top;
+
+            storepix(tile_bottom[mad24(ly + i, LDS_STEP, lx)],
+                    srcptr + mad24(curr_y_top, src_step, mad24(x, TSIZE, src_offset)));
+
+            if (curr_y_top != curr_y_bottom)
+            {
+                storepix(tile_top[mad24(ly + i, LDS_STEP, lx)],
+                        srcptr + mad24(curr_y_bottom, src_step, mad24(x, TSIZE, src_offset)));
+            }
+        }
+    }
+}
+
+__kernel void arithm_flip_rows_cols_inplace(__global uchar * srcptr, int src_step, int src_offset,
+                                            int rows, int cols)
+{
+    int gp_x = get_group_id(0);
+    int gp_y = get_group_id(1);
+    int lx = get_local_id(0);
+    int ly = get_local_id(1);
+
+    __local T tile_first[TILE_SIZE * LDS_STEP];
+    __local T tile_second[TILE_SIZE * LDS_STEP];
+
+    int total_pixels = rows * cols;
+    int half_pixels = (total_pixels + 1) / 2;
+
+    int x_first = gp_x * TILE_SIZE + lx;
+    int y_first = gp_y * TILE_SIZE + ly;
+
+    int x_second = cols - 1 - x_first;
+    int y_second = rows - 1 - y_first;
+
+    #pragma unroll
+    for (int i = 0; i < TILE_SIZE; i += BLOCK_ROWS)
+    {
+        int curr_y_first = y_first + i;
+        int curr_y_second = rows - 1 - curr_y_first;
+        int linear_idx = curr_y_first * cols + x_first;
+
+        if (x_first < cols && curr_y_first < rows && linear_idx < half_pixels)
+        {
+            T val_first = loadpix(srcptr + mad24(curr_y_first, src_step, mad24(x_first, TSIZE, src_offset)));
+            T val_second = loadpix(srcptr + mad24(curr_y_second, src_step, mad24(x_second, TSIZE, src_offset)));
+
+#if kercn == 2
+#if cn == 1
+            val_first = val_first.s10;
+            val_second = val_second.s10;
+#endif
+#elif kercn == 4
+#if cn == 1
+            val_first = val_first.s3210;
+            val_second = val_second.s3210;
+#elif cn == 2
+            val_first = val_first.s2301;
+            val_second = val_second.s2301;
+#endif
+#endif
+            tile_first[mad24(ly + i, LDS_STEP, lx)] = val_first;
+            tile_second[mad24(ly + i, LDS_STEP, lx)] = val_second;
+        }
+    }
+    barrier(CLK_LOCAL_MEM_FENCE);
+
+    #pragma unroll
+    for (int i = 0; i < TILE_SIZE; i += BLOCK_ROWS)
+    {
+        int curr_y_first = y_first + i;
+        int curr_y_second = rows - 1 - curr_y_first;
+        int linear_idx = curr_y_first * cols + x_first;
+
+        if (x_first < cols && curr_y_first < rows && linear_idx < half_pixels)
+        {
+            storepix(tile_second[mad24(ly + i, LDS_STEP, lx)],
+                    srcptr + mad24(curr_y_first, src_step, mad24(x_first, TSIZE, src_offset)));
+
+            if (linear_idx != total_pixels - 1 - linear_idx)
+            {
+                storepix(tile_first[mad24(ly + i, LDS_STEP, lx)],
+                        srcptr + mad24(curr_y_second, src_step, mad24(x_second, TSIZE, src_offset)));
+            }
+        }
+    }
+}
+
+__kernel void arithm_flip_cols_inplace(__global uchar * srcptr, int src_step, int src_offset,
+                                       int rows, int cols)
+{
+    int gp_x = get_group_id(0);
+    int gp_y = get_group_id(1);
+    int lx = get_local_id(0);
+    int ly = get_local_id(1);
+
+    __local T tile_left[TILE_SIZE * LDS_STEP];
+    __local T tile_right[TILE_SIZE * LDS_STEP];
+
+    int half_cols = (cols + 1) / 2;
+
+    int x_left = gp_x * TILE_SIZE + lx;
+    int y = gp_y * TILE_SIZE + ly;
+    int x_right = cols - 1 - x_left;
+
+    #pragma unroll
+    for (int i = 0; i < TILE_SIZE; i += BLOCK_ROWS)
+    {
+        if (y + i < rows && x_left < half_cols)
+        {
+            T val_left = loadpix(srcptr + mad24(y + i, src_step, mad24(x_left, TSIZE, src_offset)));
+            T val_right = loadpix(srcptr + mad24(y + i, src_step, mad24(x_right, TSIZE, src_offset)));
+
+#if kercn == 2
+#if cn == 1
+            val_left = val_left.s10;
+            val_right = val_right.s10;
+#endif
+#elif kercn == 4
+#if cn == 1
+            val_left = val_left.s3210;
+            val_right = val_right.s3210;
+#elif cn == 2
+            val_left = val_left.s2301;
+            val_right = val_right.s2301;
+#endif
+#endif
+            tile_left[mad24(ly + i, LDS_STEP, lx)] = val_left;
+            tile_right[mad24(ly + i, LDS_STEP, lx)] = val_right;
+        }
+    }
+    barrier(CLK_LOCAL_MEM_FENCE);
+
+    #pragma unroll
+    for (int i = 0; i < TILE_SIZE; i += BLOCK_ROWS)
+    {
+        if (y + i < rows && x_left < half_cols)
+        {
+            storepix(tile_right[mad24(ly + i, LDS_STEP, lx)],
+                    srcptr + mad24(y + i, src_step, mad24(x_left, TSIZE, src_offset)));
+
+            if (x_left != x_right)
+            {
+                storepix(tile_left[mad24(ly + i, LDS_STEP, lx)],
+                        srcptr + mad24(y + i, src_step, mad24(x_right, TSIZE, src_offset)));
+            }
+        }
+    }
+}
+
+#endif // INPLACE
+\ No newline at end of file
+-- 
+2.34.1
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/27691.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/27691.patch
new file mode 100644
index 000000000..c8c23c93a
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/27691.patch
@@ -0,0 +1,44 @@
+From 90c444abd387ffa70b2e72a34922903a2f0f4f5a Mon Sep 17 00:00:00 2001
+From: Alexander Smorkalov <alexander.smorkalov@opencv.ai>
+Date: Wed, 20 Aug 2025 10:53:51 +0300
+Subject: [PATCH] FFmpeg 8.0 support.
+Upstream-Status: Backport [https://github.com/opencv/opencv/commit/86df53155411b3ade57d0213bf8dd63006bf248f]
+---
+ modules/videoio/src/cap_ffmpeg_impl.hpp | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+diff --git a/modules/videoio/src/cap_ffmpeg_impl.hpp b/modules/videoio/src/cap_ffmpeg_impl.hpp
+index 489dbe565d3d..5780b4c11361 100644
+--- a/modules/videoio/src/cap_ffmpeg_impl.hpp
+++ b/modules/videoio/src/cap_ffmpeg_impl.hpp
+@@ -685,7 +685,10 @@ void CvCapture_FFMPEG::close()
+     if( video_st )
+     {
+ #ifdef CV_FFMPEG_CODECPAR
+// avcodec_close removed in FFmpeg release 8.0
+# if (LIBAVCODEC_BUILD < CALC_FFMPEG_VERSION(62, 11, 100))
+         avcodec_close( context );
+# endif
+ #endif
+         video_st = NULL;
+     }
+@@ -2005,7 +2008,18 @@ void CvCapture_FFMPEG::get_rotation_angle()
+     rotation_angle = 0;
+ #if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(57, 68, 100)
+     const uint8_t *data = 0;
+    // av_stream_get_side_data removed in FFmpeg release 8.0
+# if (LIBAVCODEC_BUILD < CALC_FFMPEG_VERSION(62, 11, 100))
+     data = av_stream_get_side_data(video_st, AV_PKT_DATA_DISPLAYMATRIX, NULL);
+# else
+    AVPacketSideData* sd = video_st->codecpar->coded_side_data;
+    int nb_sd = video_st->codecpar->nb_coded_side_data;
+    if (sd && nb_sd > 0)
+    {
+        const AVPacketSideData* mtx = av_packet_side_data_get(sd,  nb_sd, AV_PKT_DATA_DISPLAYMATRIX);
+        data = mtx->data;
+    }
+# endif
+     if (data)
+     {
+         rotation_angle = -cvRound(av_display_rotation_get((const int32_t*)data));
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/OpenCV_DNN_examples.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/OpenCV_DNN_examples.patch
index ef7831a5f..9aee21c4d 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/OpenCV_DNN_examples.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/OpenCV_DNN_examples.patch
@@ -1,17 +1,19 @@
-From 3c4daafb54f961e376104a461ca7ec114ff0331a Mon Sep 17 00:00:00 2001
+From c0e12bef26b4e4f10eb541c26f7fd7400addb67e Mon Sep 17 00:00:00 2001
 From: Ludek Slosarcik <ludek.slosarcik@nxp.com>
 Date: Fri, 14 Feb 2020 15:46:50 +0100
-Subject: [PATCH] opencv_dnn: added video device for 2 examples, and change text labels
+Subject: [PATCH] opencv_dnn: added video device for 2 examples, and change
+ text labels
 Signed-off-by: Ludek Slosarcik <ludek.slosarcik@nxp.com>
 Upstream-Status: Pending
 ---
 samples/cpp/logistic_regression.cpp |  2 +-
- samples/dnn/classification.cpp      |  7 ++++---
+ samples/dnn/classification.cpp      |  9 +++++----
 samples/dnn/object_detection.cpp    | 10 +++++-----
 samples/dnn/segmentation.cpp        |  2 +-
- samples/dnn/text_detection.cpp      |  5 +++--
+ samples/dnn/text_detection.cpp      |  3 ++-
 5 files changed, 14 insertions(+), 12 deletions(-)
 Index: git/samples/cpp/logistic_regression.cpp
@@ -128,8 +130,8 @@ Index: git/samples/dnn/text_detection.cpp
     "{ input i              | | Path to input image or video file. Skip this argument to capture frames from a camera.}"
 +    "{ device               | 0 | camera device number. }"
     "{ detModel dmp         | | Path to a binary .pb file contains trained detector network.}"
-     "{ width                | 320 | Preprocess input image by resizing to a specific width. It should be multiple by 32. }"
+     "{ width                | 320 | Preprocess input image by resizing to a specific width. It should be a multiple of 32. }"
-     "{ height               | 320 | Preprocess input image by resizing to a specific height. It should be multiple by 32. }"
+     "{ height               | 320 | Preprocess input image by resizing to a specific height. It should be a multiple of 32. }"
 @@ -106,7 +107,7 @@ int main(int argc, char** argv)
 
     // Open a video file or an image file or a camera stream.
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/fix-build-with-protobuf-v22.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/fix-build-with-protobuf-v22.patch
index 3538f24b3..265d723c6 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/fix-build-with-protobuf-v22.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/fix-build-with-protobuf-v22.patch
@@ -1,19 +1,60 @@
-From 5e4150826fea6f37276f348c65d94ce4847d1211 Mon Sep 17 00:00:00 2001
+From 75f7475fcfb35cbe4d8f5ccf5c4ac8bc78f2dc30 Mon Sep 17 00:00:00 2001
 From: Kumataro <Kumataro@users.noreply.github.com>
-Date: Sat, 7 Oct 2023 10:11:25 +0900
+Date: Thu, 19 Oct 2023 14:45:08 +0900
-Subject: [PATCH] 3rdparty: supporting protobuf v22 and later
+Subject: [PATCH] Merge pull request #24372 from Kumataro:fix24369
-Upstream-Status: Submitted [https://github.com/opencv/opencv/pull/24372]
+Supporting protobuf v22 and later(with abseil-cpp/C++17) #24372
+fix https://github.com/opencv/opencv/issues/24369
+related https://github.com/opencv/opencv/issues/23791
+1. This patch supports external protobuf v22 and later, it required abseil-cpp and c++17.
+    Even if the built-in protobuf is upgraded to v22 or later,
+    the dependency on abseil-cpp and the requirement for C++17 will continue.
+2. Some test for caffe required patched protobuf, so this patch disable them.
+This patch is tested by following libraries.
+-  Protobuf:                    /usr/local/lib/libprotobuf.so (4.24.4)
+-  abseil-cpp:                YES (20230125)
+See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request
+- [x] I agree to contribute to the project under Apache 2 License.
+- [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
+- [x] The PR is proposed to the proper branch
+- [x] There is a reference to the original bug report and related work
+- [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
+      Patch to opencv_extra has the same branch name.
+- [x] The feature is well documented and sample code can be built with the project CMake
+Upstream-Status: Backport [https://github.com/opencv/opencv/commit/6e4280ea81b59c6dca45bb9801b758377beead55]
 ---
- cmake/OpenCVFindProtobuf.cmake | 37 ++++++++++++++++++++++++++++++++++
+ cmake/OpenCVFindProtobuf.cmake   | 35 +++++++++++++++++++++++++++-----
- modules/dnn/CMakeLists.txt     |  9 +++++++++
+ modules/dnn/CMakeLists.txt       |  6 ++++++
- 2 files changed, 46 insertions(+)
+ modules/dnn/test/test_layers.cpp | 24 ++++++++++++++++++----
+ 3 files changed, 56 insertions(+), 9 deletions(-)
 diff --git a/cmake/OpenCVFindProtobuf.cmake b/cmake/OpenCVFindProtobuf.cmake
-index 8835347d1d..9bd5c28db8 100644
+index 8835347d1d..5b1e17529f 100644
 --- a/cmake/OpenCVFindProtobuf.cmake
 +++ b/cmake/OpenCVFindProtobuf.cmake
-@@ -67,6 +67,38 @@ else()
+@@ -30,8 +30,14 @@ if(BUILD_PROTOBUF)
+   set(Protobuf_LIBRARIES "libprotobuf")
+   set(HAVE_PROTOBUF TRUE)
+ else()
+  # we still need this for command PROTOBUF_GENERATE_CPP.
+  set(protobuf_MODULE_COMPATIBLE ON)
+
+   unset(Protobuf_VERSION CACHE)
+-  find_package(Protobuf QUIET)
+  find_package(Protobuf QUIET CONFIG)
+  if(NOT Protobuf_FOUND)
+    find_package(Protobuf QUIET)
+  endif()
+ 
+   # Backwards compatibility
+   # Define camel case versions of input variables
+@@ -67,6 +73,20 @@ else()
   endif()
 endif()
 
@@ -21,82 +62,49 @@ index 8835347d1d..9bd5c28db8 100644
 +# In Protocol Buffers v22.0 and later drops C++11 support and depends abseil-cpp.
 +#   Details: https://protobuf.dev/news/2022-08-03/
 +# And if std::text_view is in abseil-cpp requests C++17 and later.
-+if(HAVE_PROTOBUF)
-+    if("${Protobuf_VERSION}" MATCHES [[[0-9]+.([0-9]+).[0-9]+]])
-+        string(COMPARE GREATER_EQUAL "${CMAKE_MATCH_1}" "22" REQUEST_ABSL)
-+
-+        if(REQUEST_ABSL)
-+            string(COMPARE GREATER_EQUAL "${CMAKE_CXX_STANDARD}" "17" USED_AFTER_CXX17)
-+            if(NOT USED_AFTER_CXX17)
-+                message("CMAKE_CXX_STANDARD : ${CMAKE_CXX_STANDARD}")
-+                message("protobuf           : ${Protobuf_VERSION}")
-+                message(FATAL_ERROR "protobuf(v22 and later) and abseil-cpp request CMAKE_CXX_STANDARD=17 and later.")
-+            endif()
-+
-+            ocv_check_modules(ABSL_STRINGS absl_strings)
-+            if(NOT ABSL_STRINGS_FOUND)
-+                message(FATAL_ERROR "protobuf(v22 and later) requests abseil-cpp(strings), but missing.")
-+            endif()
 +
-+            ocv_check_modules(ABSL_LOG absl_log)
+if(HAVE_PROTOBUF)
-+            if(NOT ABSL_LOG_FOUND)
+  if(NOT (Protobuf_VERSION VERSION_LESS 22))
-+                message(FATAL_ERROR "protobuf(v22 and later) requests abseil-cpp(log), but missing.")
+    if((CMAKE_CXX_STANDARD EQUAL 98) OR (CMAKE_CXX_STANDARD LESS 17))
-+            endif()
+      message(STATUS "CMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} is too old to support protobuf(${Protobuf_VERSION}) and/or abseil-cpp. Use C++17 or later. Turning HAVE_PROTOBUF off")
-+
+      set(HAVE_PROTOBUF FALSE)
-+        endif()
-+    else()
-+        message(FATAL_ERROR "Protobuf version(${Protobuf_VERSION}) is unexpected to split.")
 +    endif()
+  endif()
 +endif()
 +
 if(HAVE_PROTOBUF AND PROTOBUF_UPDATE_FILES AND NOT COMMAND PROTOBUF_GENERATE_CPP)
   message(FATAL_ERROR "Can't configure protobuf dependency (BUILD_PROTOBUF=${BUILD_PROTOBUF} PROTOBUF_UPDATE_FILES=${PROTOBUF_UPDATE_FILES})")
 endif()
-@@ -89,3 +121,8 @@ if(HAVE_PROTOBUF)
+@@ -74,15 +94,20 @@ endif()
-     BUILD_PROTOBUF THEN "build (${Protobuf_VERSION})"
+ if(HAVE_PROTOBUF)
-     ELSE "${__location} (${Protobuf_VERSION})")
+   list(APPEND CUSTOM_STATUS protobuf)
- endif()
+   if(NOT BUILD_PROTOBUF)
-+
+    unset( __location)
-+if(HAVE_ABSL_STRINGS AND HAVE_ABSL_LOG)
+     if(TARGET "${Protobuf_LIBRARIES}")
-+  list(APPEND CUSTOM_STATUS absl)
+       get_target_property(__location "${Protobuf_LIBRARIES}" IMPORTED_LOCATION_RELEASE)
-+  list(APPEND CUSTOM_STATUS_absl "      abseil-cpp:" "YES (${ABSL_STRINGS_VERSION})" )
+       if(NOT __location)
-+endif()
+         get_target_property(__location "${Protobuf_LIBRARIES}" IMPORTED_LOCATION)
-diff --git a/modules/dnn/CMakeLists.txt b/modules/dnn/CMakeLists.txt
+       endif()
-index 804b78ead2..d32007b37e 100644
+-    elseif(Protobuf_LIBRARY)
--- a/modules/dnn/CMakeLists.txt
+-      set(__location "${Protobuf_LIBRARY}")
-+++ b/modules/dnn/CMakeLists.txt
+-    else()
-@@ -149,6 +149,15 @@ if(NOT BUILD_PROTOBUF)
+-      set(__location "${Protobuf_LIBRARIES}")
-   list(APPEND include_dirs ${Protobuf_INCLUDE_DIRS})
+    endif()
- endif()
- 
-+if(HAVE_ABSL_STRINGS)
-+  list(APPEND libs ${ABSL_STRINGS_LIBRARIES})
-+  list(APPEND include_dirs ${ABSL_STRTRINGS_INCLUDE_DIRS})
-+endif()
-+if(HAVE_ABSL_LOG)
-+  list(APPEND libs ${ABSL_LOG_LIBRARIES})
-+  list(APPEND include_dirs ${ABSL_LOG_INCLUDE_DIRS})
-+endif()
 +
- set(sources_options "")
+    if(NOT __location)
- 
+      if(Protobuf_LIBRARY)
- list(APPEND libs ${LAPACK_LIBRARIES})
+        set(__location "${Protobuf_LIBRARY}")
-From 06a7669521d205f647d3e718322ccd153cdbbb77 Mon Sep 17 00:00:00 2001
+      else()
-From: Kumataro <Kumataro@users.noreply.github.com>
+        set(__location "${Protobuf_LIBRARIES}")
-Date: Sun, 8 Oct 2023 09:39:35 +0900
+      endif()
-Subject: [PATCH] dnn: disable some tests for external protobuf
+     endif()
+   endif()
---
+   list(APPEND CUSTOM_STATUS_protobuf "    Protobuf:"
- modules/dnn/CMakeLists.txt         |  5 +++++
- modules/dnn/src/caffe/caffe_io.cpp | 24 ++++++++++++++++++++++--
- modules/dnn/test/test_layers.cpp   | 16 ++++++++++++++++
- 3 files changed, 43 insertions(+), 2 deletions(-)
 diff --git a/modules/dnn/CMakeLists.txt b/modules/dnn/CMakeLists.txt
-index d32007b37e..face38465f 100644
+index 804b78ead2..9fcc460909 100644
 --- a/modules/dnn/CMakeLists.txt
 +++ b/modules/dnn/CMakeLists.txt
-@@ -254,6 +254,12 @@ ocv_create_module(${libs} ${dnn_runtime_libs})
+@@ -245,6 +245,12 @@ ocv_create_module(${libs} ${dnn_runtime_libs})
 ocv_add_samples()
 ocv_add_accuracy_tests(${dnn_runtime_libs})
 
@@ -109,211 +117,13 @@ index d32007b37e..face38465f 100644
 set(perf_path "${CMAKE_CURRENT_LIST_DIR}/perf")
 file(GLOB_RECURSE perf_srcs "${perf_path}/*.cpp")
 file(GLOB_RECURSE perf_hdrs "${perf_path}/*.hpp" "${perf_path}/*.h")
-diff --git a/modules/dnn/src/caffe/caffe_io.cpp b/modules/dnn/src/caffe/caffe_io.cpp
-index ebecf95eea..ebceca84cf 100644
--- a/modules/dnn/src/caffe/caffe_io.cpp
-+++ b/modules/dnn/src/caffe/caffe_io.cpp
-@@ -1130,7 +1130,17 @@ bool ReadProtoFromTextFile(const char* filename, Message* proto) {
-     parser.AllowUnknownField(true);
-     parser.SetRecursionLimit(1000);
- #endif
-    return parser.Parse(&input, proto);
-+    const bool ret = parser.Parse(&input, proto);
-+
-+#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF
-+    if(!ret)
-+    {
-+        LOG(ERROR) << "Some data requires patched protobuf (available in OpenCV source tree only).";
-+        CV_Error_(Error::StsError,("Some data requires patched protobuf (available in OpenCV source tree only)."));
-+    }
-+#endif
-+
-+    return ret;
- }
- 
- bool ReadProtoFromBinaryFile(const char* filename, Message* proto) {
-@@ -1148,7 +1158,17 @@ bool ReadProtoFromTextBuffer(const char* data, size_t len, Message* proto) {
-     parser.AllowUnknownField(true);
-     parser.SetRecursionLimit(1000);
- #endif
-    return parser.Parse(&input, proto);
-+    const bool ret = parser.Parse(&input, proto);
-+
-+#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF
-+    if(!ret)
-+    {
-+        LOG(ERROR) << "Some data requires patched protobuf (available in OpenCV source tree only).";
-+        CV_Error_(Error::StsError,("Some data requires patched protobuf (available in OpenCV source tree only)."));
-+    }
-+#endif
-+
-+    return ret;
- }
- 
- 
 diff --git a/modules/dnn/test/test_layers.cpp b/modules/dnn/test/test_layers.cpp
-index 763d94b99c..a07d442d76 100644
+index 763d94b99c..6cb6d54b3f 100644
 --- a/modules/dnn/test/test_layers.cpp
 +++ b/modules/dnn/test/test_layers.cpp
-@@ -754,7 +754,11 @@ TEST_F(Layer_RNN_Test, get_set_test)
+@@ -756,11 +756,15 @@ TEST_F(Layer_RNN_Test, get_set_test)
-     EXPECT_EQ(shape(outputs[1]), shape(nT, nS, nH));
- }
 
-+#ifndef OPENCV_DNN_EXTERNAL_PROTOBUF
 TEST_P(Test_Caffe_layers, Accum)
-+#else
-+TEST_P(Test_Caffe_layers, DISABLED_Accum)  // requires patched protobuf (available in OpenCV source tree only)
-+#endif
- {
-     if (backend == DNN_BACKEND_OPENCV && target != DNN_TARGET_CPU)
-         applyTestTag(CV_TEST_TAG_DNN_SKIP_OPENCL, CV_TEST_TAG_DNN_SKIP_OPENCL_FP16);
-@@ -778,7 +782,11 @@ TEST_P(Test_Caffe_layers, ChannelNorm)
-     testLayerUsingCaffeModels("channel_norm", false, false);
- }
- 
-+#ifndef OPENCV_DNN_EXTERNAL_PROTOBUF
- TEST_P(Test_Caffe_layers, DataAugmentation)
-+#else
-+TEST_P(Test_Caffe_layers, DISABLED_DataAugmentation)  // requires patched protobuf (available in OpenCV source tree only)
-+#endif
- {
-     if (backend == DNN_BACKEND_OPENCV && target == DNN_TARGET_OPENCL_FP16)
-         applyTestTag(CV_TEST_TAG_DNN_SKIP_OPENCL_FP16);
-@@ -787,7 +795,11 @@ TEST_P(Test_Caffe_layers, DataAugmentation)
-     testLayerUsingCaffeModels("data_augmentation_8x6", true, false);
- }
- 
-+#ifndef OPENCV_DNN_EXTERNAL_PROTOBUF
- TEST_P(Test_Caffe_layers, Resample)
-+#else
-+TEST_P(Test_Caffe_layers, DISABLED_Resample)  // requires patched protobuf (available in OpenCV source tree only)
-+#endif
- {
-     if (backend != DNN_BACKEND_OPENCV)
-         applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_NN_BUILDER, CV_TEST_TAG_DNN_SKIP_IE_NGRAPH);
-@@ -795,7 +807,11 @@ TEST_P(Test_Caffe_layers, Resample)
-     testLayerUsingCaffeModels("nearest", false, false);
- }
- 
-+#ifndef OPENCV_DNN_EXTERNAL_PROTOBUF
- TEST_P(Test_Caffe_layers, Correlation)
-+#else
-+TEST_P(Test_Caffe_layers, DISABLED_Correlation)  // requires patched protobuf (available in OpenCV source tree only)
-+#endif
- {
-     if (backend == DNN_BACKEND_OPENCV && target == DNN_TARGET_OPENCL_FP16)
-         applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_NGRAPH, CV_TEST_TAG_DNN_SKIP_IE_NN_BUILDER,
-From 2c33798f41942aefc203183d673ce4846f32dba4 Mon Sep 17 00:00:00 2001
-From: Kumataro <Kumataro@users.noreply.github.com>
-Date: Sun, 8 Oct 2023 13:28:40 +0900
-Subject: [PATCH] use GREATER instead of GREATER_EQUAL and remove new blank
- line at EOF
---
- cmake/OpenCVFindProtobuf.cmake | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-diff --git a/cmake/OpenCVFindProtobuf.cmake b/cmake/OpenCVFindProtobuf.cmake
-index 9bd5c28db8..ba147526d6 100644
--- a/cmake/OpenCVFindProtobuf.cmake
-+++ b/cmake/OpenCVFindProtobuf.cmake
-@@ -71,12 +71,14 @@ endif()
- # In Protocol Buffers v22.0 and later drops C++11 support and depends abseil-cpp.
- #   Details: https://protobuf.dev/news/2022-08-03/
- # And if std::text_view is in abseil-cpp requests C++17 and later.
-+
- if(HAVE_PROTOBUF)
-     if("${Protobuf_VERSION}" MATCHES [[[0-9]+.([0-9]+).[0-9]+]])
-        string(COMPARE GREATER_EQUAL "${CMAKE_MATCH_1}" "22" REQUEST_ABSL)
-+        string(COMPARE GREATER "${CMAKE_MATCH_1}" "21" REQUEST_ABSL)  # >=22
- 
-         if(REQUEST_ABSL)
-            string(COMPARE GREATER_EQUAL "${CMAKE_CXX_STANDARD}" "17" USED_AFTER_CXX17)
-+            string(COMPARE GREATER "${CMAKE_CXX_STANDARD}" "16" USED_AFTER_CXX17)  # >=17
-+
-             if(NOT USED_AFTER_CXX17)
-                 message("CMAKE_CXX_STANDARD : ${CMAKE_CXX_STANDARD}")
-                 message("protobuf           : ${Protobuf_VERSION}")
-From cd709eefbeedd116bf3495b42280323b932791ff Mon Sep 17 00:00:00 2001
-From: Kumataro <Kumataro@users.noreply.github.com>
-Date: Mon, 9 Oct 2023 21:51:04 +0900
-Subject: [PATCH] fix for review
---
- cmake/OpenCVFindProtobuf.cmake     |  5 ----
- modules/dnn/src/caffe/caffe_io.cpp | 24 ++----------------
- modules/dnn/test/test_layers.cpp   | 40 +++++++++++++++---------------
- 3 files changed, 22 insertions(+), 47 deletions(-)
-diff --git a/cmake/OpenCVFindProtobuf.cmake b/cmake/OpenCVFindProtobuf.cmake
-index ba147526d6..2faf1010bf 100644
--- a/cmake/OpenCVFindProtobuf.cmake
-+++ b/cmake/OpenCVFindProtobuf.cmake
-@@ -123,8 +123,3 @@ if(HAVE_PROTOBUF)
-     BUILD_PROTOBUF THEN "build (${Protobuf_VERSION})"
-     ELSE "${__location} (${Protobuf_VERSION})")
- endif()
-
-if(HAVE_ABSL_STRINGS AND HAVE_ABSL_LOG)
-  list(APPEND CUSTOM_STATUS absl)
-  list(APPEND CUSTOM_STATUS_absl "      abseil-cpp:" "YES (${ABSL_STRINGS_VERSION})" )
-endif()
-diff --git a/modules/dnn/src/caffe/caffe_io.cpp b/modules/dnn/src/caffe/caffe_io.cpp
-index ebceca84cf..ebecf95eea 100644
--- a/modules/dnn/src/caffe/caffe_io.cpp
-+++ b/modules/dnn/src/caffe/caffe_io.cpp
-@@ -1130,17 +1130,7 @@ bool ReadProtoFromTextFile(const char* filename, Message* proto) {
-     parser.AllowUnknownField(true);
-     parser.SetRecursionLimit(1000);
- #endif
-    const bool ret = parser.Parse(&input, proto);
-
-#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF
-    if(!ret)
-    {
-        LOG(ERROR) << "Some data requires patched protobuf (available in OpenCV source tree only).";
-        CV_Error_(Error::StsError,("Some data requires patched protobuf (available in OpenCV source tree only)."));
-    }
-#endif
-
-    return ret;
-+    return parser.Parse(&input, proto);
- }
- 
- bool ReadProtoFromBinaryFile(const char* filename, Message* proto) {
-@@ -1158,17 +1148,7 @@ bool ReadProtoFromTextBuffer(const char* data, size_t len, Message* proto) {
-     parser.AllowUnknownField(true);
-     parser.SetRecursionLimit(1000);
- #endif
-    const bool ret = parser.Parse(&input, proto);
-
-#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF
-    if(!ret)
-    {
-        LOG(ERROR) << "Some data requires patched protobuf (available in OpenCV source tree only).";
-        CV_Error_(Error::StsError,("Some data requires patched protobuf (available in OpenCV source tree only)."));
-    }
-#endif
-
-    return ret;
-+    return parser.Parse(&input, proto);
- }
- 
- 
-diff --git a/modules/dnn/test/test_layers.cpp b/modules/dnn/test/test_layers.cpp
-index a07d442d76..5c6fc541d7 100644
--- a/modules/dnn/test/test_layers.cpp
-+++ b/modules/dnn/test/test_layers.cpp
-@@ -754,17 +754,17 @@ TEST_F(Layer_RNN_Test, get_set_test)
-     EXPECT_EQ(shape(outputs[1]), shape(nT, nS, nH));
- }
- 
-#ifndef OPENCV_DNN_EXTERNAL_PROTOBUF
- TEST_P(Test_Caffe_layers, Accum)
-#else
-TEST_P(Test_Caffe_layers, DISABLED_Accum)  // requires patched protobuf (available in OpenCV source tree only)
-#endif
 {
 +#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF
 +    throw SkipTestException("Requires patched protobuf");
@@ -327,15 +137,9 @@ index a07d442d76..5c6fc541d7 100644
 }
 
 TEST_P(Test_Caffe_layers, FlowWarp)
-@@ -782,42 +782,42 @@ TEST_P(Test_Caffe_layers, ChannelNorm)
+@@ -780,27 +784,39 @@ TEST_P(Test_Caffe_layers, ChannelNorm)
-     testLayerUsingCaffeModels("channel_norm", false, false);
- }
 
-#ifndef OPENCV_DNN_EXTERNAL_PROTOBUF
 TEST_P(Test_Caffe_layers, DataAugmentation)
-#else
-TEST_P(Test_Caffe_layers, DISABLED_DataAugmentation)  // requires patched protobuf (available in OpenCV source tree only)
-#endif
 {
 +#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF
 +    throw SkipTestException("Requires patched protobuf");
@@ -348,11 +152,7 @@ index a07d442d76..5c6fc541d7 100644
 +#endif
 }
 
-#ifndef OPENCV_DNN_EXTERNAL_PROTOBUF
 TEST_P(Test_Caffe_layers, Resample)
-#else
-TEST_P(Test_Caffe_layers, DISABLED_Resample)  // requires patched protobuf (available in OpenCV source tree only)
-#endif
 {
 +#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF
 +    throw SkipTestException("Requires patched protobuf");
@@ -364,11 +164,7 @@ index a07d442d76..5c6fc541d7 100644
 +#endif
 }
 
-#ifndef OPENCV_DNN_EXTERNAL_PROTOBUF
 TEST_P(Test_Caffe_layers, Correlation)
-#else
-TEST_P(Test_Caffe_layers, DISABLED_Correlation)  // requires patched protobuf (available in OpenCV source tree only)
-#endif
 {
 +#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF
 +    throw SkipTestException("Requires patched protobuf");
@@ -377,12 +173,11 @@ index a07d442d76..5c6fc541d7 100644
         applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_NGRAPH, CV_TEST_TAG_DNN_SKIP_IE_NN_BUILDER,
                      CV_TEST_TAG_DNN_SKIP_OPENCL, CV_TEST_TAG_DNN_SKIP_OPENCL_FP16);
     testLayerUsingCaffeModels("correlation", false, false, 0.0, 0.0, 2);
- }
 +#endif
+ }
 
 TEST_P(Test_Caffe_layers, Convolution2Inputs)
- {
+@@ -1641,12 +1657,11 @@ private:
-@@ -1644,12 +1644,11 @@ private:
     int outWidth, outHeight, zoomFactor;
 };
 
@@ -395,10 +190,10 @@ index a07d442d76..5c6fc541d7 100644
 +#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF
 +    throw SkipTestException("Requires patched protobuf");
 +#else
- #if defined(INF_ENGINE_RELEASE) && INF_ENGINE_VER_MAJOR_EQ(2022010000)
+ #if defined(INF_ENGINE_RELEASE) && INF_ENGINE_VER_MAJOR_EQ(2021030000)
-     // Cannot get memory!
+     if (backend == DNN_BACKEND_INFERENCE_ENGINE_NGRAPH && target == DNN_TARGET_MYRIAD)
-     if (backend == DNN_BACKEND_INFERENCE_ENGINE_NGRAPH && target == DNN_TARGET_CPU)
+         applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_MYRIAD, CV_TEST_TAG_DNN_SKIP_IE_NGRAPH);  // exception
-@@ -1686,6 +1685,7 @@ TEST_P(Test_Caffe_layers, DISABLED_Interp)  // requires patched protobuf (availa
+@@ -1670,6 +1685,7 @@ TEST_P(Test_Caffe_layers, DISABLED_Interp)  // requires patched protobuf (availa
 
     // Test an implemented layer.
     testLayerUsingCaffeModels("layer_interp", false, false);
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_4.6.0.imx.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_4.13.0.imx.bb
index 0195bc61a..d509ac53e 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_4.6.0.imx.bb
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_4.13.0.imx.bb
@@ -1,10 +1,10 @@
-# This recipe is for the i.MX fork of opencv. For ease of
+# This recipe is modified for i.MX.
-# maintenance, the top section is a verbatim copy of an OE-core
+# For ease of maintenance, the top section is a verbatim copy
-# recipe. The second section customizes the recipe for i.MX.
+# of an OE-core recipe, and the second section customizes the
+# recipe for i.MX.
 ########## meta-openembedded copy ###########
-# Upstream hash: 72dc42966be7da07f9553f75b825123b81704f0b
+# Upstream hash: 9b77eae6988e98adbec5323d2491afc6b327c91a
-# Commit https://github.com/openembedded/meta-openembedded/commit/225ce6a14a8110ab6b573b4dc9f5297a03d17e0f added
 SUMMARY = "Opencv : The Open Computer Vision Library"
 HOMEPAGE = "http://opencv.org/"
@@ -16,60 +16,41 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 ARM_INSTRUCTION_SET:armv4 = "arm"
 ARM_INSTRUCTION_SET:armv5 = "arm"
-DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp"
+DEPENDS = "bzip2 glib-2.0 libtool libwebp swig-native zlib"
-SRCREV_opencv = "b0dc474160e389b9c9045da5db49d03ae17c6a6b"
+SRCREV_opencv = "fe38fc608f6acb8b68953438a62305d8318f4fcd"
-SRCREV_contrib = "7b77c355a8fdc97667b3fa1e7a0d37e4973fc868"
+SRCREV_contrib = "d99ad2a188210cc35067c2e60076eed7c2442bc3"
-SRCREV_ipp = "a56b6ac6f030c312b2dce17430eef13aed9af274"
 SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26"
 SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"
 SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12"
 SRCREV_wechat-qrcode = "a8b69ccc738421293254aec5ddb38bd523503252"
+SRCREV_fastcv = "9e8d42b6d7e769548d70b2e5674e263b056de8b4"
+# kleidicv must match version of OpenCV
+SRCREV_kleidicv = "1e8fe7008c2292657b9689d70ea5d30db0e57767"
-def ipp_filename(d):
+SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg_fastcv_kleidicv"
-    import re
+SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=4.x;protocol=https;tag=${PV} \
-    arch = d.getVar('TARGET_ARCH')
+           git://github.com/opencv/opencv_contrib.git;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/contrib;name=contrib;branch=4.x;protocol=https;tag=${PV} \
-    if re.match("i.86$", arch):
-        return "ippicv_2020_lnx_ia32_20191018_general.tgz"
-    else:
-        return "ippicv_2020_lnx_intel64_20191018_general.tgz"
-def ipp_md5sum(d):
-    import re
-    arch = d.getVar('TARGET_ARCH')
-    if re.match("i.86$", arch):
-        return "ad189a940fb60eb71f291321322fe3e8"
-    else:
-        return "7421de0095c7a39162ae13a6098782f9"
-IPP_FILENAME = "${@ipp_filename(d)}"
-IPP_MD5 = "${@ipp_md5sum(d)}"
-SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg"
-SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol=https \
-           git://github.com/opencv/opencv_contrib.git;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/contrib;name=contrib;branch=master;protocol=https \
-           git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20191018;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/ipp;name=ipp;protocol=https \
           git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/boostdesc;name=boostdesc;protocol=https \
           git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/vgg;name=vgg;protocol=https \
           git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/face;name=face;protocol=https \
           git://github.com/WeChatCV/opencv_3rdparty.git;branch=wechat_qrcode;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/wechat_qrcode;name=wechat-qrcode;protocol=https \
-           file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \
+           git://github.com/opencv/opencv_3rdparty.git;branch=fastcv/4.x_20250715;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/fastcv;name=fastcv;protocol=https  \
           file://0003-To-fix-errors-as-following.patch \
           file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \
           file://0001-Dont-use-isystem.patch \
           file://download.patch \
           file://0001-Make-ts-module-external.patch \
-           file://0001-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch \
+           file://0008-Do-not-embed-build-directory-in-binaries.patch \
-           file://fix-build-with-protobuf-v22.patch \
           "
 SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=contrib"
+SRC_URI:append:aarch64 = " git://gitlab.arm.com/kleidi/kleidicv;branch=main;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/3rdparty/kleidicv;name=kleidicv;protocol=https"
 # OpenCV wants to download more files during configure.  We download these in
 # do_fetch and construct a source cache in the format it expects
-OPENCV_DLDIR = "${UNPACKDIR}/downloads"
+OPENCV_DLDIR = "${WORKDIR}/downloads"
 do_unpack_extra() {
-    tar xzf ${S}/ipp/ippicv/${IPP_FILENAME} -C ${S}
    md5() {
        # Return the MD5 of $1
@@ -89,34 +70,34 @@ do_unpack_extra() {
    cache data ${S}/face/*.dat
    cache wechat_qrcode ${S}/wechat_qrcode/*.caffemodel
    cache wechat_qrcode ${S}/wechat_qrcode/*.prototxt
+    cache fastcv ${S}/fastcv/fastcv/*.tgz
 }
 addtask unpack_extra after do_unpack before do_patch
 CMAKE_VERBOSE = "VERBOSE=1"
 EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${S}/contrib/modules \
-    -DWITH_1394=OFF \
+                 -DWITH_1394=OFF \
-    -DENABLE_PRECOMPILED_HEADERS=OFF \
+                 -DENABLE_PRECOMPILED_HEADERS=OFF \
-    -DCMAKE_SKIP_RPATH=ON \
+                 -DCMAKE_SKIP_RPATH=ON \
-    -DOPENCV_ICV_HASH=${IPP_MD5} \
+                 -DWITH_IPP=OFF \
-    -DIPPROOT=${S}/ippicv_lnx \
+                 -DOPENCV_GENERATE_PKGCONFIG=ON \
-    -DOPENCV_GENERATE_PKGCONFIG=ON \
+                 -DOPENCV_DOWNLOAD_PATH=${OPENCV_DLDIR} \
-    -DOPENCV_DOWNLOAD_PATH=${OPENCV_DLDIR} \
+                 -DOPENCV_ALLOW_DOWNLOADS=OFF \
-    -DOPENCV_ALLOW_DOWNLOADS=OFF \
+    ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DCPU_DISPATCH=SSE,SSE2,SSE3,SSSE3", "", d)} \
-    ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \
+    ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DCPU_DISPATCH=SSE,SSE2,SSE3,SSSE3,SSE41", "", d)} \
-    ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \
+    ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DCPU_DISPATCH=SSE,SSE2,SSE3,SSSE3,SSE41,SSE42", "", d)} \
-    ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \
 "
 LDFLAGS:append:mips = " -Wl,--no-as-needed -latomic -Wl,--as-needed"
 LDFLAGS:append:riscv32 = " -Wl,--no-as-needed -latomic -Wl,--as-needed"
 EXTRA_OECMAKE:append:x86 = " -DX86=ON"
-# disable sse4.1 and sse4.2 to fix 32bit build failure
+EXTRA_OECMAKE:append:aarch64 = " -DKLEIDICV_SOURCE_PATH=${S}/3rdparty/kleidicv"
-# https://github.com/opencv/opencv/issues/21597
-EXTRA_OECMAKE:remove:x86 = " -DENABLE_SSE41=1 -DENABLE_SSE42=1"
-PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \
+PACKAGECONFIG ??= "python3 eigen jpeg png tiff v4l libv4l samples tbb \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \
+    ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}"
+PACKAGECONFIG:append:class-target = " gapi gstreamer gphoto2 \
    ${@bb.utils.contains_any("LICENSE_FLAGS_ACCEPTED", "commercial_ffmpeg commercial", "libav", "", d)}"
 # TBB does not build for powerpc so disable that package config
@@ -137,27 +118,24 @@ PACKAGECONFIG[gtk] = "-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+3,"
 PACKAGECONFIG[jasper] = "-DWITH_JASPER=ON,-DWITH_JASPER=OFF,jasper,"
 PACKAGECONFIG[java] = "-DJAVA_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native fastjar-native openjdk-8-native,"
 PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg,"
-PACKAGECONFIG[libav] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,libav,"
+PACKAGECONFIG[libav] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,ffmpeg,"
 PACKAGECONFIG[libv4l] = "-DWITH_LIBV4L=ON,-DWITH_LIBV4L=OFF,v4l-utils,"
 PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers virtual/libopencl1,"
+PACKAGECONFIG[openvino] = "-DWITH_OPENVINO=ON,-DWITH_OPENVINO=OFF,openvino-inference-engine,openvino-inference-engine"
 PACKAGECONFIG[oracle-java] = "-DJAVA_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${ORACLE_JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native oracle-jse-jdk oracle-jse-jdk-native,"
 PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng,"
-PACKAGECONFIG[python2] = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python-numpy,"
+PACKAGECONFIG[python3] = "-DPYTHON3_INCLUDE_PATH=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI} -DPYTHON3_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/_core/include,,python3-numpy,"
-PACKAGECONFIG[python3] = "-DPYTHON3_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/_core/include,,python3-numpy,"
+PACKAGECONFIG[samples] = "-DBUILD_EXAMPLES=ON -DINSTALL_BIN_EXAMPLES=ON -DINSTALL_PYTHON_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,,"
-PACKAGECONFIG[samples] = "-DBUILD_EXAMPLES=ON -DINSTALL_PYTHON_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,,"
 PACKAGECONFIG[tbb] = "-DWITH_TBB=ON,-DWITH_TBB=OFF,tbb,"
-PACKAGECONFIG[tests] = "-DBUILD_TESTS=ON,-DBUILD_TESTS=OFF,,"
+PACKAGECONFIG[tests] = "-DBUILD_TESTS=ON -DINSTALL_TESTS=ON,-DBUILD_TESTS=OFF,,"
 PACKAGECONFIG[text] = "-DBUILD_opencv_text=ON,-DBUILD_opencv_text=OFF,tesseract,"
 PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff,"
 PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils,"
+PACKAGECONFIG[fastcv] = "-DWITH_FASTCV=ON ,-DWITH_FASTCV=OFF,qcom-fastcv-binaries,"
-inherit pkgconfig cmake
+inherit pkgconfig cmake setuptools3-base python3native
-inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'setuptools3-base', '', d)}
-inherit ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'distutils-base', '', d)}
 export PYTHON_CSPEC = "-I${STAGING_INCDIR}/${PYTHON_DIR}"
-export PYTHON = "${STAGING_BINDIR_NATIVE}/${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3', 'python', d)}"
 export ORACLE_JAVA_HOME = "${STAGING_DIR_NATIVE}/usr/bin/java"
 export JAVA_HOME = "${STAGING_DIR_NATIVE}/usr/lib/jvm/openjdk-8-native"
 export ANT_DIR = "${STAGING_DIR_NATIVE}/usr/share/ant/"
@@ -167,9 +145,8 @@ TARGET_CC_ARCH += "-I${S}/include "
 PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'samples', '${PN}-samples', '', d)} \
    ${@bb.utils.contains('PACKAGECONFIG', 'oracle-java', '${PN}-java', '', d)} \
    ${@bb.utils.contains('PACKAGECONFIG', 'java', '${PN}-java', '', d)} \
-    ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'python-${BPN}', '', d)} \
    ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-${BPN}', '', d)} \
-    ${PN}-apps"
+             ${PN}-apps"
 python populate_packages:prepend () {
    cv_libdir = d.expand('${libdir}')
@@ -191,12 +168,17 @@ python populate_packages:prepend () {
    metapkg =  pn
    d.setVar('ALLOW_EMPTY:' + metapkg, "1")
-    blacklist = [ metapkg, "libopencv-ts" ]
+    blacklist = [ metapkg ]
    metapkg_rdepends = [ ]
    for pkg in packages[1:]:
        if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.endswith('-doc') and not pkg.endswith('-locale') and not pkg.endswith('-staticdev'):
            metapkg_rdepends.append(pkg)
    d.setVar('RDEPENDS:' + metapkg, ' '.join(metapkg_rdepends))
+    fastcv_pkgs = ["libopencv-core", "libopencv-fastcv", "libopencv-imgproc"]
+    if bb.utils.contains('PACKAGECONFIG', 'fastcv', True, False, d):
+        for pkg in fastcv_pkgs:
+            d.appendVar('RDEPENDS:' + pkg, " qcom-fastcv-binaries")
 }
 PACKAGES_DYNAMIC += "^libopencv-.*"
@@ -214,15 +196,11 @@ INSANE_SKIP:${PN}-dbg = "libdir"
 ALLOW_EMPTY:${PN} = "1"
-SUMMARY:python-opencv = "Python bindings to opencv"
-FILES:python-opencv = "${PYTHON_SITEPACKAGES_DIR}/*"
-RDEPENDS:python-opencv = "python-core python-numpy"
 SUMMARY:python3-opencv = "Python bindings to opencv"
 FILES:python3-opencv = "${PYTHON_SITEPACKAGES_DIR}/*"
 RDEPENDS:python3-opencv = "python3-core python3-numpy"
-RDEPENDS:${PN}-apps  = "bash"
+RDEPENDS:${PN}-apps = "bash"
 do_compile:prepend() {
    # remove the build host info to improve reproducibility
@@ -237,81 +215,108 @@ do_install:append() {
        mv ${D}/usr/lib/* ${D}/${libdir}/
        rm -rf ${D}/usr/lib
    fi
+    # remove setup_vars_opencv4.sh as its content is confusing and useless
+    if [ -f ${D}${bindir}/setup_vars_opencv4.sh ]; then
+        rm -rf ${D}${bindir}/setup_vars_opencv4.sh
+    fi
+    for fn in arithm.vsx3.cpp convert.vsx3.cpp; do
+        if [ -f ${B}/modules/core/$fn ]; then
+            sed -i -e 's,${S},/usr/src/debug/${PN}/${PV},g' ${B}/modules/core/$fn
+        fi
+    done
+    if [ -d ${D}/${bindir}/shape ]; then
+        # rename shape dir to avoid rootfs conflict with
+        # mesa-demos /usr/bin/shape file.
+        mv ${D}/${bindir}/shape ${D}/${bindir}/opencv_shape
+    fi
+}
+do_install:append:class-target() {
    # remove build host path to improve reproducibility
    if [ -f ${D}${libdir}/cmake/opencv4/OpenCVModules.cmake ]; then
        sed -e 's@${STAGING_DIR_HOST}@@g' \
            -i ${D}${libdir}/cmake/opencv4/OpenCVModules.cmake
    fi
-    # remove setup_vars_opencv4.sh as its content is confusing and useless
-    if [ -f ${D}${bindir}/setup_vars_opencv4.sh ]; then
-        rm -rf ${D}${bindir}/setup_vars_opencv4.sh
-    fi
 }
+BBCLASSEXTEND = "native"
 ########## End of meta-openembedded copy ##########
 ########## i.MX overrides ##########
-SUMMARY = "Opencv : The Open Computer Vision Library, i.MX Fork"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-# Replace the opencv URL with the fork
+# Need to override opencv and contrib URL because they include PV
-SRC_URI:remove = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol=https"
+IMX_BASE_VERSION = "${@'.'.join((d.getVar('PV') or '').split('.')[:3])}"
-SRC_URI =+ "${OPENCV_SRC};branch=${SRCBRANCH};name=opencv"
+SRC_URI:remove = " \
-OPENCV_SRC ?= "git://github.com/nxp-imx/opencv-imx.git;protocol=https;branch=master"
+    git://github.com/opencv/opencv.git;name=opencv;branch=4.x;protocol=https;tag=${PV} \
-SRCBRANCH = "4.6.0_imx"
+    git://github.com/opencv/opencv_contrib.git;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/contrib;name=contrib;branch=4.x;protocol=https;tag=${PV}"
-SRCREV_opencv = "d3440df40a6e90cd1d2a1b729bcbc16aa4d42f5d"
+SRC_URI:prepend = " \
+    git://github.com/opencv/opencv.git;name=opencv;branch=4.x;protocol=https;tag=${IMX_BASE_VERSION} \
+    git://github.com/opencv/opencv_contrib.git;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/contrib;name=contrib;branch=4.x;protocol=https;tag=${IMX_BASE_VERSION} "
-# Add opencv_extra
+# i.MX patches
 SRC_URI += " \
-    git://github.com/opencv/opencv_extra.git;destsuffix=extra;name=extra;branch=master;protocol=https \
+    file://0101-MGS-6470-ccc-Modify-host-ptr-alignment-size-in-UMAT.patch \
+    file://0102-MGS-6470-ccc-Add-configuration-parameter-to-force-en.patch \
+    file://0103-MGS-6470-ccc-Change-configuration-to-enable-hostptr-.patch \
+    file://0104-MGS-8011-ccc-Fix-the-problem-of-syntax-error-at-doub.patch \
+    file://0105-MGS-8318-ccc-Fix-error-implicit-declaration-of-funct.patch \
+    file://0106-core-opencl-fix-inplace-transpose-race-by-enforcing-.patch \
+    file://0107-imgproc-perf-HoughLines-Fix-test-tolerance-and-compa.patch \
+    file://0108-imgproc-perf-HoughLines-Fix-lower-bound-for-line-cou.patch \
+    file://0109-core-ocl-fix-incorrect-results-for-in-place-flip-on-.patch \
+"
+# Add opencv_extra
+SRC_URI += "\
+    git://github.com/opencv/opencv_extra.git;destsuffix=extra;name=extra;branch=4.x;protocol=https \
    file://0001-Add-smaller-version-of-download_models.py.patch;patchdir=${UNPACKDIR}/extra \
 "
 SRCREV_FORMAT:append = "_extra"
-SRCREV_extra = "936854e2b666853d6d0732a8eabc2d699f4fa3d8"
+SRCREV_extra = "b6db059e9b80072d80d009d2ab344f8606a8e964"
 # Patch DNN example
-SRC_URI += " \
+SRC_URI += "\
    file://OpenCV_DNN_examples.patch \
 "
 PACKAGECONFIG:remove = "eigen"
-PACKAGECONFIG:append:mx8-nxp-bsp = " dnn text"
+PACKAGECONFIG:append = " \
-PACKAGECONFIG:append:mx9-nxp-bsp = " dnn text"
+    dnn \
+    text \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt6-layer', 'qt6', '', d)} \
+    ${PACKAGECONFIG_OPENCL} \
+"
-PACKAGECONFIG:append = " ${PACKAGECONFIG_OPENCL}"
+PACKAGECONFIG_OPENCL = ""
-PACKAGECONFIG_OPENCL                 = ""
+PACKAGECONFIG_OPENCL:imxgpu = "opencl"
-PACKAGECONFIG_OPENCL:mx8-nxp-bsp     = "opencl"
+PACKAGECONFIG_OPENCL:mx8mm-nxp-bsp = ""
-PACKAGECONFIG_OPENCL:mx8dxl-nxp-bsp  = ""
-PACKAGECONFIG_OPENCL:mx8mm-nxp-bsp   = ""
-PACKAGECONFIG_OPENCL:mx8mnul-nxp-bsp = ""
 PACKAGECONFIG[openvx] = "-DWITH_OPENVX=ON -DOPENVX_ROOT=${STAGING_LIBDIR} -DOPENVX_LIB_CANDIDATES='OpenVX;OpenVXU',-DWITH_OPENVX=OFF,virtual/libopenvx,"
 PACKAGECONFIG[qt5] = "-DWITH_QT=ON -DOE_QMAKE_PATH_EXTERNAL_HOST_BINS=${STAGING_BINDIR_NATIVE} -DCMAKE_PREFIX_PATH=${STAGING_BINDIR_NATIVE}/cmake,-DWITH_QT=OFF,qtbase qtbase-native,"
-PACKAGECONFIG[qt6] = "-DWITH_QT=ON -DQT_HOST_PATH=${RECIPE_SYSROOT_NATIVE}${prefix_native},-DWITH_QT=OFF,qtbase qtbase-native,"
+PACKAGECONFIG[qt6] = "-DWITH_QT=ON -DQT_HOST_PATH=${RECIPE_SYSROOT_NATIVE}${prefix_native},-DWITH_QT=OFF,qtbase qtbase-native qt5compat,"
 PACKAGECONFIG[tests-imx] = "-DINSTALL_TESTS=ON -DOPENCV_TEST_DATA_PATH=${UNPACKDIR}/extra/testdata, -DINSTALL_TESTS=OFF,"
 PACKAGECONFIG[tim-vx] = "-DWITH_TIMVX=ON -DTIMVX_INSTALL_DIR=${STAGING_DIR_HOST}${libdir},-DWITH_TIMVX=OFF,tim-vx"
-# Disable cvv module in opencv_contrib as it is not yet suppported for Qt6
-# (opencv debug framework)
-EXTRA_OECMAKE:append = " -DBUILD_opencv_cvv=OFF"
 do_install:append() {
    ln -sf opencv4/opencv2 ${D}${includedir}/opencv2
-    if ${@bb.utils.contains('PACKAGECONFIG', 'samples', 'true', 'false', d)}; then
+    install -d ${D}${datadir}/opencv4/samples/data
-        install -d ${D}${datadir}/OpenCV/samples/data
+    cp -r ${S}/samples/data/* ${D}${datadir}/opencv4/samples/data
-        cp -r ${S}/samples/data/* ${D}${datadir}/OpenCV/samples/data
+    install -d ${D}${datadir}/opencv4/samples/bin/
-        install -d ${D}${datadir}/OpenCV/samples/bin/
+    cp -f bin/example_* ${D}${datadir}/opencv4/samples/bin/
-        cp -f bin/example_* ${D}${datadir}/OpenCV/samples/bin/
-    fi
    if ${@bb.utils.contains('PACKAGECONFIG', 'tests-imx', 'true', 'false', d)}; then
        cp -r share/opencv4/testdata/cv/face/* ${D}${datadir}/opencv4/testdata/cv/face/
    fi
+    # Rename cpp folder to avoid collision with GCC /usr/bin/cpp.
+    mv ${D}${bindir}/cpp ${D}${bindir}/opencv_cpp
 }
-FILES:${PN}-samples += "${datadir}/OpenCV/samples"
+PACKAGE_ARCH = "${MACHINE_SOCARCH}"
 COMPATIBLE_MACHINE = "(mx8-nxp-bsp|mx9-nxp-bsp)"
diff --git a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc
index 1f63cd7a0..10628e782 100644
--- a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc
+++ b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc
@@ -9,19 +9,19 @@ python __anonymous () {
 }
 SRC_URI:append:imxgpu2d = " \
-        file://0001-Add-support-for-i.MX-codecs-to-phonon.patch \
+    file://0001-Add-support-for-i.MX-codecs-to-phonon.patch \
-        file://0002-i.MX-video-renderer-Allow-v4l-device-from-environmen.patch \
+    file://0002-i.MX-video-renderer-Allow-v4l-device-from-environmen.patch \
-        file://0003-i.MX6-force-egl-visual-ID-33.patch \
+    file://0003-i.MX6-force-egl-visual-ID-33.patch \
-        file://0001-config.tests-add-DEFINES-to-compile-egl-test-with-im.patch \
+    file://0001-config.tests-add-DEFINES-to-compile-egl-test-with-im.patch \
-        file://0002-config.tests-add-DEFINES-to-compile-egl4gles1-test-w.patch \
+    file://0002-config.tests-add-DEFINES-to-compile-egl4gles1-test-w.patch \
 "
 DEPENDS:append:imxgpu2d = " virtual/kernel virtual/libgles2"
 QT_GLFLAGS:imxgpu2d = "-opengl es2 -openvg"
 QT_CONFIG_FLAGS:append:imxgpu2d = " -I${STAGING_KERNEL_DIR}/include/uapi \
-                               -I${STAGING_KERNEL_DIR}/include/ \
+                                   -I${STAGING_KERNEL_DIR}/include/ \
-                               -DLINUX=1 -DEGL_API_FB=1 \
+                                   -DLINUX=1 -DEGL_API_FB=1 \
-                               -DQT_QPA_EXPERIMENTAL_TOUCHEVENT=1"
+                                   -DQT_QPA_EXPERIMENTAL_TOUCHEVENT=1"
 # The QT_CONFIG_FLAGS can pollute *.la files with -Dxxx
 do_compile:append:mx6-nxp-bsp () {
diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
index e450e568e..885c65b08 100644
--- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
+++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
@@ -10,30 +10,30 @@ SRC_URI:append:imxgpu = " \
    file://0001-egl.prf-Fix-build-error-when-egl-headers-need-platfo.patch \
 "
-PACKAGECONFIG_GL_IMX_GPU     = ""
+PACKAGECONFIG_GL_IMX_GPU = ""
 PACKAGECONFIG_GL_IMX_GPU:mx8-nxp-bsp = "gbm kms"
 PACKAGECONFIG_GL_IMX_GPU:mx95-nxp-bsp = "gbm kms"
-PACKAGECONFIG_GL:imxpxp   = "gles2"
+PACKAGECONFIG_GL:imxpxp = "gles2"
 PACKAGECONFIG_GL:imxgpu2d = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' gl', '', d)} \
                             ${PACKAGECONFIG_GL_IMX_GPU}"
 PACKAGECONFIG_GL:imxgpu3d = "gles2 \
                             ${PACKAGECONFIG_GL_IMX_GPU}"
 PACKAGECONFIG_GL:use-mainline-bsp ?= "gles2 gbm kms"
-PACKAGECONFIG_PLATFORM          = ""
+PACKAGECONFIG_PLATFORM = ""
 PACKAGECONFIG_PLATFORM:imxgpu2d = "no-opengl linuxfb"
-PACKAGECONFIG_PLATFORM:imxgpu3d = " \
+PACKAGECONFIG_PLATFORM:imxgpu3d = "\
    ${@bb.utils.contains('DISTRO_FEATURES', 'x11',     '', \
       bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \
                                                       'eglfs', d), d)}"
 PACKAGECONFIG_PLATFORM:use-mainline-bsp = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'eglfs', d)}"
 PACKAGECONFIG += "${PACKAGECONFIG_PLATFORM}"
-PACKAGECONFIG_VULKAN_IMX_GPU       = ""
+PACKAGECONFIG_VULKAN_IMX_GPU = ""
-PACKAGECONFIG_VULKAN_IMX_GPU:mx8-nxp-bsp   = "vulkan"
+PACKAGECONFIG_VULKAN_IMX_GPU:mx8-nxp-bsp = "vulkan"
-PACKAGECONFIG_VULKAN_IMX_GPU:mx9-nxp-bsp   = "vulkan"
+PACKAGECONFIG_VULKAN_IMX_GPU:mx9-nxp-bsp = "vulkan"
 PACKAGECONFIG_VULKAN_IMX_GPU:mx8mm-nxp-bsp = ""
-PACKAGECONFIG_VULKAN               = ""
+PACKAGECONFIG_VULKAN = ""
-PACKAGECONFIG_VULKAN:imxgpu        = "${PACKAGECONFIG_VULKAN_IMX_GPU}"
+PACKAGECONFIG_VULKAN:imxgpu = "${PACKAGECONFIG_VULKAN_IMX_GPU}"
 PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', '${PACKAGECONFIG_VULKAN}', '', d)}"
diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtmultimedia_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtmultimedia_%.bbappend
index f019c72da..e01bcf525 100644
--- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtmultimedia_%.bbappend
+++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtmultimedia_%.bbappend
@@ -1,9 +1,9 @@
 # Fixes QT5 application builds searching for libimx6vivantevideonode.so
 # via cmake cmake/Qt5Multimedia/Qt5MultimediaConfig.cmake
 do_install:append:imxgpu() {
-        install -d ${D}${libdir}/plugins/videoimx6vivantevideonode
+    install -d ${D}${libdir}/plugins/videoimx6vivantevideonode
-        ln -sf ../video/videonode/libeglvideonode.so ${D}${libdir}/plugins/videoimx6vivantevideonode/libeglvideonode.so
+    ln -sf ../video/videonode/libeglvideonode.so ${D}${libdir}/plugins/videoimx6vivantevideonode/libeglvideonode.so
-        ln -sf ../video/videonode/libimx6vivantevideonode.so ${D}${libdir}/plugins/videoimx6vivantevideonode/libimx6vivantevideonode.so
+    ln -sf ../video/videonode/libimx6vivantevideonode.so ${D}${libdir}/plugins/videoimx6vivantevideonode/libimx6vivantevideonode.so
 }
 INSANE_SKIP:${PN}-plugins:imxgpu = "dev-so"
diff --git a/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_%.bbappend b/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_%.bbappend
index b12499666..f77bc14c2 100644
--- a/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_%.bbappend
+++ b/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_%.bbappend
@@ -3,55 +3,55 @@
 # Copyright (C) 2016, 2017 O.S. Systems Software LTDA.
 # Copyright (C) 2017-2018 NXP
-PACKAGECONFIG_GRAPHICS:imxpxp = " \
+PACKAGECONFIG_GRAPHICS:imxpxp = "\
    gles2"
-PACKAGECONFIG_GRAPHICS:imxgpu2d = " \
+PACKAGECONFIG_GRAPHICS:imxgpu2d = "\
    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' gl', '', d)} \
    ${PACKAGECONFIG_GRAPHICS_IMX_GPU}"
-PACKAGECONFIG_GRAPHICS:imxgpu3d = " \
+PACKAGECONFIG_GRAPHICS:imxgpu3d = "\
    gles2 \
    ${PACKAGECONFIG_GRAPHICS_IMX_GPU}"
 PACKAGECONFIG_GRAPHICS_IMX_GPU = ""
-PACKAGECONFIG_GRAPHICS_IMX_GPU:mx8-nxp-bsp = " \
+PACKAGECONFIG_GRAPHICS_IMX_GPU:mx8-nxp-bsp = "\
    gbm kms"
-PACKAGECONFIG_GRAPHICS_IMX_GPU:mx95-nxp-bsp = " \
+PACKAGECONFIG_GRAPHICS_IMX_GPU:mx95-nxp-bsp = "\
    gbm kms"
-PACKAGECONFIG_GRAPHICS:use-mainline-bsp ?= " \
+PACKAGECONFIG_GRAPHICS:use-mainline-bsp ?= "\
    gles2 gbm kms"
-PACKAGECONFIG += " \
+PACKAGECONFIG += "\
    ${PACKAGECONFIG_PLATFORM}"
 PACKAGECONFIG_PLATFORM = ""
-PACKAGECONFIG_PLATFORM:imxgpu2d = " \
+PACKAGECONFIG_PLATFORM:imxgpu2d = "\
    no-opengl \
    linuxfb \
    ${PACKAGECONFIG_PLATFORM_EGLFS}"
-PACKAGECONFIG_PLATFORM:imxgpu3d = " \
+PACKAGECONFIG_PLATFORM:imxgpu3d = "\
    ${PACKAGECONFIG_PLATFORM_EGLFS}"
 PACKAGECONFIG_PLATFORM_EGLFS = ""
-PACKAGECONFIG_PLATFORM_EGLFS:imxgpu3d = " \
+PACKAGECONFIG_PLATFORM_EGLFS:imxgpu3d = "\
    ${@bb.utils.contains('DISTRO_FEATURES', 'x11',     '', \
       bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \
                                                       'eglfs', d), d)}"
-PACKAGECONFIG_PLATFORM_EGLFS:mx8-nxp-bsp = " \
+PACKAGECONFIG_PLATFORM_EGLFS:mx8-nxp-bsp = "\
    eglfs"
-PACKAGECONFIG_PLATFORM:use-mainline-bsp = " \
+PACKAGECONFIG_PLATFORM:use-mainline-bsp = "\
    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'eglfs', d)}"
-PACKAGECONFIG += " \
+PACKAGECONFIG += "\
    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '${PACKAGECONFIG_WAYLAND}', '', d)}"
 PACKAGECONFIG_WAYLAND = "wayland"
-PACKAGECONFIG += " \
+PACKAGECONFIG += "\
    ${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', '${PACKAGECONFIG_VULKAN}', '', d)}"
 PACKAGECONFIG_VULKAN = ""
-PACKAGECONFIG_VULKAN:imxgpu = " \
+PACKAGECONFIG_VULKAN:imxgpu = "\
    ${PACKAGECONFIG_VULKAN_IMX_GPU}"
-PACKAGECONFIG_VULKAN_IMX_GPU               = ""
+PACKAGECONFIG_VULKAN_IMX_GPU = ""
-PACKAGECONFIG_VULKAN_IMX_GPU:mx8-nxp-bsp   = "vulkan"
+PACKAGECONFIG_VULKAN_IMX_GPU:mx8-nxp-bsp = "vulkan"
-PACKAGECONFIG_VULKAN_IMX_GPU:mx95-nxp-bsp   = "vulkan"
+PACKAGECONFIG_VULKAN_IMX_GPU:mx95-nxp-bsp = "vulkan"
 PACKAGECONFIG_VULKAN_IMX_GPU:mx8mm-nxp-bsp = ""
diff --git a/dynamic-layers/virtualization-layer/recipes-extended/libvirt/libvirt_%.bbappend b/dynamic-layers/virtualization-layer/recipes-extended/libvirt/libvirt_%.bbappend
index 7cb6c07a3..981a57f46 100644
--- a/dynamic-layers/virtualization-layer/recipes-extended/libvirt/libvirt_%.bbappend
+++ b/dynamic-layers/virtualization-layer/recipes-extended/libvirt/libvirt_%.bbappend
@@ -4,6 +4,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 SRC_URI:append:qoriq-ppc = " file://qemu.conf"
 do_install:append:qoriq-ppc() {
-        install -m 0644 ${UNPACKDIR}/qemu.conf ${D}${sysconfdir}/libvirt/qemu.conf
+    install -m 0644 ${UNPACKDIR}/qemu.conf ${D}${sysconfdir}/libvirt/qemu.conf
 }
diff --git a/oelint.constants.json b/oelint.constants.json
new file mode 100644
index 000000000..1379f4eff
--- /dev/null
+++ b/oelint.constants.json
@@ -0,0 +1,295 @@
+{
+    "comment": "Layer-specific oelint-adv constant DB. contrib/oelint/run-oelint.sh passes this file via --constantmods so standalone lint runs know about real variables/overrides that normally come from the full bitbake metadata context.",
+    "functions": {
+        "known": [
+            "do_image_uboot_mxsboot_nand",
+            "do_image_uboot_mxsboot_sdcard",
+            "do_image_wic",
+            "module_conf_moal"
+        ]
+    },
+    "variables": {
+        "known": [
+            "ACCEPT_FSL_EULA",
+            "ALSA_INSTALL",
+            "ANNOTATED_NAME",
+            "ANT_DIR",
+            "ARM_EXTRA_SOCARCH",
+            "ARM_INSTRUCTION_SET",
+            "ARM_PIPELINES",
+            "ATF_BOOT_UART_BASE",
+            "ATF_BRANCH",
+            "ATF_MACHINE_NAME",
+            "ATF_PLATFORM",
+            "ATF_SRC",
+            "BACKEND",
+            "BASEDEPENDS",
+            "BEEP_RDEPENDS",
+            "BHOST_PKGCONFIG_PATH",
+            "BL32",
+            "BL33",
+            "BOARDS",
+            "BOARD_TARGETS",
+            "BOARD_TYPE",
+            "BOOTTYPE",
+            "BOOT_CONFIG_MACHINE_EXTRA",
+            "BOOT_MODE",
+            "BOOT_SPACE",
+            "BOOT_STAGING",
+            "BOOT_TOOLS",
+            "BOOT_VARIANT",
+            "BUILD_64BIT_KERNEL",
+            "BUILD_IMPLEMENTATION",
+            "CACHED_DMA_HEAP_CONF",
+            "CACHED_DMA_HEAP_DEVICE_NODE_PATH",
+            "CELLCONF_DIR",
+            "CELL_DIR",
+            "CFG_CORE_ARM64_PA_BITS",
+            "CFG_CORE_LARGE_PHYS_ADDR",
+            "CFG_CORE_PAUTH",
+            "CFG_DDR_SIZE",
+            "CFG_NXP_CAAM",
+            "CFG_TA_BTI",
+            "CFG_TA_PAUTH",
+            "CFG_TEE_CORE_LOG_LEVEL",
+            "CFG_TEE_TA_LOG_LEVEL",
+            "CFG_TZDRAM_START",
+            "COMPILER",
+            "CONFIG_CMD_LICENSE",
+            "CONFIG_CPU_BIG_ENDIAN",
+            "CONFIG_LOCALVERSION",
+            "CONFIG_LOCALVERSION_AUTO",
+            "CONFIG_MTD_CFI_BE_BYTE_SWAP",
+            "CONFIG_MX28",
+            "CONFIG_MXC_GPU_VIV",
+            "CROSS_COMPILE64",
+            "CROSS_COMPILE_HOST",
+            "CROSS_COMPILE_TA",
+            "CRRM_DEPLOY_DEPENDS",
+            "CRRM_FILES",
+            "CRYPTO_AF_ALG_SRC",
+            "CST_DIR",
+            "CTRLSW_HDRPATH",
+            "CVE_STATUS",
+            "DDR_CONFIG",
+            "DDR_TYPE",
+            "DEBIAN_NOAUTONAME",
+            "DEFAULT_FS_SUPPORT",
+            "DEMOS_PATH",
+            "DEPENDS_BACKEND",
+            "DEPENDS_IMXGPU",
+            "DEPENDS_IMX_OPENCL_CONVERTER",
+            "DEPENDS_MX8",
+            "DEPENDS_V4L2",
+            "DEPLOY_FOR",
+            "DEPLOY_OPTEE",
+            "DEPLOY_OPTEE_STMM",
+            "DEST",
+            "DEST_DIR",
+            "DIRPATCHVULKAN",
+            "DISABLE_STATIC",
+            "DPAA_VER",
+            "DPDK_APPS",
+            "DPDK_EXAMPLES",
+            "DPDK_SRC",
+            "DTB",
+            "DTB_BASE_NAME",
+            "DTB_EXT",
+            "DTB_NAME",
+            "DTB_SYMLINK_NAME",
+            "ENDIANNESS_GCC",
+            "ENDIANNESS_LD",
+            "ETHOS_U_FIRMWARE",
+            "ETHOS_U_FIRMWARE_SRC",
+            "ETHOS_U_SRC",
+            "EXTENSIONS",
+            "EXTRA_CONF",
+            "EXTRA_KBUILD_DEFCONFIG",
+            "EXTRA_OEMAKE_PLATFORM",
+            "FEATURE_PACKAGES_extfs",
+            "FEATURE_PACKAGES_f2fs",
+            "FEATURE_PACKAGES_mtd",
+            "FSL_EULA_FILE_MD5SUMS",
+            "GLIBC_64BIT_TIME_FLAGS",
+            "GSTREAMER_GPL",
+            "GST_PLUGIN_SET_HAS_EXAMPLES",
+            "GST_WAYLAND_PACKAGES",
+            "GST_X11_PACKAGES",
+            "KBUILD_DEFCONFIG",
+            "KCONFIG_MODE",
+            "KERNEL_DEVICETREE_32BIT_COMPATIBILITY_UPDATE",
+            "LE_UBOOT_FOR_ARMBE_TARGET",
+            "LICENSE_FLAGS",
+            "MC_FLAVOUR",
+            "MFGTOOL_FILESPATH",
+            "NETWORK_TOOLS",
+            "ODP_BUILD_TYPE",
+            "OEI_CORE",
+            "OEI_DDR_CONFIG",
+            "OEI_SOC",
+            "OPENGL_APIS",
+            "OPENGL_PKGCONFIGS",
+            "OPENGL_PLATFORMS",
+            "OPENGL_WINSYS",
+            "OPTEE_ARCH",
+            "OPTEE_CORE",
+            "OPTEEMACHINE",
+            "PACKAGECONFIG_GL",
+            "PACKAGECONFIG_GRAPHICS",
+            "PACKAGECONFIG_IMXGPU_X11",
+            "PACKAGECONFIG_OPENGL",
+            "PACKAGE_FP_TYPE",
+            "PKG",
+            "PLATFORM_FLAVOR",
+            "QEMU_TARGETS",
+            "QT_CONFIG_FLAGS",
+            "QT_GLFLAGS",
+            "REGLEX_b4420",
+            "SCR",
+            "SECO_FIRMWARE_NAME",
+            "SOC_DEFAULT_IMAGE_FSTYPES",
+            "SOC_TOOLS_GPU_FB",
+            "SOC_TOOLS_GPU_WAYLAND",
+            "SOC_TOOLS_GPU_X11",
+            "SOC_TOOLS_GPU_XWAYLAND",
+            "SRCREV_FORMAT:append",
+            "STAGING_INCDIR_IMX",
+            "TA_DEV_KIT_DIR",
+            "TFA_BUILD_TARGET",
+            "TFA_INSTALL_TARGET",
+            "TFA_PLATFORM",
+            "WRAP_TARGET_PREFIX",
+            "ZIMAGE_BASE_NAME"
+        ]
+    },
+    "replacements": {
+        "distros": [
+            "imx-nxp-bsp",
+            "use-mainline-bsp",
+            "use-nxp-bsp"
+        ],
+        "machines": [
+            "arm",
+            "darwin",
+            "e500mc",
+            "e500v2",
+            "e5500",
+            "e6500",
+            "e6500-64b",
+            "fsl-lsch2",
+            "fsl-lsch3",
+            "genericarm64",
+            "imx-generic-bsp",
+            "imx-mainline-bsp",
+            "imx-nxp-bsp",
+            "imx6qpdlsolox",
+            "imx8dxlb0-fips-lpddr4-evk",
+            "imx95-19x19-lpddr5-frdm-pro",
+            "imx95-a1-19x19-verdin",
+            "imxdpu",
+            "imxdrm",
+            "imxfbdev",
+            "imxgpu",
+            "imxgpu2d",
+            "imxgpu3d",
+            "imxipu",
+            "imxmali",
+            "imxpxp",
+            "imxviv",
+            "imxvpu",
+            "imxvulkan",
+            "ls1012a",
+            "ls102xa",
+            "ls1043a",
+            "ls1046a",
+            "ls1088a",
+            "ls2080a",
+            "ls2088a",
+            "lx2160a",
+            "lx2160ardb-rev2",
+            "lx2162a",
+            "mingw32",
+            "mx5-generic-bsp",
+            "mx5-mainline-bsp",
+            "mx6-generic-bsp",
+            "mx6-mainline-bsp",
+            "mx6-nxp-bsp",
+            "mx6dl-nxp-bsp",
+            "mx6q-nxp-bsp",
+            "mx6sl-nxp-bsp",
+            "mx6sll-nxp-bsp",
+            "mx6sx-nxp-bsp",
+            "mx6ull-generic-bsp",
+            "mx6ull-nxp-bsp",
+            "mx6ul-nxp-bsp",
+            "mx6ulz-generic-bsp",
+            "mx6ulz-nxp-bsp",
+            "mx7-generic-bsp",
+            "mx7-mainline-bsp",
+            "mx7-nxp-bsp",
+            "mx7d-nxp-bsp",
+            "mx7ulp-nxp-bsp",
+            "mx8-generic-bsp",
+            "mx8-mainline-bsp",
+            "mx8-nxp-bsp",
+            "mx8dx-generic-bsp",
+            "mx8dx-nxp-bsp",
+            "mx8dxl-generic-bsp",
+            "mx8dxl-nxp-bsp",
+            "mx8m-generic-bsp",
+            "mx8m-nxp-bsp",
+            "mx8mn-nxp-bsp",
+            "mx8mnul-nxp-bsp",
+            "mx8mm-nxp-bsp",
+            "mx8mp-nxp-bsp",
+            "mx8mpul-nxp-bsp",
+            "mx8mq-evk",
+            "mx8mq-generic-bsp",
+            "mx8mq-nxp-bsp",
+            "mx8qm-generic-bsp",
+            "mx8qm-nxp-bsp",
+            "mx8qxp-generic-bsp",
+            "mx8qxp-nxp-bsp",
+            "mx8ulp-generic-bsp",
+            "mx8ulp-nxp-bsp",
+            "mx8x-generic-bsp",
+            "mx8x-nxp-bsp",
+            "mx9-generic-bsp",
+            "mx9-mainline-bsp",
+            "mx9-nxp-bsp",
+            "mx91-generic-bsp",
+            "mx91-nxp-bsp",
+            "mx93-generic-bsp",
+            "mx93-nxp-bsp",
+            "mx943-generic-bsp",
+            "mx943-nxp-bsp",
+            "mx94-generic-bsp",
+            "mx94-nxp-bsp",
+            "mx95-generic-bsp",
+            "mx95-nxp-bsp",
+            "mx952-nxp-bsp",
+            "mxs-generic-bsp",
+            "p1020",
+            "p2020",
+            "p2041",
+            "p3041",
+            "p4080",
+            "p5040",
+            "qoriq",
+            "qoriq-arm",
+            "qoriq-arm64",
+            "qoriq-generic-bsp",
+            "qoriq-ppc",
+            "t1",
+            "t1023",
+            "t1024",
+            "t1040",
+            "t1042",
+            "t4160",
+            "toolchain-clang",
+            "vf-generic-bsp",
+            "virtclass-multilib-lib32",
+            "virtclass-multilib-lib64"
+        ]
+    }
+}
diff --git a/recipes-bsp/atf/qoriq-atf-2.12.inc b/recipes-bsp/atf/qoriq-atf-2.12.inc
index 26d79b4a1..91a412547 100644
--- a/recipes-bsp/atf/qoriq-atf-2.12.inc
+++ b/recipes-bsp/atf/qoriq-atf-2.12.inc
@@ -1,5 +1,8 @@
-DESCRIPTION = "ARM Trusted Firmware"
+SUMMARY = "ARM Trusted Firmware for QorIQ"
+DESCRIPTION = "ARM Trusted Firmware (TF-A) for NXP QorIQ Layerscape SoCs."
+HOMEPAGE = "https://github.com/nxp-qoriq/atf"
+SECTION = "bsp"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
diff --git a/recipes-bsp/atf/qoriq-atf_2.12.bb b/recipes-bsp/atf/qoriq-atf_2.12.bb
index 4eb7be9d3..c6a7ee252 100644
--- a/recipes-bsp/atf/qoriq-atf_2.12.bb
+++ b/recipes-bsp/atf/qoriq-atf_2.12.bb
@@ -2,13 +2,13 @@ require qoriq-atf-${PV}.inc
 inherit deploy
-DEPENDS += "u-boot-mkimage-native u-boot openssl openssl-native rcw qoriq-cst-native bc-native"
+DEPENDS += "bc-native openssl openssl-native qoriq-cst-native rcw u-boot u-boot-mkimage-native"
 do_compile[depends] += "u-boot:do_deploy rcw:do_deploy uefi:do_deploy"
 PV:append = "+${SRCPV}"
 SRC_URI += "git://github.com/ARMmbed/mbedtls;protocol=https;nobranch=1;destsuffix=${S}/mbedtls;name=mbedtls \
-    git://github.com/nxp/ddr-phy-binary;protocol=https;nobranch=1;destsuffix=${S}/ddr-phy-binary;name=ddr \
+            git://github.com/nxp/ddr-phy-binary;protocol=https;nobranch=1;destsuffix=${S}/ddr-phy-binary;name=ddr \
 "
 SRCREV_mbedtls = "0795874acdf887290b2571b193cafd3c4041a708"
 SRCREV_ddr = "fbc036b88acb6c06ffed02c898cbae9856ec75ba"
@@ -68,7 +68,7 @@ EXTRA_OEMAKE += "\
    ${@bb.utils.contains('DISTRO_FEATURES', 'fuse', 'fip_fuse FUSE_PROG=1 FUSE_PROV_FILE=fuse_scr.bin', '', d)} \
 "
-PACKAGECONFIG ??= " \
+PACKAGECONFIG ??= "\
    ${@bb.utils.filter('COMBINED_FEATURES', 'optee', d)} \
 "
 PACKAGECONFIG[optee] = ",,optee-os-qoriq"
@@ -120,10 +120,10 @@ do_compile() {
        flexspi_nor)
            rcwimg="${RCWXSPI}${RCW_SUFFIX}"
            uefiboot="${UEFI_XSPIBOOT}"
-            ;;        
+            ;;
        esac
-            
-        if [ -f ${DEPLOY_DIR_IMAGE}/rcw/${RCW_FOLDER}/$rcwimg ]; then
+    if [ -f ${DEPLOY_DIR_IMAGE}/rcw/${RCW_FOLDER}/$rcwimg ]; then
            make V=1 realclean
            if [ -f rot_key.pem ];then
                mkdir -p build/${PLATFORM}/release/
@@ -168,13 +168,13 @@ do_compile() {
 do_install() {
    install -d ${D}/boot/atf/
-    cp srk.pri ${D}/boot/atf/
+    install -m 0644 srk.pri ${D}/boot/atf/
-    cp srk.pub ${D}/boot/atf/
+    install -m 0644 srk.pub ${D}/boot/atf/
-    cp *.pbl ${D}/boot/atf/
+    install -m 0644 *.pbl ${D}/boot/atf/
    if [ ! -e fuse_fip.bin ]; then
        rm -f fuse_scr.bin
    fi
-    cp *.bin ${D}/boot/atf/
+    install -m 0644 *.bin ${D}/boot/atf/
    chown -R root:root ${D}
 }
diff --git a/recipes-bsp/boot-format/boot-format_git.bb b/recipes-bsp/boot-format/boot-format_git.bb
index 6b53e228f..f9c7c5bbe 100644
--- a/recipes-bsp/boot-format/boot-format_git.bb
+++ b/recipes-bsp/boot-format/boot-format_git.bb
@@ -1,4 +1,5 @@
 DESCRIPTION = "Boot format utility for booting from eSDHC/eSPI"
+HOMEPAGE = "https://github.com/nxp-qoriq-yocto-sdk/boot-format"
 LICENSE = "GPL-2.0-only"
 PR = "r6"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
@@ -10,7 +11,7 @@ SRCREV = "4eb81a6797ef4e58bf7d9b2d58afb37a21c1f550"
 EXTRA_OEMAKE = 'CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"'
 do_install(){
-        oe_runmake DESTDIR=${D} PREFIX=${prefix} install
+    oe_runmake DESTDIR=${D} PREFIX=${prefix} install
 }
 PACKAGES =+ "${PN}-config"
diff --git a/recipes-bsp/ddr-phy/ddr-phy_git.bb b/recipes-bsp/ddr-phy/ddr-phy_git.bb
index 5cfeb935e..5e7126e56 100644
--- a/recipes-bsp/ddr-phy/ddr-phy_git.bb
+++ b/recipes-bsp/ddr-phy/ddr-phy_git.bb
@@ -1,16 +1,19 @@
 SUMMARY = "DDR firmware repository"
+DESCRIPTION = "DDR PHY training firmware binaries for NXP LX2160A/LX2162A SoCs"
+HOMEPAGE = "https://github.com/nxp/ddr-phy-binary"
+SECTION = "firmware"
 LICENSE = "NXP-Binary-EULA"
 LIC_FILES_CHKSUM = "file://NXP-Binary-EULA.txt;md5=89cc852481956e861228286ac7430d74"
 inherit deploy
+DEPENDS += "qoriq-atf-tools-native"
 SRC_URI = "git://github.com/nxp/ddr-phy-binary.git;nobranch=1;protocol=https"
 SRCREV = "fbc036b88acb6c06ffed02c898cbae9856ec75ba"
 REGLEX = "lx2160a"
-DEPENDS += "qoriq-atf-tools-native"
 do_compile() {
    cd ${S}/${REGLEX}
    fiptool create --ddr-immem-udimm-1d ddr4_pmu_train_imem.bin \
@@ -35,8 +38,9 @@ do_deploy () {
 }
 addtask deploy before do_populate_sysroot after do_install
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 PACKAGES += "${PN}-image"
 FILES:${PN}-image += "/boot"
 COMPATIBLE_MACHINE = "(lx2160a|lx2162a)"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-bsp/dp-firmware-cadence/dp-firmware-cadence_22.04.bb b/recipes-bsp/dp-firmware-cadence/dp-firmware-cadence_22.04.bb
index 79fff49e6..e5fbc9d7a 100644
--- a/recipes-bsp/dp-firmware-cadence/dp-firmware-cadence_22.04.bb
+++ b/recipes-bsp/dp-firmware-cadence/dp-firmware-cadence_22.04.bb
@@ -1,4 +1,7 @@
 SUMMARY = "DP firmware"
+DESCRIPTION = "Cadence DisplayPort (HDP) firmware for i.MX8 SoCs."
+HOMEPAGE = "https://www.nxp.com/"
+SECTION = "bsp"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d3c315c6eaa43e07d8c130dc3a04a011"
@@ -21,8 +24,9 @@ do_deploy () {
 }
 addtask deploy before do_build after do_install
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 PACKAGES += "${PN}-image"
 FILES:${PN}-image += "/boot"
 COMPATIBLE_MACHINE = "(qoriq-arm64)"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-bsp/firmware-imx/firmware-ele-imx_2.0.5.bb b/recipes-bsp/firmware-imx/firmware-ele-imx_2.0.5.bb
index 0f6edf28b..d2b731ac5 100644
--- a/recipes-bsp/firmware-imx/firmware-ele-imx_2.0.5.bb
+++ b/recipes-bsp/firmware-imx/firmware-ele-imx_2.0.5.bb
@@ -1,6 +1,7 @@
 # Copyright 2021-2026 NXP
 SUMMARY = "NXP i.MX ELE firmware"
 DESCRIPTION = "EdgeLock Secure Enclave firmware for i.MX series SoCs"
+HOMEPAGE = "https://www.nxp.com/"
 SECTION = "base"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.31.bb b/recipes-bsp/firmware-imx/firmware-imx_8.31.bb
index 0847a96c0..288fa13bc 100644
--- a/recipes-bsp/firmware-imx/firmware-imx_8.31.bb
+++ b/recipes-bsp/firmware-imx/firmware-imx_8.31.bb
@@ -164,7 +164,7 @@ PACKAGES_DYNAMIC = "${PN}-vpu-* ${PN}-sdma-* ${PN}-easrc-* ${PN}-xcvr-* ${PN}-xu
 PACKAGES = "${PN} ${PN}-epdc ${PN}-hdmi ${PN}-vpu-amphion ${PN}-vpu-coda980 ${PN}-vpu-wave511 ${PN}-vpu-wave"
 FILES:${PN}-epdc = "${nonarch_base_libdir}/firmware/imx/epdc/"
-FILES:${PN}-hdmi = " \
+FILES:${PN}-hdmi = "\
    ${nonarch_base_libdir}/firmware/hdmitxfw.bin \
    ${nonarch_base_libdir}/firmware/hdmirxfw.bin \
    ${nonarch_base_libdir}/firmware/dpfw.bin \
diff --git a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb
index 58b69bae8..ffe86d15c 100644
--- a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb
+++ b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb
@@ -2,8 +2,9 @@
 SUMMARY = "Wi-Fi firmware redistributed by NXP"
 DESCRIPTION = "Additional Wi-Fi firmware redistributed by NXP. Some \
-is available in linux-firmware, but what is here is the latest and \
+               is available in linux-firmware, but what is here is the latest and \
-should be preferred."
+               should be preferred."
+HOMEPAGE = "https://github.com/nxp-imx/imx-firmware"
 SECTION = "kernel"
 LICENSE = "Proprietary"
@@ -37,7 +38,7 @@ do_install() {
    ln -frs ${D}${nonarch_base_libdir}/firmware/nxp/sduartiw416_combo.bin ${D}${nonarch_base_libdir}/firmware/nxp/sdiouartiw416_combo_v0.bin
 }
-PACKAGES =+ " \
+PACKAGES =+ "\
    ${PN}-all-pcie \
    ${PN}-all-sdio \
    ${PN}-all-usb \
@@ -55,7 +56,7 @@ PACKAGES =+ " \
    ${PN}-nxpiw612-sdio \
 "
-RDEPENDS:${PN}-all-sdio = " \
+RDEPENDS:${PN}-all-sdio = "\
    ${PN}-nxp8987-sdio \
    ${PN}-nxp8997-sdio \
    ${PN}-nxp9098-sdio \
@@ -64,21 +65,21 @@ RDEPENDS:${PN}-all-sdio = " \
    ${PN}-nxpiw612-sdio \
 "
-RDEPENDS:${PN}-all-pcie = " \
+RDEPENDS:${PN}-all-pcie = "\
    ${PN}-nxp9098-pcie \
    ${PN}-nxpaw693-pcie \
 "
-RDEPENDS:${PN}-all-usb = " \
+RDEPENDS:${PN}-all-usb = "\
    ${PN}-nxpiw610-usb \
 "
-FILES:${PN}-nxp-common = " \
+FILES:${PN}-nxp-common = "\
    ${nonarch_base_libdir}/firmware/nxp/wifi_mod_para.conf \
    ${nonarch_base_libdir}/firmware/nxp/helper_uart_3000000.bin \
 "
-FILES:${PN}-nxp8987-sdio = " \
+FILES:${PN}-nxp8987-sdio = "\
    ${nonarch_base_libdir}/firmware/nxp/*8987* \
 "
 RDEPENDS:${PN}-nxp8987-sdio += "${PN}-nxp-common"
@@ -86,11 +87,11 @@ RPROVIDES:${PN}-nxp8987-sdio = "linux-firmware-nxp8987-sdio"
 RREPLACES:${PN}-nxp8987-sdio = "linux-firmware-nxp8987-sdio"
 RCONFLICTS:${PN}-nxp8987-sdio = "linux-firmware-nxp8987-sdio"
-FILES:${PN}-nxp8997-sdio = " \
+FILES:${PN}-nxp8997-sdio = "\
    ${nonarch_base_libdir}/firmware/mrvl/sdiouart8997_combo_v4.bin \
 "
-FILES:${PN}-nxp9098-common = " \
+FILES:${PN}-nxp9098-common = "\
    ${nonarch_base_libdir}/firmware/nxp/ed_mac_ctrl_V3_909x.conf \
    ${nonarch_base_libdir}/firmware/nxp/txpwrlimit_cfg_9098.conf \
    ${nonarch_base_libdir}/firmware/nxp/uart9098_bt_v1.bin \
@@ -100,7 +101,7 @@ RPROVIDES:${PN}-nxp9098-common = "linux-firmware-nxp9098-common"
 RREPLACES:${PN}-nxp9098-common = "linux-firmware-nxp9098-common"
 RCONFLICTS:${PN}-nxp9098-common = "linux-firmware-nxp9098-common"
-FILES:${PN}-nxp9098-pcie = " \
+FILES:${PN}-nxp9098-pcie = "\
    ${nonarch_base_libdir}/firmware/nxp/pcie*9098* \
 "
 RDEPENDS:${PN}-nxp9098-pcie += "${PN}-nxp9098-common"
@@ -108,7 +109,7 @@ RPROVIDES:${PN}-nxp9098-pcie = "linux-firmware-nxp9098-pcie"
 RREPLACES:${PN}-nxp9098-pcie = "linux-firmware-nxp9098-pcie"
 RCONFLICTS:${PN}-nxp9098-pcie = "linux-firmware-nxp9098-pcie"
-FILES:${PN}-nxp9098-sdio = " \
+FILES:${PN}-nxp9098-sdio = "\
    ${nonarch_base_libdir}/firmware/nxp/sd*9098* \
 "
 RDEPENDS:${PN}-nxp9098-sdio += "${PN}-nxp9098-common"
@@ -116,13 +117,13 @@ RPROVIDES:${PN}-nxp9098-sdio = "linux-firmware-nxp9098-sdio"
 RREPLACES:${PN}-nxp9098-sdio = "linux-firmware-nxp9098-sdio"
 RCONFLICTS:${PN}-nxp9098-sdio = "linux-firmware-nxp9098-sdio"
-FILES:${PN}-nxpaw693-pcie += " \
+FILES:${PN}-nxpaw693-pcie += "\
    ${nonarch_base_libdir}/firmware/nxp/pcie*aw693* \
    ${nonarch_base_libdir}/firmware/nxp/uart*aw693* \
 "
 RDEPENDS:${PN}-nxpaw693-pcie += "${PN}-nxp-common"
-FILES:${PN}-nxpiw416-sdio = " \
+FILES:${PN}-nxpiw416-sdio = "\
    ${nonarch_base_libdir}/firmware/mrvl/sdiouartiw416_combo_v0.bin \
    ${nonarch_base_libdir}/firmware/nxp/*iw416* \
 "
@@ -131,7 +132,7 @@ RPROVIDES:${PN}-nxpiw416-sdio = "linux-firmware-nxpiw416-sdio"
 RREPLACES:${PN}-nxpiw416-sdio = "linux-firmware-nxpiw416-sdio"
 RCONFLICTS:${PN}-nxpiw416-sdio = "linux-firmware-nxpiw416-sdio"
-FILES:${PN}-nxpiw610-sdio += " \
+FILES:${PN}-nxpiw610-sdio += "\
    ${nonarch_base_libdir}/firmware/nxp/sd_iw610.bin.se \
    ${nonarch_base_libdir}/firmware/nxp/sduart_iw610.bin.se \
    ${nonarch_base_libdir}/firmware/nxp/sduartspi_iw610.bin.se \
@@ -143,12 +144,12 @@ RPROVIDES:${PN}-nxpiw610-sdio = "linux-firmware-nxpiw610-sdio"
 RREPLACES:${PN}-nxpiw610-sdio = "linux-firmware-nxpiw610-sdio"
 RCONFLICTS:${PN}-nxpiw610-sdio = "linux-firmware-nxpiw610-sdio"
-FILES:${PN}-nxpiw610-usb += " \
+FILES:${PN}-nxpiw610-usb += "\
    ${nonarch_base_libdir}/firmware/nxp/usb*_iw610.bin.se \
 "
 RDEPENDS:${PN}-nxpiw610-usb += "${PN}-nxp-common"
-FILES:${PN}-nxpiw612-sdio = " \
+FILES:${PN}-nxpiw612-sdio = "\
    ${nonarch_base_libdir}/firmware/nxp/sd_w61x_v1.bin.se \
    ${nonarch_base_libdir}/firmware/nxp/sduart_nw61x_*.bin.se \
    ${nonarch_base_libdir}/firmware/nxp/uartspi_n61x_*.bin.se \
diff --git a/recipes-bsp/firmware-imx/firmware-sof-imx_2.3.0.bb b/recipes-bsp/firmware-imx/firmware-sof-imx_2.3.0.bb
index 7c5022761..84e00a32c 100644
--- a/recipes-bsp/firmware-imx/firmware-sof-imx_2.3.0.bb
+++ b/recipes-bsp/firmware-imx/firmware-sof-imx_2.3.0.bb
@@ -1,7 +1,8 @@
 # Copyright (C) 2020-2022 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
-DESCRIPTION = "Sound Open Firmware"
+SUMMARY = "Sound Open Firmware for i.MX"
+DESCRIPTION = "Sound Open Firmware (SOF) audio DSP firmware for i.MX SoCs."
 HOMEPAGE = "https://www.sofproject.org"
 SECTION = "base"
 LICENSE = "BSD-3-Clause"
diff --git a/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.31.bb b/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.31.bb
index 53edf58bd..87569b4a3 100644
--- a/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.31.bb
+++ b/recipes-bsp/firmware-imx/imx-boot-firmware-files_8.31.bb
@@ -1,5 +1,6 @@
 # Copyright (C) 2018-2026 NXP
 SUMMARY = "Freescale i.MX Firmware files used for boot"
+DESCRIPTION = "Prebuilt i.MX firmware blobs (HDMI, SECO and related) used during boot."
 require firmware-imx-${PV}.inc
@@ -7,10 +8,10 @@ inherit deploy nopackages
 do_install[noexec] = "1"
-DEPLOY_FOR                  = ""
+DEPLOY_FOR = ""
-DEPLOY_FOR:mx8-generic-bsp  = "mx8"
+DEPLOY_FOR:mx8-generic-bsp = "mx8"
 DEPLOY_FOR:mx8m-generic-bsp = "mx8m"
-DEPLOY_FOR:mx9-generic-bsp  = "mx9"
+DEPLOY_FOR:mx9-generic-bsp = "mx9"
 deploy_for_mx8() {
    # Cadence HDMI
@@ -30,7 +31,6 @@ deploy_for_mx8m() {
    install -m 0644 ${S}/firmware/hdmi/cadence/signed_hdmi_imx8m.bin ${DEPLOYDIR}
 }
 deploy_for_mx9() {
    # Synopsys DDR
    for ddr_firmware in ${DDR_FIRMWARE_NAME}; do
@@ -57,5 +57,5 @@ addtask deploy after do_install before do_build
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
-COMPATIBLE_MACHINE                  = "(mx8-generic-bsp|mx9-generic-bsp)"
+COMPATIBLE_MACHINE = "(mx8-generic-bsp|mx9-generic-bsp)"
 COMPATIBLE_MACHINE:mx8x-generic-bsp = "(^$)"
diff --git a/recipes-bsp/firmware-upower/firmware-upower_1.3.1.bb b/recipes-bsp/firmware-upower/firmware-upower_1.3.1.bb
index 2b5a9f50d..6337f98ae 100644
--- a/recipes-bsp/firmware-upower/firmware-upower_1.3.1.bb
+++ b/recipes-bsp/firmware-upower/firmware-upower_1.3.1.bb
@@ -1,7 +1,9 @@
 # Copyright 2021-2022 NXP
-DESCRIPTION = "NXP i.MX uPower firmware"
+SUMMARY = "i.MX uPower firmware"
+DESCRIPTION = "Firmware for the uPower microcontroller found on i.MX SoCs."
+HOMEPAGE = "https://www.nxp.com/"
+SECTION = "bsp"
 LICENSE = "Proprietary"
-SECTION = "BSP"
 LIC_FILES_CHKSUM = "file://COPYING;md5=db4762b09b6bda63da103963e6e081de"
 SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true"
diff --git a/recipes-bsp/fsl-tlu/fsl-tlu_1.0.0.bb b/recipes-bsp/fsl-tlu/fsl-tlu_1.0.0.bb
index 260b01001..2179df61b 100644
--- a/recipes-bsp/fsl-tlu/fsl-tlu_1.0.0.bb
+++ b/recipes-bsp/fsl-tlu/fsl-tlu_1.0.0.bb
@@ -1,6 +1,7 @@
 SUMMARY = "Freescale TLU(Table Lookup Unit) test package"
 DESCRIPTION = "This package includes the TLU(Table Lookup Unit) test scripts \
-and configuration files."
+               and configuration files."
+HOMEPAGE = "https://github.com/nxp-qoriq-yocto-sdk/fsl-tlu"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8a71d0475d08eee76d8b6d0c6dbec543"
@@ -10,9 +11,8 @@ SRCREV = "8837cce3c86b30c0931c319e9e1a8ca622ae5354"
 do_install() {
    install -d ${D}${sbindir}/fsl_tlu
-    find . -type f -exec cp {} ${D}${sbindir}/fsl_tlu/ \;
+    find . -type f -exec install -m 0644 {} ${D}${sbindir}/fsl_tlu/ \;
 }
 COMPATIBLE_MACHINE = "(e500mc)"
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
diff --git a/recipes-bsp/imx-atf/imx-atf_2.12.bb b/recipes-bsp/imx-atf/imx-atf_2.12.bb
index 7cef23416..5b84d91d1 100644
--- a/recipes-bsp/imx-atf/imx-atf_2.12.bb
+++ b/recipes-bsp/imx-atf/imx-atf_2.12.bb
@@ -1,14 +1,16 @@
 # Copyright (C) 2017-2026 NXP
-DESCRIPTION = "i.MX ARM Trusted Firmware"
+SUMMARY = "ARM Trusted Firmware for i.MX"
-SECTION = "BSP"
+DESCRIPTION = "ARM Trusted Firmware (TF-A) for NXP i.MX SoCs."
+HOMEPAGE = "https://github.com/nxp-imx/imx-atf"
+SECTION = "bsp"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9"
 PV .= "+git${SRCPV}"
 SRC_URI = "${ATF_SRC};branch=${SRCBRANCH} \
-           file://0001-scmi-imx9-Remove-unused-tmp-pointer.patch \
+           file://0001-scmi-imx9-Remove-unused-tmp-pointer.patch \
 "
 ATF_SRC ?= "git://github.com/nxp-imx/imx-atf.git;protocol=https"
 SRCBRANCH = "lf_v2.12"
@@ -16,7 +18,7 @@ SRCREV = "4a2e9ef5f9f185bda68470b46365add008903b8c"
 inherit deploy
-PACKAGECONFIG ??= " \
+PACKAGECONFIG ??= "\
    ${@bb.utils.filter('UBOOT_CONFIG', 'crrm', d)} \
    ${@bb.utils.filter('MACHINE_FEATURES', 'optee', d)}"
@@ -30,7 +32,7 @@ ATF_PLATFORM ??= "INVALID"
 # base address in source code.
 ATF_BOOT_UART_BASE ?= ""
-EXTRA_OEMAKE += " \
+EXTRA_OEMAKE += "\
    CROSS_COMPILE=${TARGET_PREFIX} \
    PLAT=${ATF_PLATFORM} \
    ${PACKAGECONFIG_CONFARGS} \
@@ -69,7 +71,7 @@ do_configure[noexec] = "1"
 do_install[noexec] = "1"
-ANNOTATED_NAME        = "bl31-${ATF_PLATFORM}.bin"
+ANNOTATED_NAME = "bl31-${ATF_PLATFORM}.bin"
 ANNOTATED_NAME:append = "${@bb.utils.contains('PACKAGECONFIG',  'crrm',  '-crrm', '', d)}"
 ANNOTATED_NAME:append = "${@bb.utils.contains('PACKAGECONFIG', 'optee', '-optee', '', d)}"
diff --git a/recipes-bsp/imx-kobs/imx-kobs_git.bb b/recipes-bsp/imx-kobs/imx-kobs_git.bb
index 9c00a05b1..346e50950 100644
--- a/recipes-bsp/imx-kobs/imx-kobs_git.bb
+++ b/recipes-bsp/imx-kobs/imx-kobs_git.bb
@@ -3,6 +3,7 @@
 # Copyright 2018 (C) O.S. Systems Software LTDA.
 SUMMARY = "Nand boot write source"
+HOMEPAGE = "https://github.com/NXPmicro/imx-kobs"
 SECTION = "base"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=393a5ca445f6965873eca0259a17f833"
diff --git a/recipes-bsp/imx-lib/imx-lib_git.bb b/recipes-bsp/imx-lib/imx-lib_git.bb
index 0aa74250f..837df109a 100644
--- a/recipes-bsp/imx-lib/imx-lib_git.bb
+++ b/recipes-bsp/imx-lib/imx-lib_git.bb
@@ -3,6 +3,7 @@
 # Copyright 2017 NXP
 DESCRIPTION = "Platform specific libraries for imx platform"
+HOMEPAGE = "https://github.com/nxp-imx/imx-lib"
 LICENSE = "LGPL-2.1-only"
 SECTION = "multimedia"
@@ -18,19 +19,19 @@ SRCREV = "6cad1ba39d16247088f6a45dc07bbbf2cf96a332"
 inherit use-imx-headers
-PLATFORM:mx6q-nxp-bsp   = "IMX6Q"
+PLATFORM:mx6q-nxp-bsp = "IMX6Q"
-PLATFORM:mx6dl-nxp-bsp  = "IMX6Q"
+PLATFORM:mx6dl-nxp-bsp = "IMX6Q"
-PLATFORM:mx6sl-nxp-bsp  = "IMX6S"
+PLATFORM:mx6sl-nxp-bsp = "IMX6S"
 PLATFORM:mx6sll-nxp-bsp = "IMX6UL"
-PLATFORM:mx6sx-nxp-bsp  = "IMX6S"
+PLATFORM:mx6sx-nxp-bsp = "IMX6S"
-PLATFORM:mx6ul-nxp-bsp  = "IMX6UL"
+PLATFORM:mx6ul-nxp-bsp = "IMX6UL"
 PLATFORM:mx6ull-nxp-bsp = "IMX6UL"
-PLATFORM:mx7d-nxp-bsp   = "IMX7"
+PLATFORM:mx7d-nxp-bsp = "IMX7"
 PLATFORM:mx7ulp-nxp-bsp = "IMX7"
 PLATFORM:mx8ulp-nxp-bsp = "IMX8ULP"
-PLATFORM:mx9-nxp-bsp    = "IMX8ULP"
+PLATFORM:mx9-nxp-bsp = "IMX8ULP"
-PLATFORM:mx93-nxp-bsp   = "IMX8ULP"
+PLATFORM:mx93-nxp-bsp = "IMX8ULP"
-PLATFORM:mx943-nxp-bsp  = "IMX8ULP"
+PLATFORM:mx943-nxp-bsp = "IMX8ULP"
 PARALLEL_MAKE = "-j 1"
 EXTRA_OEMAKE = ""
diff --git a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
index fcc8f84b3..59fe5854f 100644
--- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
+++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
@@ -2,10 +2,12 @@
 require imx-mkimage_git.inc
+SUMMARY = "Boot loader image for i.MX 8 devices"
 DESCRIPTION = "Generate Boot Loader for i.MX 8 device"
+HOMEPAGE = "https://github.com/nxp-imx/imx-mkimage"
+SECTION = "bsp"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
-SECTION = "BSP"
 DEPENDS += "xxd-native"
 DEPENDS:append:mx8m-generic-bsp = " u-boot-mkimage-native dtc-native u-boot-mkeficapsule-native"
@@ -14,7 +16,7 @@ DEPENDS:append:mx95-generic-bsp = " u-boot-mkeficapsule-native"
 # This package aggregates output deployed by other packages,
 # so set the appropriate dependencies
-DEPENDS += " \
+DEPENDS += "\
    virtual/bootloader \
    ${IMX_EXTRA_FIRMWARE} \
    imx-atf \
@@ -25,7 +27,7 @@ DEPENDS += " \
 do_compile[deptask] = "do_deploy"
 do_compile[depends] += "${@bb.utils.contains('UBOOT_CONFIG', 'crrm', '${CRRM_INITRAMFS}:do_build', '', d)}"
-CRRM_DEPLOY_DEPENDS ?= " \
+CRRM_DEPLOY_DEPENDS ?= "\
    virtual/kernel \
    ${CRRM_INITRAMFS}"
 CRRM_INITRAMFS ??= "imx-image-crrm-initramfs"
@@ -50,7 +52,7 @@ BOOT_VARIANT ?= ""
 TOOLS_NAME ?= "mkimage_imx8"
-IMX_BOOT_SOC_TARGET       ?= "INVALID"
+IMX_BOOT_SOC_TARGET ?= "INVALID"
 DEPLOY_OPTEE = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'true', 'false', d)}"
 DEPLOY_OPTEE_STMM = "${@bb.utils.contains('MACHINE_FEATURES', 'optee stmm', 'true', 'false', d)}"
@@ -60,51 +62,51 @@ IMXBOOT_TARGETS ?= \
        bb.utils.contains('UBOOT_CONFIG', 'nand', 'flash_nand', \
                                                  'flash_multi_cores flash_dcd', d), d)}"
-BOOT_STAGING       = "${S}/${IMX_BOOT_SOC_TARGET}"
+BOOT_STAGING = "${S}/${IMX_BOOT_SOC_TARGET}"
-BOOT_STAGING:mx8m-generic-bsp  = "${S}/iMX8M"
+BOOT_STAGING:mx8m-generic-bsp = "${S}/iMX8M"
 BOOT_STAGING:mx8dx-generic-bsp = "${S}/iMX8QX"
-BOOT_STAGING:mx91-generic-bsp  = "${S}/iMX91"
+BOOT_STAGING:mx91-generic-bsp = "${S}/iMX91"
-BOOT_STAGING:mx93-generic-bsp  = "${S}/iMX93"
+BOOT_STAGING:mx93-generic-bsp = "${S}/iMX93"
 BOOT_STAGING:mx943-generic-bsp = "${S}/iMX94"
-BOOT_STAGING:mx95-generic-bsp  = "${S}/iMX95"
+BOOT_STAGING:mx95-generic-bsp = "${S}/iMX95"
-SOC_FAMILY                    = "INVALID"
+SOC_FAMILY = "INVALID"
-SOC_FAMILY:mx8-generic-bsp    = "mx8"
+SOC_FAMILY:mx8-generic-bsp = "mx8"
-SOC_FAMILY:mx8m-generic-bsp   = "mx8m"
+SOC_FAMILY:mx8m-generic-bsp = "mx8m"
-SOC_FAMILY:mx8x-generic-bsp   = "mx8x"
+SOC_FAMILY:mx8x-generic-bsp = "mx8x"
 SOC_FAMILY:mx8ulp-generic-bsp = "mx8ulp"
-SOC_FAMILY:mx91-generic-bsp   = "mx91"
+SOC_FAMILY:mx91-generic-bsp = "mx91"
-SOC_FAMILY:mx93-generic-bsp   = "mx93"
+SOC_FAMILY:mx93-generic-bsp = "mx93"
-SOC_FAMILY:mx943-generic-bsp  = "mx943"
+SOC_FAMILY:mx943-generic-bsp = "mx943"
-SOC_FAMILY:mx95-generic-bsp   = "mx95"
+SOC_FAMILY:mx95-generic-bsp = "mx95"
 REV_OPTION ?= "REV=${IMX_SOC_REV_UPPER}"
 MKIMAGE_EXTRA_ARGS ?= ""
-MKIMAGE_EXTRA_ARGS:mx943-nxp-bsp ?= " \
+MKIMAGE_EXTRA_ARGS:mx943-nxp-bsp ?= "\
    OEI=YES \
    LPDDR_TYPE=${DDR_TYPE} \
    MSEL=${MSEL_TYPE} \
 "
-MKIMAGE_EXTRA_ARGS:mx95-nxp-bsp ?= " \
+MKIMAGE_EXTRA_ARGS:mx95-nxp-bsp ?= "\
    OEI=YES \
    LPDDR_TYPE=${DDR_TYPE} \
    ${@'LPDDR_FW_VERSION='+d.getVar('LPDDR_FW_VERSION') if d.getVar('LPDDR_FW_VERSION') else ''} \
    ${@bb.utils.contains('SYSTEM_MANAGER_CONFIG', 'mx95alt', 'MSEL=1', '', d)}"
-MKIMAGE_EXTRA_ARGS:imx95-19x19-lpddr5-frdm-pro ?= " \
+MKIMAGE_EXTRA_ARGS:imx95-19x19-lpddr5-frdm-pro ?= "\
    ${MKIMAGE_EXTRA_ARGS:mx95-nxp-bsp} \
    QSPI_HEADER=./scripts/fspi_header-W25Q512NWEIQ"
-MKIMAGE_EXTRA_ARGS:imx95-19x19-verdin ?= " \
+MKIMAGE_EXTRA_ARGS:imx95-19x19-verdin ?= "\
    ${MKIMAGE_EXTRA_ARGS:mx95-nxp-bsp} \
    QSPI_HEADER=./scripts/fspi_header_133"
-MKIMAGE_EXTRA_ARGS:imx95-a1-19x19-verdin ?= " \
+MKIMAGE_EXTRA_ARGS:imx95-a1-19x19-verdin ?= "\
    ${MKIMAGE_EXTRA_ARGS:imx95-19x19-verdin} \
 "
 UBOOT_DTB_BINARY ?= "u-boot.dtb"
-CRRM_FILES = " \
+CRRM_FILES = "\
    ${KERNEL_IMAGETYPE}.gz \
    ${KERNEL_IMAGETYPE}_crrm.gz \
    ${KERNEL_DEVICETREE_BASENAME}.dtb \
diff --git a/recipes-bsp/imx-mkimage/imx-mkimage_git.bb b/recipes-bsp/imx-mkimage/imx-mkimage_git.bb
index 282bc45a1..65f65002c 100644
--- a/recipes-bsp/imx-mkimage/imx-mkimage_git.bb
+++ b/recipes-bsp/imx-mkimage/imx-mkimage_git.bb
@@ -3,10 +3,12 @@
 require imx-mkimage_git.inc
-DESCRIPTION = "i.MX make image"
+SUMMARY = "i.MX boot image generation tool"
+DESCRIPTION = "Tooling to assemble i.MX boot images (mkimage_imx8 and related)."
+HOMEPAGE = "https://github.com/nxp-imx/imx-mkimage"
+SECTION = "bsp"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
-SECTION = "BSP"
 inherit deploy native
diff --git a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
index 4a4efae01..b8d5d58cc 100644
--- a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
+++ b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
@@ -1,6 +1,6 @@
 # Copyright 2017-2026 NXP
- 
-DEPENDS = "zlib-native openssl-native"
+DEPENDS = "openssl-native zlib-native"
 SRC_URI = "${IMX_MKIMAGE_SRC};branch=${SRCBRANCH} \
           file://0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch \
diff --git a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.18.0.bb b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.18.0.bb
index 42e8f6e19..baee026e4 100644
--- a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.18.0.bb
+++ b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.18.0.bb
@@ -1,10 +1,12 @@
 # Copyright (C) 2016 Freescale Semiconductor
 # Copyright (C) 2017-2024 NXP
-DESCRIPTION = "i.MX System Controller Firmware"
+SUMMARY = "i.MX System Controller firmware"
+DESCRIPTION = "System Controller Unit (SCU) firmware for i.MX8 QuadMax/QuadXPlus SoCs."
+HOMEPAGE = "https://www.nxp.com/"
+SECTION = "bsp"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
-SECTION = "BSP"
 inherit fsl-eula-unpack pkgconfig deploy
diff --git a/recipes-bsp/imx-seco/imx-seco-libs_git.bb b/recipes-bsp/imx-seco/imx-seco-libs_git.bb
index fe366aacb..83d6dd13f 100644
--- a/recipes-bsp/imx-seco/imx-seco-libs_git.bb
+++ b/recipes-bsp/imx-seco/imx-seco-libs_git.bb
@@ -2,6 +2,7 @@
 SUMMARY = "NXP i.MX SECO library"
 DESCRIPTION = "Library for NXP i.MX Security Controller Subsystem"
+HOMEPAGE = "https://github.com/NXP/imx-seco-libs"
 SECTION = "base"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://EULA.txt;md5=d3c315c6eaa43e07d8c130dc3a04a011"
diff --git a/recipes-bsp/imx-secure-enclave/imx-secure-enclave.inc b/recipes-bsp/imx-secure-enclave/imx-secure-enclave.inc
index bb045b6fb..12dc1c31b 100644
--- a/recipes-bsp/imx-secure-enclave/imx-secure-enclave.inc
+++ b/recipes-bsp/imx-secure-enclave/imx-secure-enclave.inc
@@ -2,11 +2,12 @@
 SUMMARY = "NXP i.MX SECURE ENCLAVE library"
 DESCRIPTION = "NXP IMX SECURE ENCLAVE library"
+HOMEPAGE = "https://github.com/NXP/imx-secure-enclave"
 SECTION = "base"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=8636bd68fc00cc6a3809b7b58b45f982"
-DEPENDS = " mbedtls openssl"
+DEPENDS = "mbedtls openssl"
 SRC_URI = "${SECURE_ENCLAVE_LIB_SRC};branch=${SRCBRANCH}"
 SECURE_ENCLAVE_LIB_SRC ?= "git://github.com/NXP/imx-secure-enclave.git;protocol=https"
@@ -20,7 +21,7 @@ EXTRA_OEMAKE = "PLAT=${PLAT} OPENSSL_PATH=${STAGING_INCDIR} MBEDTLS_PATH=${STAGI
 TARGET_CC_ARCH += "${LDFLAGS}"
 do_install() {
-        oe_runmake -C ${S} DESTDIR=${D} install_tests
+    oe_runmake -C ${S} DESTDIR=${D} install_tests
 }
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
diff --git a/recipes-bsp/imx-secure-enclave/imx-secure-enclave_git.bb b/recipes-bsp/imx-secure-enclave/imx-secure-enclave_git.bb
index 647a9d768..7095ce7a1 100644
--- a/recipes-bsp/imx-secure-enclave/imx-secure-enclave_git.bb
+++ b/recipes-bsp/imx-secure-enclave/imx-secure-enclave_git.bb
@@ -11,7 +11,7 @@ PACKAGES =+ "${PN}-crrm"
 RDEPENDS:${PN} = "${@bb.utils.contains('UBOOT_CONFIG', 'crrm', '${PN}-crrm', '', d)}"
-FILES:${PN}-crrm = " \
+FILES:${PN}-crrm = "\
    ${bindir}/ele_crrm_test \
    ${libdir}/lib*crrm${SOLIBS}"
diff --git a/recipes-bsp/imx-test/imx-test_00.00.00.bb b/recipes-bsp/imx-test/imx-test_00.00.00.bb
index 1850a16ae..70b6988fc 100644
--- a/recipes-bsp/imx-test/imx-test_00.00.00.bb
+++ b/recipes-bsp/imx-test/imx-test_00.00.00.bb
@@ -1,5 +1,6 @@
 SUMMARY = "Dummy package for SoCs lacking imx-test package"
 DESCRIPTION = "Dummy package for SoCs lacking imx-test package"
+HOMEPAGE = "https://github.com/nxp-imx/imx-test"
 SECTION = "base"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
diff --git a/recipes-bsp/imx-test/imx-test_git.bb b/recipes-bsp/imx-test/imx-test_git.bb
index c5dc6ef50..9007a655c 100644
--- a/recipes-bsp/imx-test/imx-test_git.bb
+++ b/recipes-bsp/imx-test/imx-test_git.bb
@@ -4,17 +4,18 @@
 SUMMARY = "Test programs for i.MX BSP"
 DESCRIPTION = "Unit tests for the i.MX BSP"
+HOMEPAGE = "https://github.com/nxp-imx/imx-test"
 SECTION = "base"
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-or-later;md5=fed54355545ffd980b814dab4a3b312c"
 DEPENDS = "alsa-lib freetype libdrm"
 DEPENDS:append:imxvpu = " virtual/imxvpu"
-DEPENDS:append:mx6-nxp-bsp    = " imx-lib"
+DEPENDS:append:mx6-nxp-bsp = " imx-lib"
-DEPENDS:append:mx7-nxp-bsp    = " imx-lib"
+DEPENDS:append:mx7-nxp-bsp = " imx-lib"
 DEPENDS:append:mx8ulp-nxp-bsp = " imx-lib"
-DEPENDS:append:mx93-nxp-bsp   = " imx-lib"
+DEPENDS:append:mx93-nxp-bsp = " imx-lib"
-DEPENDS:append:mx943-nxp-bsp  = " imx-lib"
+DEPENDS:append:mx943-nxp-bsp = " imx-lib"
 PE = "1"
 PV = "7.0+${SRCPV}"
@@ -31,13 +32,13 @@ inherit module-base use-imx-headers
 INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-PLATFORM:mx6q-nxp-bsp  = "IMX6Q"
+PLATFORM:mx6q-nxp-bsp = "IMX6Q"
 PLATFORM:mx6dl-nxp-bsp = "IMX6Q"
 PLATFORM:mx6sl-nxp-bsp = "IMX6SL"
 PLATFORM:mx6sll-nxp-bsp = "IMX6SL"
 PLATFORM:mx6sx-nxp-bsp = "IMX6SX"
 PLATFORM:mx6ul-nxp-bsp = "IMX6UL"
-PLATFORM:mx7d-nxp-bsp  = "IMX7D"
+PLATFORM:mx7d-nxp-bsp = "IMX7D"
 PLATFORM:mx7ulp-nxp-bsp = "IMX7D"
 PLATFORM:mx8-nxp-bsp = "IMX8"
 PLATFORM:mx8ulp-nxp-bsp = "IMX8ULP"
@@ -51,7 +52,7 @@ EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}"
 PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
 PACKAGECONFIG:append:imxvpu = " vpu"
-PACKAGECONFIG:append:mx8m-nxp-bsp   = " swpdm"
+PACKAGECONFIG:append:mx8m-nxp-bsp = " swpdm"
 PACKAGECONFIG[x11] = ",,libx11 libxdamage libxrender libxrandr"
 PACKAGECONFIG[vpu] = "HAS_VPU=true,HAS_VPU=false,virtual/imxvpu"
diff --git a/recipes-bsp/imx-uuc/imx-uuc_git.bb b/recipes-bsp/imx-uuc/imx-uuc_git.bb
index ecd33f59f..446fb58e9 100644
--- a/recipes-bsp/imx-uuc/imx-uuc_git.bb
+++ b/recipes-bsp/imx-uuc/imx-uuc_git.bb
@@ -1,8 +1,9 @@
 # Copyright (C) 2016 Freescale Semiconductor
 # Copyright (C) 2017-2019,2024-2025 NXP
 SUMMARY = "A Daemon wait for NXP mfgtools host's command"
+HOMEPAGE = "https://github.com/nxp-imx/imx-uuc"
 SECTION = "base"
-DEPENDS = "virtual/kernel dosfstools-native"
+DEPENDS = "dosfstools-native virtual/kernel"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
diff --git a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.11.0.bb b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.11.0.bb
index 528b05e17..498f7848a 100644
--- a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.11.0.bb
+++ b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.11.0.bb
@@ -1,12 +1,15 @@
 # Copyright 2019-2022 NXP
-DESCRIPTION = "i.MX VC8000E Encoder library"
+SUMMARY = "i.MX VC8000E encoder library"
+DESCRIPTION = "Hantro VC8000E video encoder library for i.MX SoCs."
+HOMEPAGE = "https://www.nxp.com/"
+SECTION = "multimedia"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
 inherit fsl-eula-unpack
-SRC_URI = " ${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
+SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
 IMX_SRCREV_ABBREV = "5e18a84"
 SRC_URI[sha256sum] = "04d2a9c5c75804a11a4500a0133dfc7d8e84f74254cee52c42075f5ecc229550"
@@ -29,8 +32,8 @@ do_install () {
    rm ${D}${D_SUBDIR}/${SCR}
 }
-FILES:${PN} = "/"
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
+FILES:${PN} = "/"
 COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)"
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.9.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.9.0.bb
index d24ab66ea..22a307267 100644
--- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.9.0.bb
+++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.9.0.bb
@@ -1,5 +1,8 @@
 # Copyright 2021 NXP
-DESCRIPTION = "i.MX Hantro V4L2 Daemon"
+SUMMARY = "i.MX Hantro V4L2 daemon"
+DESCRIPTION = "V4L2 userspace daemon for the Hantro VPU on i.MX SoCs."
+HOMEPAGE = "https://www.nxp.com/"
+SECTION = "multimedia"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd8bc2a79509c22fc9c1782a151210b1"
@@ -17,11 +20,11 @@ PLATFORM:mx8mm-nxp-bsp = "IMX8MM"
 PLATFORM:mx8mq-nxp-bsp = "IMX8MQ"
 PLATFORM:mx8mp-nxp-bsp = "IMX8MP"
-EXTRA_OEMAKE = " \
+EXTRA_OEMAKE = "\
-    CROSS_COMPILE="${HOST_PREFIX}" \
+    CROSS_COMPILE="${HOST_PREFIX}"\
-    SDKTARGETSYSROOT="${STAGING_DIR_TARGET}" \
+    SDKTARGETSYSROOT="${STAGING_DIR_TARGET}"\
-    CTRLSW_HDRPATH="${STAGING_INCDIR}" \
+    CTRLSW_HDRPATH="${STAGING_INCDIR}"\
-    PLATFORM="${PLATFORM}" \
+    PLATFORM="${PLATFORM}"\
 "
 do_install () {
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.40.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.40.0.bb
index e5113f1c1..69f4621fb 100644
--- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.40.0.bb
+++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.40.0.bb
@@ -1,12 +1,15 @@
 # Copyright (C) 2017-2020,2026 NXP
-DESCRIPTION = "i.MX Hantro VPU library"
+SUMMARY = "i.MX Hantro VPU library"
+DESCRIPTION = "Hantro video processing unit (VPU) codec library for i.MX SoCs."
+HOMEPAGE = "https://www.nxp.com/"
+SECTION = "multimedia"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
 PROVIDES = "virtual/imxvpu"
-SRC_URI = " \
+SRC_URI = "\
    ${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true \
 "
 IMX_SRCREV_ABBREV = "52c7e45"
@@ -28,18 +31,19 @@ PLATFORM:mx8mp-nxp-bsp = "IMX8MP"
 #| ../../source/h264high/h264decapi.c:2086:22: error: assignment to 'const u8 *' {aka 'const unsigned char *'} from incompatible pointer type 'u32 *' {aka 'unsigned int *'} [-Wincompatible-pointer-types]
 #|  2086 |             ref_data = ref.virtual_address;
-CFLAGS += " -Wno-error=incompatible-pointer-types"
+CFLAGS += "-Wno-error=incompatible-pointer-types"
-EXTRA_OEMAKE = " \
+EXTRA_OEMAKE = "\
-    CROSS_COMPILE="${HOST_PREFIX}" \
+    CROSS_COMPILE="${HOST_PREFIX}"\
-    SDKTARGETSYSROOT="${STAGING_DIR_TARGET}" \
+    SDKTARGETSYSROOT="${STAGING_DIR_TARGET}"\
-    PLATFORM="${PLATFORM}" \
+    PLATFORM="${PLATFORM}"\
 "
 do_install () {
    oe_runmake install DEST_DIR="${D}"
 }
+PACKAGE_ARCH = "${MACHINE_SOCARCH}"
 FILES:${PN} += "/unit_tests"
-PACKAGE_ARCH = "${MACHINE_SOCARCH}"
 COMPATIBLE_MACHINE = "(mx8mq-nxp-bsp|mx8mm-nxp-bsp|mx8mp-nxp-bsp)"
diff --git a/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb b/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb
index fc90cdab7..f2162f624 100644
--- a/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb
+++ b/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb
@@ -2,7 +2,10 @@
 # Copyright (C) 2013-2016 Freescale Semiconductor
 # Copyright (C) 2017-2020 NXP
+SUMMARY = "i.MX VPU library for Chips&Media VPU"
 DESCRIPTION = "Freescale VPU library for Chips&Media VPU"
+HOMEPAGE = "https://www.nxp.com/"
+SECTION = "multimedia"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://COPYING;md5=228c72f2a91452b8a03c4cab30f30ef9"
diff --git a/recipes-bsp/inphi/inphi_git.bb b/recipes-bsp/inphi/inphi_git.bb
index 5c2e4197f..9c8046b7c 100644
--- a/recipes-bsp/inphi/inphi_git.bb
+++ b/recipes-bsp/inphi/inphi_git.bb
@@ -1,4 +1,7 @@
 SUMMARY = "Firmwares and Standalone Applications"
+DESCRIPTION = "Inphi IN112525 PHY microcode firmware for NXP QorIQ platforms"
+HOMEPAGE = "https://github.com/nxp/qoriq-firmware-inphi"
+SECTION = "firmware"
 LICENSE = "NXP-Binary-EULA"
 LIC_FILES_CHKSUM = "file://EULA.txt;md5=86d76166990962fa552f840ff08e5798"
@@ -9,7 +12,7 @@ SRCREV = "f22e9ff3bfed8342da6efb699e473b11fbad5695"
 do_install () {
    install -d ${D}/boot
-    cp -fr ${S}/in112525-phy-ucode.txt ${D}/boot
+    install -m 0644 ${S}/in112525-phy-ucode.txt ${D}/boot
 }
 do_deploy () {
@@ -18,9 +21,9 @@ do_deploy () {
 }
 addtask deploy before do_build after do_install
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 PACKAGES += "${PN}-image"
 FILES:${PN}-image += "/boot"
 COMPATIBLE_MACHINE = "(qoriq-arm64)"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-bsp/isp-imx/basler-camera_4.2.2.26.1.bb b/recipes-bsp/isp-imx/basler-camera_4.2.2.26.1.bb
index 11580dfd2..cb4adeaee 100644
--- a/recipes-bsp/isp-imx/basler-camera_4.2.2.26.1.bb
+++ b/recipes-bsp/isp-imx/basler-camera_4.2.2.26.1.bb
@@ -1,6 +1,9 @@
 # Copyright 2020-2024 NXP
-DESCRIPTION = "Basler camera binary drivers"
+SUMMARY = "Basler camera binary drivers"
+DESCRIPTION = "Basler camera binary drivers for the i.MX ISP."
+HOMEPAGE = "https://www.nxp.com/"
+SECTION = "multimedia"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
@@ -25,5 +28,4 @@ FILES:${PN} = "${libdir} /opt"
 INSANE_SKIP:${PN} = "already-stripped"
 RDEPENDS:${PN} += "isp-imx"
 COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)"
diff --git a/recipes-bsp/isp-imx/isp-imx_4.2.2.26.1.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.26.1.bb
index 0a8ce57c0..9c6cbec00 100644
--- a/recipes-bsp/isp-imx/isp-imx_4.2.2.26.1.bb
+++ b/recipes-bsp/isp-imx/isp-imx_4.2.2.26.1.bb
@@ -1,10 +1,13 @@
 # Copyright 2020-2025 NXP
-DESCRIPTION = "i.MX Verisilicon Software ISP"
+SUMMARY = "i.MX VeriSilicon software ISP"
+DESCRIPTION = "VeriSilicon image signal processing (ISP) software stack for i.MX SoCs."
+HOMEPAGE = "https://www.nxp.com/"
+SECTION = "multimedia"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
-DEPENDS = "boost libdrm virtual/libg2d libtinyxml2 jsoncpp patchelf-native"
+DEPENDS = "boost jsoncpp libdrm libtinyxml2 patchelf-native virtual/libg2d"
 SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
 SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${ISP_SYSTEMD_PATCH}', '', d)}"
@@ -34,7 +37,7 @@ LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-
 SYSTEMD_SERVICE:${PN} = "imx8-isp.service"
-EXTRA_OECMAKE += " \
+EXTRA_OECMAKE += "\
    -DSDKTARGETSYSROOT=${STAGING_DIR_HOST} \
    -DCMAKE_BUILD_TYPE=release \
    -DISP_VERSION=ISP8000NANO_V1802 \
@@ -83,7 +86,7 @@ do_install() {
 FILES_SOLIBSDEV = ""
 FILES:${PN} += "/opt ${libdir}/lib*${SOLIBSDEV}"
 FILES:${PN}-dev += "${FILES_SOLIBS_VERSIONED}"
-FILES_SOLIBS_VERSIONED = " \
+FILES_SOLIBS_VERSIONED = "\
    ${libdir}/libcppnetlib-client-connections.so \
    ${libdir}/libcppnetlib-server-parsers.so \
    ${libdir}/libcppnetlib-uri.so \
diff --git a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.2.0.bb b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.2.0.bb
index a94d6bf14..3296ebd94 100644
--- a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.2.0.bb
+++ b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.2.0.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = 'Library for allocating and managing physically contiguous memory \
-               ("DMA memory" or "DMA buffers") on i.MX devices.'
+              ("DMA memory" or "DMA buffers") on i.MX devices.'
 HOMEPAGE = "https://github.com/Freescale/libimxdmabuffer"
 LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=38fa42a5a6425b26d2919b17b1527324"
@@ -11,7 +11,7 @@ SRCBRANCH ?= "master"
 SRCREV = "d44deb80af881b82f394d44696433e6695022c8c"
 SRC_URI = "git://github.com/Freescale/libimxdmabuffer.git;branch=${SRCBRANCH};protocol=https \
           file://run-ptest \
-          "
+           "
 inherit pkgconfig waf use-imx-headers ptest
@@ -47,33 +47,33 @@ CACHED_DMA_HEAP_CONF = "--dma-heap-device-node-path=${CACHED_DMA_HEAP_DEVICE_NOD
 UNCACHED_DMA_HEAP_CONF = "--dma-heap-device-node-path=${UNCACHED_DMA_HEAP_DEVICE_NODE_PATH} \
                          --dma-heap-uncached-memory"
-PACKAGECONFIG ?= " "
+PACKAGECONFIG ?= ""
-PACKAGECONFIG:append:imxgpu2d         = " ${LIBG2D_PACKAGECONFIG}"
+PACKAGECONFIG:append:imxgpu2d = " ${LIBG2D_PACKAGECONFIG}"
-PACKAGECONFIG:append:imxipu           = " ipu"
+PACKAGECONFIG:append:imxipu = " ipu"
-PACKAGECONFIG:append:imxpxp           = " pxp"
+PACKAGECONFIG:append:imxpxp = " pxp"
 # All i.MX8 machines can use the dma-heap allocator. i.MX8m ones
 # can also use the DWL allocator, though dma-heap is preferred.
 # Vendor kernels that are older than kernel 5.6 cannot use
 # dma-heap, however, and should use ion instead, since the
 # former is not available pre-5.6. Out of the dma-heaps, we
 # pick the uncached one by default (see above).
-PACKAGECONFIG:append:mx8-nxp-bsp      = " dma-heap-uncached"
+PACKAGECONFIG:append:mx8-nxp-bsp = " dma-heap-uncached"
-PACKAGECONFIG:append:mx8mq-nxp-bsp     = " dwl"
+PACKAGECONFIG:append:mx8mq-nxp-bsp = " dwl"
-PACKAGECONFIG:append:mx8mm-nxp-bsp     = " dwl"
+PACKAGECONFIG:append:mx8mm-nxp-bsp = " dwl"
-PACKAGECONFIG:append:mx8mp-nxp-bsp     = " dwl"
+PACKAGECONFIG:append:mx8mp-nxp-bsp = " dwl"
 HANTRO_CONF = "--hantro-headers-path=${STAGING_INCDIR}/hantro_dec --hantro-decoder-version=G2"
-PACKAGECONFIG[dwl]      = "--with-dwl-allocator=yes ${HANTRO_CONF}, --with-dwl-allocator=no,imx-vpu-hantro"
+PACKAGECONFIG[dwl] = "--with-dwl-allocator=yes ${HANTRO_CONF}, --with-dwl-allocator=no,imx-vpu-hantro"
-PACKAGECONFIG[ion]      = "--with-ion-allocator=yes,                --with-ion-allocator=no,"
+PACKAGECONFIG[ion] = "--with-ion-allocator=yes,                --with-ion-allocator=no,"
-PACKAGECONFIG[ipu]      = "--with-ipu-allocator=yes,                --with-ipu-allocator=no,"
+PACKAGECONFIG[ipu] = "--with-ipu-allocator=yes,                --with-ipu-allocator=no,"
-PACKAGECONFIG[g2d]      = "--with-g2d-allocator=yes,                --with-g2d-allocator=no,virtual/libg2d"
+PACKAGECONFIG[g2d] = "--with-g2d-allocator=yes,                --with-g2d-allocator=no,virtual/libg2d"
-PACKAGECONFIG[pxp]      = "--with-pxp-allocator=yes,                --with-pxp-allocator=no,"
+PACKAGECONFIG[pxp] = "--with-pxp-allocator=yes,                --with-pxp-allocator=no,"
 # --with-dma-heap-allocator=no is not added by these packageconfigs.
 # Otherwise, it would always be added, since only one of these two
 # dma-heap-* packageconfigs can be selected. Instead, that switch
 # is added to EXTRA_OECONF above.
-PACKAGECONFIG[dma-heap-cached]   = "--with-dma-heap-allocator=yes ${CACHED_DMA_HEAP_CONF}, \
+PACKAGECONFIG[dma-heap-cached] = "--with-dma-heap-allocator=yes ${CACHED_DMA_HEAP_CONF}, \
                                    ,,,,dma-heap-uncached"
 PACKAGECONFIG[dma-heap-uncached] = "--with-dma-heap-allocator=yes ${UNCACHED_DMA_HEAP_CONF}, \
                                    ,,,,dma-heap-cached"
diff --git a/recipes-bsp/ls2-phy/ls2-phy_git.bb b/recipes-bsp/ls2-phy/ls2-phy_git.bb
index 60ab5e183..4a6e5ea87 100644
--- a/recipes-bsp/ls2-phy/ls2-phy_git.bb
+++ b/recipes-bsp/ls2-phy/ls2-phy_git.bb
@@ -1,4 +1,7 @@
 SUMMARY = "Firmwares and Standalone Applications"
+DESCRIPTION = "Cortina PHY firmware and standalone applications for NXP QorIQ platforms"
+HOMEPAGE = "https://github.com/nxp/qoriq-firmware-cortina"
+SECTION = "firmware"
 LICENSE = "NXP-Binary-EULA"
 LIC_FILES_CHKSUM = "file://EULA.txt;md5=86d76166990962fa552f840ff08e5798"
@@ -9,7 +12,7 @@ SRCREV = "9143c2a3adede595966583c00ca4edc99ec698cf"
 do_install () {
    install -d ${D}/boot
-    cp -fr ${S}/* ${D}/boot
+    install -m 0644 ${S}/* ${D}/boot
 }
 do_deploy () {
@@ -18,9 +21,10 @@ do_deploy () {
 }
 addtask deploy before do_build after do_install
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 PACKAGES += "${PN}-image"
 FILES:${PN}-image += "/boot"
 COMPATIBLE_MACHINE = "(qoriq)"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-bsp/mc-utils/mc-utils_git.bb b/recipes-bsp/mc-utils/mc-utils_git.bb
index 2d09bbcc8..ff502afb4 100644
--- a/recipes-bsp/mc-utils/mc-utils_git.bb
+++ b/recipes-bsp/mc-utils/mc-utils_git.bb
@@ -1,4 +1,5 @@
 DESCRIPTION = "The Management Complex (MC) is a key component of DPAA"
+HOMEPAGE = "https://github.com/nxp-qoriq/mc-utils"
 SECTION = "mc-utils"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=386a6287daa6504b7e7e5014ddfb3987"
@@ -20,20 +21,20 @@ MC_FLAVOUR ?= "${@oe.utils.ifelse(d.getVar('MACHINE').endswith('qds'), 'QDS', 'R
 MC_FOLDER ?= "${@d.getVar('MC_CFG').upper() + '-' + d.getVar('MC_FLAVOUR')}"
 do_compile () {
-        oe_runmake -C config 
+    oe_runmake -C config
 }
 do_install () {
-        install -d ${D}/boot/mc-utils
+    install -d ${D}/boot/mc-utils
-        if [ -e ${S}/config/${MC_CFG}/${MC_FOLDER} ]; then
+    if [ -e ${S}/config/${MC_CFG}/${MC_FOLDER} ]; then
-                cp -r ${S}/config/${MC_CFG}/${MC_FOLDER}/* ${D}/boot/mc-utils/
+        cp -r ${S}/config/${MC_CFG}/${MC_FOLDER}/* ${D}/boot/mc-utils/
-        fi
+    fi
-        find ${D}/boot/mc-utils/ ! -name "*.dtb" ! -type d -exec rm {} \;
+    find ${D}/boot/mc-utils/ ! -name "*.dtb" ! -type d -exec rm {} \;
 }
 do_deploy () {
-        install -d ${DEPLOYDIR}/mc-utils
+    install -d ${DEPLOYDIR}/mc-utils
-        cp -r ${D}/boot/mc-utils/* ${DEPLOYDIR}/mc-utils/
+    cp -r ${D}/boot/mc-utils/* ${DEPLOYDIR}/mc-utils/
 }
 addtask deploy after do_install
diff --git a/recipes-bsp/mxsldr/mxsldr_git.bb b/recipes-bsp/mxsldr/mxsldr_git.bb
index ade3570c4..f6ba313da 100644
--- a/recipes-bsp/mxsldr/mxsldr_git.bb
+++ b/recipes-bsp/mxsldr/mxsldr_git.bb
@@ -1,24 +1,26 @@
 # Copyright (C) 2012 O.S. Systems Software LTDA.
 # Released under the MIT license (see COPYING.MIT for the terms)
+SUMMARY = "i.MX233/i.MX28 USB loader"
 DESCRIPTION = "Freescale i.MX233/i.MX28 USB loader"
-DEPENDS = "libusb1"
+HOMEPAGE = "https://source.denx.de/denx/mxsldr"
+SECTION = "devel"
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+DEPENDS = "libusb1"
-SRCREV = "c40d80472525e1d57dae5317c028b745968c0399"
+PV = "0.0.0+git${SRCPV}"
 SRC_URI = "git://source.denx.de/denx/mxsldr.git;branch=master;protocol=https \
           file://0001-Do-not-ignore-OE-cflags-and-ldflags.patch \
           "
+SRCREV = "c40d80472525e1d57dae5317c028b745968c0399"
-PV = "0.0.0+git${SRCPV}"
 inherit pkgconfig
 do_compile() {
-        oe_runmake
+    oe_runmake
 }
 do_install() {
-        oe_runmake install DESTDIR="${D}"
+    oe_runmake install DESTDIR="${D}"
 }
 BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb b/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb
index ddbb2031c..f01939adc 100644
--- a/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb
+++ b/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb
@@ -1,8 +1,10 @@
 SUMMARY = "PPFE Linux firmware"
+DESCRIPTION = "Packet Forwarding Engine (PFE) firmware binaries for NXP LS1012A SoCs"
+HOMEPAGE = "https://github.com/NXP/qoriq-engine-pfe-bin"
+SECTION = "firmware"
 LICENSE = "NXP-Binary-EULA"
 LIC_FILES_CHKSUM = "file://NXP-Binary-EULA.txt;md5=92723670f432558b9e2494ed177d2a85"
 INHIBIT_DEFAULT_DEPS = "1"
 inherit deploy
@@ -26,6 +28,8 @@ do_deploy () {
 addtask deploy after do_install
 FILES:${PN} += "${nonarch_base_libdir}/firmware /boot/"
+# Prebuilt firmware blobs: foreign target arch, already stripped.
+# nooelint: oelint.vars.insaneskip
 INSANE_SKIP:${PN} += "arch already-stripped"
 INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_SYSROOT_STRIP = "1"
diff --git a/recipes-bsp/qe-ucode/qe-ucode_git.bb b/recipes-bsp/qe-ucode/qe-ucode_git.bb
index 582fb1e46..0d1820326 100644
--- a/recipes-bsp/qe-ucode/qe-ucode_git.bb
+++ b/recipes-bsp/qe-ucode/qe-ucode_git.bb
@@ -1,4 +1,5 @@
 DESCRIPTION = "qe microcode binary"
+HOMEPAGE = "https://github.com/NXP/qoriq-qe-ucode"
 SECTION = "qe-ucode"
 LICENSE = "NXP-Binary-EULA"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c62f8109b4df15ca37ceeb5e4943626c"
diff --git a/recipes-bsp/rcw/rcw_git.bb b/recipes-bsp/rcw/rcw_git.bb
index f7e309ae7..dbcc42108 100644
--- a/recipes-bsp/rcw/rcw_git.bb
+++ b/recipes-bsp/rcw/rcw_git.bb
@@ -1,5 +1,6 @@
 SUMMARY = "Reset Configuration Word"
 DESCRIPTION = "Reset Configuration Word - hardware boot-time parameters for the QorIQ targets"
+HOMEPAGE = "https://github.com/nxp-qoriq/rcw"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=44a0d0fad189770cc022af4ac6262cbe"
diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2025.01.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2025.01.inc
index 9cc6b958d..7d0189e17 100644
--- a/recipes-bsp/u-boot/u-boot-fslc-common_2025.01.inc
+++ b/recipes-bsp/u-boot/u-boot-fslc-common_2025.01.inc
@@ -4,6 +4,7 @@
 inherit fsl-u-boot-localversion
 LICENSE = "GPL-2.0-or-later"
+HOMEPAGE = "https://github.com/Freescale/u-boot-fslc"
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1"
 DEPENDS += "flex-native bison-native"
diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2025.01.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2025.01.bb
index b7e4ca760..fe2e62452 100644
--- a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2025.01.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2025.01.bb
@@ -5,7 +5,7 @@ SECTION = "bootloader"
 inherit python3native
-DEPENDS += " \
+DEPENDS += "\
    bison-native \
    dtc \
    gnutls \
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2025.01.bb b/recipes-bsp/u-boot/u-boot-fslc_2025.01.bb
index 4dc698219..681156041 100644
--- a/recipes-bsp/u-boot/u-boot-fslc_2025.01.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc_2025.01.bb
@@ -2,9 +2,9 @@ require recipes-bsp/u-boot/u-boot.inc
 require u-boot-fslc-common_${PV}.inc
 DESCRIPTION = "U-Boot based on mainline U-Boot used by FSL Community BSP in \
-order to provide support for some backported features and fixes, or because it \
+               order to provide support for some backported features and fixes, or because it \
-was submitted for revision and it takes some time to become part of a stable \
+               was submitted for revision and it takes some time to become part of a stable \
-version, or because it is not applicable for upstreaming."
+               version, or because it is not applicable for upstreaming."
 DEPENDS += "bc-native dtc-native python3-setuptools-native gnutls-native"
@@ -16,8 +16,8 @@ B = "${WORKDIR}/build"
 #        used for generating the boot logo and other tools used
 #        during the build process.
 EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CPPFLAGS}" \
-                 HOSTLDFLAGS="${BUILD_LDFLAGS}" \
+                HOSTLDFLAGS="${BUILD_LDFLAGS}" \
-                 HOSTSTRIP=true'
+                HOSTSTRIP=true'
 inherit ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '1', 'imx-boot-container', '')}
 inherit uuu_bootloader_tag
diff --git a/recipes-bsp/u-boot/u-boot-imx-common_2025.04.inc b/recipes-bsp/u-boot/u-boot-imx-common_2025.04.inc
index b80bf61d7..9dd2b61fe 100644
--- a/recipes-bsp/u-boot/u-boot-imx-common_2025.04.inc
+++ b/recipes-bsp/u-boot/u-boot-imx-common_2025.04.inc
@@ -9,7 +9,7 @@ SRCBRANCH = "lf_v2025.04"
 LOCALVERSION ?= "-${SRCBRANCH}"
 SRCREV = "4ddbad60eff308a5b356fb9ab8734ac382ddd692"
-DEPENDS += " \
+DEPENDS += "\
    bc-native \
    bison-native \
    dtc-native \
diff --git a/recipes-bsp/u-boot/u-boot-imx_2025.04.bb b/recipes-bsp/u-boot/u-boot-imx_2025.04.bb
index a27291460..31424c27a 100644
--- a/recipes-bsp/u-boot/u-boot-imx_2025.04.bb
+++ b/recipes-bsp/u-boot/u-boot-imx_2025.04.bb
@@ -4,6 +4,7 @@
 require recipes-bsp/u-boot/u-boot.inc
 require u-boot-imx-common_${PV}.inc
+HOMEPAGE = "https://github.com/nxp-imx/uboot-imx"
 PROVIDES += "u-boot u-boot-mfgtool"
diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2025.04.bb b/recipes-bsp/u-boot/u-boot-qoriq_2025.04.bb
index 11e5ea0ff..b7162df8c 100644
--- a/recipes-bsp/u-boot/u-boot-qoriq_2025.04.bb
+++ b/recipes-bsp/u-boot/u-boot-qoriq_2025.04.bb
@@ -1,12 +1,13 @@
 require recipes-bsp/u-boot/u-boot.inc
 DESCRIPTION = "U-Boot provided by Freescale with focus on QorIQ boards"
+HOMEPAGE = "https://github.com/nxp-qoriq/u-boot"
 PROVIDES += "u-boot"
 inherit fsl-u-boot-localversion
 LICENSE = "GPL-2.0-only & BSD-3-Clause & BSD-2-Clause & LGPL-2.0-only & LGPL-2.1-only"
-LIC_FILES_CHKSUM = " \
+LIC_FILES_CHKSUM = "\
    file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
    file://Licenses/bsd-2-clause.txt;md5=6a31f076f5773aabd8ff86191ad6fdd5 \
    file://Licenses/bsd-3-clause.txt;md5=4a1190eac56a9db675d58ebe86eaf50c \
@@ -26,7 +27,7 @@ PV:append = "+fslgit"
 LOCALVERSION = "+fsl"
 INHIBIT_DEFAULT_DEPS = "1"
-DEPENDS = "libgcc virtual/cross-cc bison-native bc-native gnutls-native swig-native python3-native"
+DEPENDS = "bc-native bison-native gnutls-native libgcc python3-native swig-native virtual/cross-cc"
 DEPENDS:append:qoriq-arm64 = " dtc-native"
 DEPENDS:append:qoriq-arm = " dtc-native"
 DEPENDS:append:qoriq-ppc = " boot-format-native"
diff --git a/recipes-bsp/uefi/uefi_git.bb b/recipes-bsp/uefi/uefi_git.bb
index c0222a817..be47c1f57 100644
--- a/recipes-bsp/uefi/uefi_git.bb
+++ b/recipes-bsp/uefi/uefi_git.bb
@@ -1,4 +1,5 @@
 DESCRIPTION = "Unified Extensible Firmware Interface"
+HOMEPAGE = "https://github.com/NXP/qoriq-uefi-binary"
 SECTION = "bootloaders"
 LICENSE = "NXP-Binary-EULA"
 LIC_FILES_CHKSUM = "file://NXP-Binary-EULA;md5=343ec8f06efc37467a6de53686fa6315"
diff --git a/recipes-connectivity/mbedtls/mbedtls_3.6.5.bb b/recipes-connectivity/mbedtls/mbedtls_3.6.5.bb
index e6dfe4309..18d3f9598 100644
--- a/recipes-connectivity/mbedtls/mbedtls_3.6.5.bb
+++ b/recipes-connectivity/mbedtls/mbedtls_3.6.5.bb
@@ -1,18 +1,18 @@
 SUMMARY = "Lightweight crypto and SSL/TLS library"
 DESCRIPTION = "mbedtls is a lean open source crypto library          \
-for providing SSL and TLS support in your programs. It offers        \
+               for providing SSL and TLS support in your programs. It offers        \
-an intuitive API and documented header files, so you can actually    \
+               an intuitive API and documented header files, so you can actually    \
-understand what the code does. It features:                          \
+               understand what the code does. It features:                          \
                                                                     \
- - Symmetric algorithms, like AES, Blowfish, Triple-DES, DES, ARC4,  \
+               - Symmetric algorithms, like AES, Blowfish, Triple-DES, DES, ARC4,  \
-   Camellia and XTEA                                                 \
+               Camellia and XTEA                                                 \
- - Hash algorithms, like SHA-1, SHA-2, RIPEMD-160 and MD5            \
+               - Hash algorithms, like SHA-1, SHA-2, RIPEMD-160 and MD5            \
- - Entropy pool and random generators, like CTR-DRBG and HMAC-DRBG   \
+               - Entropy pool and random generators, like CTR-DRBG and HMAC-DRBG   \
- - Public key algorithms, like RSA, Elliptic Curves, Diffie-Hellman, \
+               - Public key algorithms, like RSA, Elliptic Curves, Diffie-Hellman, \
-   ECDSA and ECDH                                                    \
+               ECDSA and ECDH                                                    \
- - SSL v3 and TLS 1.0, 1.1 and 1.2                                   \
+               - SSL v3 and TLS 1.0, 1.1 and 1.2                                   \
- - Abstraction layers for ciphers, hashes, public key operations,    \
+               - Abstraction layers for ciphers, hashes, public key operations,    \
-   platform abstraction and threading                                \
+               platform abstraction and threading                                \
 "
 HOMEPAGE = "https://tls.mbed.org/"
@@ -59,20 +59,20 @@ CVE_PRODUCT = "mbed_tls"
 # Strip host paths from autogenerated test files
 do_compile:append() {
-        sed -i 's+${S}/++g' ${B}/tests/*.c 2>/dev/null || :
+    sed -i 's+${S}/++g' ${B}/tests/*.c 2>/dev/null || :
-        sed -i 's+${B}/++g' ${B}/tests/*.c 2>/dev/null || :
+    sed -i 's+${B}/++g' ${B}/tests/*.c 2>/dev/null || :
 }
 # Export source files/headers needed by Arm Trusted Firmware
 sysroot_stage_all:append() {
-        sysroot_stage_dir "${S}/library" "${SYSROOT_DESTDIR}/usr/share/mbedtls-source/library"
+    sysroot_stage_dir "${S}/library" "${SYSROOT_DESTDIR}/usr/share/mbedtls-source/library"
-        sysroot_stage_dir "${S}/include" "${SYSROOT_DESTDIR}/usr/share/mbedtls-source/include"
+    sysroot_stage_dir "${S}/include" "${SYSROOT_DESTDIR}/usr/share/mbedtls-source/include"
 }
 do_install_ptest () {
-        install -d ${D}${PTEST_PATH}/tests
+    install -d ${D}${PTEST_PATH}/tests
-        install -d ${D}${PTEST_PATH}/framework
+    install -d ${D}${PTEST_PATH}/framework
-        cp -f ${B}/tests/test_suite_* ${D}${PTEST_PATH}/tests/
+    cp -f ${B}/tests/test_suite_* ${D}${PTEST_PATH}/tests/
-        find ${D}${PTEST_PATH}/tests/ -type f -name "*.c" -delete
+    find ${D}${PTEST_PATH}/tests/ -type f -name "*.c" -delete
-        cp -fR ${S}/framework/data_files ${D}${PTEST_PATH}/framework/
+    cp -fR ${S}/framework/data_files ${D}${PTEST_PATH}/framework/
 }
diff --git a/recipes-core/packagegroup/nativesdk-packagegroup-sdk-host.bbappend b/recipes-core/packagegroup/nativesdk-packagegroup-sdk-host.bbappend
index 5c492725b..a20bf03a5 100644
--- a/recipes-core/packagegroup/nativesdk-packagegroup-sdk-host.bbappend
+++ b/recipes-core/packagegroup/nativesdk-packagegroup-sdk-host.bbappend
@@ -1,4 +1,4 @@
-RDEPENDS:${PN} += " \
+RDEPENDS:${PN} += "\
    nativesdk-mxsldr \
    nativesdk-u-boot-mkimage \
    nativesdk-imx-usb-loader \
diff --git a/recipes-core/udev/udev-rules-imx.bb b/recipes-core/udev/udev-rules-imx.bb
index cd8d5ccb6..0f510e760 100644
--- a/recipes-core/udev/udev-rules-imx.bb
+++ b/recipes-core/udev/udev-rules-imx.bb
@@ -1,9 +1,11 @@
+SUMMARY = "udev rules for i.MX SoCs"
 DESCRIPTION = "udev rules for Freescale i.MX SOCs"
 HOMEPAGE = "https://github.com/Freescale/meta-freescale/"
+SECTION = "base"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-SRC_URI = " file://10-imx.rules"
+SRC_URI = "file://10-imx.rules"
 S = "${UNPACKDIR}"
diff --git a/recipes-core/udev/udev-rules-qoriq.bb b/recipes-core/udev/udev-rules-qoriq.bb
index bd6158fe6..d30fb91b1 100644
--- a/recipes-core/udev/udev-rules-qoriq.bb
+++ b/recipes-core/udev/udev-rules-qoriq.bb
@@ -1,4 +1,7 @@
+SUMMARY = "udev rules for QorIQ SoCs"
 DESCRIPTION = "udev rules for Freescale QorIQ SOCs"
+HOMEPAGE = "https://github.com/Freescale/meta-freescale/"
+SECTION = "base"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
@@ -16,10 +19,10 @@ RULE:e6500 = "72-fsl-dpaa-persistent-networking.rules"
 RULE:e6500-64b = "72-fsl-dpaa-persistent-networking.rules"
 RULE:t1024 = "72-fsl-dpaa-persistent-networking.rules"
 RULE:qoriq-arm64 = "73-fsl-dpaa-persistent-networking.rules \
-    73-fsl-enetc-networking.rules \
+                    73-fsl-enetc-networking.rules \
 "
 RULE:ls1046a = "73-fsl-dpaa-persistent-networking.rules \
-    74-ls1046a-xfi2-networking.rules \
+                74-ls1046a-xfi2-networking.rules \
 "
 RULE:ls1012a = ""
diff --git a/recipes-devtools/devregs/devregs_git.bb b/recipes-devtools/devregs/devregs_git.bb
index 9d2155e1f..4ac89c43f 100644
--- a/recipes-devtools/devregs/devregs_git.bb
+++ b/recipes-devtools/devregs/devregs_git.bb
@@ -1,11 +1,12 @@
-DESCRIPTION = "i.MX Register tool"
+SUMMARY = "i.MX register access tool"
+DESCRIPTION = "Command-line tool to read and write i.MX SoC registers by name"
+HOMEPAGE = "https://github.com/boundarydevices/devregs"
 SECTION = "devel"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5003fa041d799dd5dd5f646b74e36924"
-SRCREV = "dcc3e3f26d3d867d5297a104dc32bd99f5e6fa71"
-SRC_URI = "git://github.com/boundarydevices/devregs.git;protocol=https;branch=master"
 PV = "1.0+${SRCPV}"
+SRC_URI = "git://github.com/boundarydevices/devregs.git;protocol=https;branch=master"
+SRCREV = "dcc3e3f26d3d867d5297a104dc32bd99f5e6fa71"
 inherit autotools
diff --git a/recipes-devtools/half/half_2.1.0.bb b/recipes-devtools/half/half_2.1.0.bb
index 4914f8701..ca7984a4c 100644
--- a/recipes-devtools/half/half_2.1.0.bb
+++ b/recipes-devtools/half/half_2.1.0.bb
@@ -1,7 +1,8 @@
 SUMMARY = "C++ library for half precision floating point arithmetics"
-DESCRIPTION = "half is a C++ header-only library to provide an IEEE-754 conformant \ 
+DESCRIPTION = "half is a C++ header-only library to provide an IEEE-754 conformant \
-half-precision floating point type along with corresponding arithmetic operators, \
+               half-precision floating point type along with corresponding arithmetic operators, \
-type conversions and common mathematical functions."
+               type conversions and common mathematical functions."
+HOMEPAGE = "https://half.sourceforge.net/"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=813a6278831975d26c115ed6f9c21831"
diff --git a/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb b/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb
index c14fd955b..1f8c95f86 100644
--- a/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb
+++ b/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb
@@ -1,17 +1,18 @@
-DESCRIPTION = "i.MX/Vybrid recovery utility"
+SUMMARY = "i.MX/Vybrid USB recovery utility"
+DESCRIPTION = "Utility to load and run programs on i.MX/Vybrid SoCs over USB using the serial download protocol"
+HOMEPAGE = "https://github.com/boundarydevices/imx_usb_loader"
 SECTION = "devel"
 LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 DEPENDS = "libusb1"
-SRCREV = "f009770d841468204ab104bf7d3b0c5bc8425dbb"
-SRC_URI = "git://github.com/boundarydevices/imx_usb_loader.git;protocol=https;branch=master"
 PV = "1.0+${SRCPV}"
+SRC_URI = "git://github.com/boundarydevices/imx_usb_loader.git;protocol=https;branch=master"
+SRCREV = "f009770d841468204ab104bf7d3b0c5bc8425dbb"
 do_install () {
-        oe_runmake DESTDIR=${D} install
+    oe_runmake DESTDIR=${D} install
 }
 inherit pkgconfig
diff --git a/recipes-devtools/qemu/qemu-qoriq.inc b/recipes-devtools/qemu/qemu-qoriq.inc
index 60686bde8..c9a0b68e8 100644
--- a/recipes-devtools/qemu/qemu-qoriq.inc
+++ b/recipes-devtools/qemu/qemu-qoriq.inc
@@ -1,8 +1,8 @@
 SUMMARY = "Fast open source processor emulator"
 DESCRIPTION = "QEMU is a hosted virtual machine monitor: it emulates the \
-machine's processor through dynamic binary translation and provides a set \
+               machine's processor through dynamic binary translation and provides a set \
-of different hardware and device models for the machine, enabling it to run \
+               of different hardware and device models for the machine, enabling it to run \
-a variety of guest operating systems"
+               a variety of guest operating systems"
 HOMEPAGE = "http://qemu.org"
 LICENSE = "GPL-2.0-only & LGPL-2.1-only"
@@ -37,9 +37,9 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
           file://CVE-2020-25624.patch \
           file://CVE-2020-25723.patch \
           file://CVE-2020-28916.patch \
-           file://CVE-2020-35517.patch \
+           file://CVE-2020-35517.patch \
-           file://CVE-2020-29443.patch \
+           file://CVE-2020-29443.patch \
-           file://CVE-2021-20203.patch \
+           file://CVE-2021-20203.patch \
           "
 UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
@@ -58,25 +58,25 @@ do_install:append() {
 }
 do_compile_ptest() {
-        make buildtest-TESTS
+    make buildtest-TESTS
 }
 do_install_ptest() {
-        cp -rL ${B}/tests ${D}${PTEST_PATH}
+    cp -rL ${B}/tests ${D}${PTEST_PATH}
-        find ${D}${PTEST_PATH}/tests -type f -name "*.[Sshcod]" | xargs -i rm -rf {}
+    find ${D}${PTEST_PATH}/tests -type f -name "*.[Sshcod]" | xargs -i rm -rf {}
-        cp ${S}/tests/Makefile.include ${D}${PTEST_PATH}/tests
+    cp ${S}/tests/Makefile.include ${D}${PTEST_PATH}/tests
-        # Don't check the file genreated by configure
+    # Don't check the file genreated by configure
-        sed -i -e '/wildcard config-host.mak/d' \
+    sed -i -e '/wildcard config-host.mak/d' \
-               -e '$ {/endif/d}' ${D}${PTEST_PATH}/tests/Makefile.include
+           -e '$ {/endif/d}' ${D}${PTEST_PATH}/tests/Makefile.include
-        sed -i -e 's,${HOSTTOOLS_DIR}/python3,${bindir}/python3,' \
+    sed -i -e 's,${HOSTTOOLS_DIR}/python3,${bindir}/python3,' \
-            ${D}/${PTEST_PATH}/tests/qemu-iotests/common.env 
+        ${D}/${PTEST_PATH}/tests/qemu-iotests/common.env
 }
 # QEMU_TARGETS is overridable variable
 QEMU_TARGETS ?= "arm aarch64 i386 mips mipsel mips64 mips64el ppc ppc64 ppc64le riscv32 riscv64 sh4 x86_64"
-EXTRA_OECONF = " \
+EXTRA_OECONF = "\
    --prefix=${prefix} \
    --bindir=${bindir} \
    --includedir=${includedir} \
@@ -95,7 +95,7 @@ EXTRA_OECONF = " \
    --with-git=/bin/false \
    --disable-git-update \
    ${PACKAGECONFIG_CONFARGS} \
-    "
+"
 export LIBTOOL = "${HOST_SYS}-libtool"
@@ -104,11 +104,11 @@ B = "${WORKDIR}/build"
 EXTRA_OECONF:append = " --python=${HOSTTOOLS_DIR}/python3"
 do_configure:prepend:class-native() {
-        # Append build host pkg-config paths for native target since the host may provide sdl
+    # Append build host pkg-config paths for native target since the host may provide sdl
-        BHOST_PKGCONFIG_PATH=$(PATH=/usr/bin:/bin pkg-config --variable pc_path pkg-config || echo "")
+    BHOST_PKGCONFIG_PATH=$(PATH=/usr/bin:/bin pkg-config --variable pc_path pkg-config || echo "")
-        if [ ! -z "$BHOST_PKGCONFIG_PATH" ]; then
+    if [ ! -z "$BHOST_PKGCONFIG_PATH" ]; then
-                export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$BHOST_PKGCONFIG_PATH
+        export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$BHOST_PKGCONFIG_PATH
-        fi
+    fi
 }
 do_configure() {
@@ -117,8 +117,8 @@ do_configure() {
 do_configure[cleandirs] += "${B}"
 do_install () {
-        export STRIP=""
+    export STRIP=""
-        oe_runmake 'DESTDIR=${D}' install
+    oe_runmake 'DESTDIR=${D}' install
 }
 # The following fragment will create a wrapper for qemu-mips user emulation
@@ -128,10 +128,10 @@ do_install () {
 # the qemu-mips works fine.
 # IMPORTANT: This piece needs to be removed once the root cause is fixed!
 do_install:append() {
-        if [ -e "${D}/${bindir}/qemu-mips" ]; then
+    if [ -e "${D}/${bindir}/qemu-mips" ]; then
-                create_wrapper ${D}/${bindir}/qemu-mips \
+        create_wrapper ${D}/${bindir}/qemu-mips \
-                        QEMU_RESERVED_VA=0x0
+            QEMU_RESERVED_VA=0x0
-        fi
+    fi
 }
 # END of qemu-mips workaround
diff --git a/recipes-devtools/qemu/qemu-qoriq_4.2.bb b/recipes-devtools/qemu/qemu-qoriq_4.2.bb
index 8996a2f44..db0ed3423 100644
--- a/recipes-devtools/qemu/qemu-qoriq_4.2.bb
+++ b/recipes-devtools/qemu/qemu-qoriq_4.2.bb
@@ -4,7 +4,7 @@ require qemu-qoriq.inc
 COMPATIBLE_MACHINE = "(qoriq)"
-DEPENDS = "glib-2.0 zlib pixman bison-native"
+DEPENDS = "bison-native glib-2.0 pixman zlib"
 LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
                    file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f"
@@ -49,7 +49,7 @@ do_install_ptest() {
            ${D}/${PTEST_PATH}/tests/qemu-iotests/common.env
 }
-PACKAGECONFIG ??= " \
+PACKAGECONFIG ??= "\
    fdt sdl kvm aio libusb vhost numa \
    ${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \
 "
diff --git a/recipes-devtools/qoriq-cst/qoriq-cst_git.bb b/recipes-devtools/qoriq-cst/qoriq-cst_git.bb
index eb01f5427..48e410e8a 100644
--- a/recipes-devtools/qoriq-cst/qoriq-cst_git.bb
+++ b/recipes-devtools/qoriq-cst/qoriq-cst_git.bb
@@ -1,4 +1,5 @@
 SUMMARY = "utility for security boot"
+HOMEPAGE = "https://github.com/nxp-qoriq/cst"
 SECTION = "cst"
 LICENSE = "BSD-3-Clause"
@@ -37,5 +38,5 @@ do_install () {
 FILES:${PN}-dbg += "${bindir}/cst/.debug"
 BBCLASSEXTEND = "native nativesdk"
-INSANE_SKIP:${PN}-dbg += " buildpaths"
+INSANE_SKIP:${PN}-dbg += "buildpaths"
diff --git a/recipes-devtools/stb/stb_git.bb b/recipes-devtools/stb/stb_git.bb
index f5d52f809..db165588b 100644
--- a/recipes-devtools/stb/stb_git.bb
+++ b/recipes-devtools/stb/stb_git.bb
@@ -1,11 +1,14 @@
 SUMMARY = "single-file public domain (or MIT licensed) libraries for C/C++"
+DESCRIPTION = "Collection of single-file public domain (or MIT licensed) libraries for C/C++ covering image loading and writing, font rasterisation and more"
+HOMEPAGE = "https://github.com/nothings/stb"
+SECTION = "libs"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://stb.h;beginline=14418;endline=14433;md5=b10975d4c8155af1811ab611586f01d2"
 PV = "0.0+git${SRCPV}"
-SRCREV = "f67165c2bb2af3060ecae7d20d6f731173485ad0"
 SRC_URI = "git://github.com/nothings/stb.git;protocol=https;branch=master"
+SRCREV = "f67165c2bb2af3060ecae7d20d6f731173485ad0"
 do_install() {
    install -d ${D}${includedir}
diff --git a/recipes-devtools/uuu/uuu-bin_1.5.233.bb b/recipes-devtools/uuu/uuu-bin_1.5.233.bb
index ec2f40e00..b0fcbc09a 100644
--- a/recipes-devtools/uuu/uuu-bin_1.5.233.bb
+++ b/recipes-devtools/uuu/uuu-bin_1.5.233.bb
@@ -9,7 +9,7 @@ LICENSE = "BSD-3-Clause & LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9 \
                    file://${COMMON_LICENSE_DIR}/LGPL-2.1-or-later;md5=2a4f4fd2128ea2f65047ee63fbca9f68"
-SRC_URI = " \
+SRC_URI = "\
    https://github.com/nxp-imx/mfgtools/releases/download/uuu_${PV}/uuu;downloadfilename=uuu-${PV};name=Linux \
    https://github.com/nxp-imx/mfgtools/releases/download/uuu_${PV}/uuu_mac_x86;downloadfilename=uuu-${PV}_mac_x86;name=Mac_x86 \
    https://github.com/nxp-imx/mfgtools/releases/download/uuu_${PV}/uuu_mac_arm;downloadfilename=uuu-${PV}_mac_arm;name=Mac_arm \
diff --git a/recipes-downgrade/glslang/glslang_1.3.275.0.imx.bb b/recipes-downgrade/glslang/glslang_1.3.275.0.imx.bb
index 7b3c2f606..02693c4fe 100644
--- a/recipes-downgrade/glslang/glslang_1.3.275.0.imx.bb
+++ b/recipes-downgrade/glslang/glslang_1.3.275.0.imx.bb
@@ -1,8 +1,8 @@
 SUMMARY = "OpenGL / OpenGL ES Reference Compiler"
 DESCRIPTION = "Glslang is the official reference compiler front end for the \
-OpenGL ES and OpenGL shading languages. It implements a strict interpretation \
+               OpenGL ES and OpenGL shading languages. It implements a strict interpretation \
-of the specifications for these languages. It is open and free for anyone to use, \
+               of the specifications for these languages. It is open and free for anyone to use, \
-either from a command line or programmatically."
+               either from a command line or programmatically."
 SECTION = "graphics"
 HOMEPAGE = "https://www.khronos.org/opengles/sdk/tools/Reference-Compiler"
 LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exception"
@@ -24,7 +24,7 @@ inherit cmake python3native
 DEPENDS = "spirv-tools"
-EXTRA_OECMAKE = " \
+EXTRA_OECMAKE = "\
    -DCMAKE_BUILD_TYPE=Release \
    -DBUILD_SHARED_LIBS=ON \
    -DENABLE_PCH=OFF \
diff --git a/recipes-downgrade/spir/spirv-tools_1.3.275.0.imx.bb b/recipes-downgrade/spir/spirv-tools_1.3.275.0.imx.bb
index 6b0c0a3f7..c1141bde7 100644
--- a/recipes-downgrade/spir/spirv-tools_1.3.275.0.imx.bb
+++ b/recipes-downgrade/spir/spirv-tools_1.3.275.0.imx.bb
@@ -1,10 +1,10 @@
-SUMMARY  = "The SPIR-V Tools project provides an API and commands for \
+SUMMARY = "The SPIR-V Tools project provides an API and commands for \
-processing SPIR-V modules"
+            processing SPIR-V modules"
 DESCRIPTION = "The project includes an assembler, binary module parser, \
-disassembler, validator, and optimizer for SPIR-V."
+               disassembler, validator, and optimizer for SPIR-V."
 HOMEPAGE = "https://github.com/KhronosGroup/SPIRV-Tools"
 SECTION = "graphics"
-LICENSE  = "Apache-2.0"
+LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 SRCREV = "f0cc85efdbbe3a46eae90e0f915dc1509836d0fc"
diff --git a/recipes-downgrade/vulkan/vulkan-headers_1.3.275.0.imx.bb b/recipes-downgrade/vulkan/vulkan-headers_1.3.275.0.imx.bb
index 24630d0db..60a0c3a1a 100644
--- a/recipes-downgrade/vulkan/vulkan-headers_1.3.275.0.imx.bb
+++ b/recipes-downgrade/vulkan/vulkan-headers_1.3.275.0.imx.bb
@@ -1,8 +1,8 @@
 SUMMARY = "Vulkan Header files and API registry"
 DESCRIPTION = "Vulkan is a 3D graphics and compute API providing cross-platform access \
-to modern GPUs with low overhead and targeting realtime graphics applications such as \
+               to modern GPUs with low overhead and targeting realtime graphics applications such as \
-games and interactive media. This package contains the development headers \
+               games and interactive media. This package contains the development headers \
-for packages wanting to make use of Vulkan."
+               for packages wanting to make use of Vulkan."
 HOMEPAGE = "https://www.khronos.org/vulkan/"
 BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Headers"
 SECTION = "libs"
diff --git a/recipes-downgrade/vulkan/vulkan-loader_1.3.275.0.imx.bb b/recipes-downgrade/vulkan/vulkan-loader_1.3.275.0.imx.bb
index 24fef1743..9d0df70dd 100644
--- a/recipes-downgrade/vulkan/vulkan-loader_1.3.275.0.imx.bb
+++ b/recipes-downgrade/vulkan/vulkan-loader_1.3.275.0.imx.bb
@@ -1,8 +1,8 @@
 SUMMARY = "3D graphics and compute API common loader"
 DESCRIPTION = "Vulkan is a new generation graphics and compute API \
-that provides efficient access to modern GPUs. These packages \
+               that provides efficient access to modern GPUs. These packages \
-provide only the common vendor-agnostic library loader, headers and \
+               provide only the common vendor-agnostic library loader, headers and \
-the vulkaninfo utility."
+               the vulkaninfo utility."
 HOMEPAGE = "https://www.khronos.org/vulkan/"
 BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Loader"
 SECTION = "libs"
@@ -19,12 +19,12 @@ inherit cmake features_check pkgconfig
 DEPENDS += "vulkan-headers"
 EXTRA_OECMAKE = "\
-                 -DBUILD_TESTS=OFF \
+    -DBUILD_TESTS=OFF \
-                 -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \
+    -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \
-                 -DASSEMBLER_WORKS=FALSE \
+    -DASSEMBLER_WORKS=FALSE \
-                 -DVulkanHeaders_INCLUDE_DIR=${STAGING_INCDIR} \
+    -DVulkanHeaders_INCLUDE_DIR=${STAGING_INCDIR} \
-                 -DVulkanRegistry_DIR=${RECIPE_SYSROOT}/${datadir} \
+    -DVulkanRegistry_DIR=${RECIPE_SYSROOT}/${datadir} \
-                 "
+"
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}"
diff --git a/recipes-downgrade/vulkan/vulkan-tools_1.3.275.0.imx.bb b/recipes-downgrade/vulkan/vulkan-tools_1.3.275.0.imx.bb
index f5fe8523d..4b0304f82 100644
--- a/recipes-downgrade/vulkan/vulkan-tools_1.3.275.0.imx.bb
+++ b/recipes-downgrade/vulkan/vulkan-tools_1.3.275.0.imx.bb
@@ -16,10 +16,10 @@ REQUIRED_DISTRO_FEATURES = "vulkan"
 DEPENDS += "vulkan-headers vulkan-loader vulkan-volk"
 EXTRA_OECMAKE = "\
-                 -DBUILD_TESTS=OFF \
+    -DBUILD_TESTS=OFF \
-                 -DBUILD_CUBE=OFF \
+    -DBUILD_CUBE=OFF \
-                 -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \
+    -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \
-                 "
+"
 # must choose x11 or wayland or both
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}"
diff --git a/recipes-downgrade/vulkan/vulkan-utility-libraries_1.3.275.0.imx.bb b/recipes-downgrade/vulkan/vulkan-utility-libraries_1.3.275.0.imx.bb
index 8ec4cbae9..fce4e0313 100644
--- a/recipes-downgrade/vulkan/vulkan-utility-libraries_1.3.275.0.imx.bb
+++ b/recipes-downgrade/vulkan/vulkan-utility-libraries_1.3.275.0.imx.bb
@@ -1,7 +1,7 @@
 SUMMARY = "Vulkan Utility Libraries"
 DESCRIPTION = "Common libraries created to share code across various \
-Vulkan repositories, solving long standing issues for Vulkan SDK \
+               Vulkan repositories, solving long standing issues for Vulkan SDK \
-developers and users."
+               developers and users."
 HOMEPAGE = "https://www.khronos.org/vulkan/"
 BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Utility-Libraries"
 SECTION = "libs"
@@ -18,7 +18,7 @@ DEPENDS = "vulkan-headers"
 EXTRA_OECMAKE = "\
    -DBUILD_TESTS=OFF \
-    "
+"
 inherit cmake features_check pkgconfig
diff --git a/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.275.0.imx.bb b/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.275.0.imx.bb
index 3068dd184..facad5834 100644
--- a/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.275.0.imx.bb
+++ b/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.275.0.imx.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Vulkan Validation layers"
 DESCRIPTION = "Khronos official Vulkan validation layers to assist developers \
-in verifying that their applications correctly use the Vulkan API"
+               in verifying that their applications correctly use the Vulkan API"
 HOMEPAGE = "https://www.khronos.org/vulkan/"
 BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-ValidationLayers"
 SECTION = "libs"
@@ -13,7 +13,7 @@ SRCREV = "780c65337e111c7385109c7b720d757a778e4fe2"
 REQUIRED_DISTRO_FEATURES = "vulkan"
-DEPENDS = "vulkan-headers vulkan-loader spirv-headers spirv-tools glslang vulkan-utility-libraries"
+DEPENDS = "glslang spirv-headers spirv-tools vulkan-headers vulkan-loader vulkan-utility-libraries"
 # BUILD_TESTS            - Not required for OE builds
 # USE_ROBIN_HOOD_HASHING - Provides substantial performance improvements on all platforms.
@@ -24,7 +24,7 @@ EXTRA_OECMAKE = "\
    -DGLSLANG_INSTALL_DIR=${STAGING_LIBDIR} \
    -DVULKAN_HEADERS_INSTALL_DIR=${STAGING_EXECPREFIXDIR} \
    -DSPIRV_HEADERS_INSTALL_DIR=${STAGING_EXECPREFIXDIR} \
-    "
+"
 PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF, libxcb libx11 libxrandr"
 PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland"
diff --git a/recipes-dpaa/eth-config/eth-config_git.bb b/recipes-dpaa/eth-config/eth-config_git.bb
index 858442aff..6d8f2d349 100644
--- a/recipes-dpaa/eth-config/eth-config_git.bb
+++ b/recipes-dpaa/eth-config/eth-config_git.bb
@@ -1,4 +1,6 @@
+SUMMARY = "Ethernet config files"
 DESCRIPTION = "Ethernet Configuration Files"
+HOMEPAGE = "https://github.com/nxp-qoriq/eth-config"
 SECTION = "eth-config"
 LICENSE = "BSD-3-Clause & GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=47716bd5b656aa5e298a132a64d2d1e4"
diff --git a/recipes-dpaa/flib/flib_git.bb b/recipes-dpaa/flib/flib_git.bb
index b7eafe627..f04def836 100644
--- a/recipes-dpaa/flib/flib_git.bb
+++ b/recipes-dpaa/flib/flib_git.bb
@@ -1,4 +1,6 @@
-DESCRIPTION = "Foundation Library"
+SUMMARY = "SEC descriptor foundation library"
+DESCRIPTION = "Foundation library of frame descriptors for the QorIQ SEC (crypto) block."
+HOMEPAGE = "https://github.com/nxp-qoriq/flib"
 SECTION = "flib"
 LICENSE = "BSD-3-Clause & GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=9f6d1afdf6b0f6b3ba65c25ba589ee53"
diff --git a/recipes-dpaa/fm-ucode/fm-ucode_git.bb b/recipes-dpaa/fm-ucode/fm-ucode_git.bb
index 77305958d..60306b9b3 100644
--- a/recipes-dpaa/fm-ucode/fm-ucode_git.bb
+++ b/recipes-dpaa/fm-ucode/fm-ucode_git.bb
@@ -1,4 +1,6 @@
+SUMMARY = "Fman microcode"
 DESCRIPTION = "Fman microcode binary"
+HOMEPAGE = "https://github.com/NXP/qoriq-fm-ucode"
 SECTION = "fm-ucode"
 LICENSE = "NXP-Binary-EULA"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=12e248d404ce1ea8bed0148fcf127e69"
diff --git a/recipes-dpaa/fmlib/fmlib_git.bb b/recipes-dpaa/fmlib/fmlib_git.bb
index 2276ac3c6..761f48611 100644
--- a/recipes-dpaa/fmlib/fmlib_git.bb
+++ b/recipes-dpaa/fmlib/fmlib_git.bb
@@ -1,4 +1,6 @@
-DESCRIPTION = "Frame Manager User Space Library"
+SUMMARY = "Frame Manager userspace library"
+DESCRIPTION = "Userspace library to configure the QorIQ DPAA Frame Manager (FMan)."
+HOMEPAGE = "https://github.com/nxp-qoriq/fmlib"
 SECTION = "fman"
 LICENSE = "BSD-3-Clause & GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=9c7bd5e45d066db084bdb3543d55b1ac"
@@ -9,10 +11,10 @@ SRC_URI = "git://github.com/nxp-qoriq/fmlib;protocol=https;nobranch=1"
 SRCREV = "7a58ecaf0d90d71d6b78d3ac7998282a472c4394"
 CFLAGS += "-fmacro-prefix-map=${STAGING_KERNEL_DIR}=/usr/src/debug/fmlib/git-r1 \
-                -fdebug-prefix-map=${STAGING_KERNEL_DIR}=/usr/src/debug/fmlib/git-r1"
+           -fdebug-prefix-map=${STAGING_KERNEL_DIR}=/usr/src/debug/fmlib/git-r1"
 EXTRA_OEMAKE = "DESTDIR=${D} PREFIX=${prefix} LIB_DEST_DIR=${libdir} \
-        CROSS_COMPILE=${TARGET_PREFIX} KERNEL_SRC=${STAGING_KERNEL_DIR}"
+                CROSS_COMPILE=${TARGET_PREFIX} KERNEL_SRC=${STAGING_KERNEL_DIR}"
 TARGET_ARCH_FMLIB = "${DEFAULTTUNE}"
 TARGET_ARCH_FMLIB:qoriq-arm = "arm"
diff --git a/recipes-dpaa2/aiopsl/aiopsl_git.bb b/recipes-dpaa2/aiopsl/aiopsl_git.bb
index b57e33afd..661c3af50 100644
--- a/recipes-dpaa2/aiopsl/aiopsl_git.bb
+++ b/recipes-dpaa2/aiopsl/aiopsl_git.bb
@@ -1,4 +1,6 @@
+SUMMARY = "DPAA2 AIOP service layer"
 DESCRIPTION = "DPAA2 Accelerated I/O Processing service layer"
+HOMEPAGE = "https://github.com/nxp-qoriq/aiopsl"
 SECTION = "dpaa2"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=faf479bdc4702d8033049f97e153f876"
diff --git a/recipes-dpaa2/dce/dce_git.bb b/recipes-dpaa2/dce/dce_git.bb
index a40b1672e..f2c6e5b88 100644
--- a/recipes-dpaa2/dce/dce_git.bb
+++ b/recipes-dpaa2/dce/dce_git.bb
@@ -1,11 +1,13 @@
+SUMMARY = "DPAA2 DCE userspace utilities"
 DESCRIPTION = "Decompression Compression Engine Userspace Utils"
+HOMEPAGE = "https://github.com/nxp-qoriq/dce"
 SECTION = "dpaa2"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=956df5ea6cfe0a1dcf2dee7ca37c0cdf"
 SRC_URI = "git://github.com/nxp-qoriq/dce;protocol=https;nobranch=1 \
-      git://github.com/nxp-qoriq/qbman_userspace;protocol=https;nobranch=1;name=qbman;destsuffix=${S}/lib/qbman_userspace \
+           git://github.com/nxp-qoriq/qbman_userspace;protocol=https;nobranch=1;name=qbman;destsuffix=${S}/lib/qbman_userspace \
-      file://0001-support-user-merge.patch \
+           file://0001-support-user-merge.patch \
 "
 SRCREV = "88ef2e8c3845532ee64cea4349fd38fb2bd5f807"
 SRCREV_qbman = "2f92993a9f34e5221d6b36c63b9e30ef703e9ac3"
diff --git a/recipes-dpaa2/gpp-aioptool/gpp-aioptool_git.bb b/recipes-dpaa2/gpp-aioptool/gpp-aioptool_git.bb
index 853dda9d7..026ce7100 100644
--- a/recipes-dpaa2/gpp-aioptool/gpp-aioptool_git.bb
+++ b/recipes-dpaa2/gpp-aioptool/gpp-aioptool_git.bb
@@ -1,14 +1,16 @@
+SUMMARY = "AIOP Tool userspace application"
 DESCRIPTION = "AIOP Tool is a userspace application for performing operations \
-on an AIOP Tile using MC interfaces. This application enables the user to \
+               on an AIOP Tile using MC interfaces. This application enables the user to \
-fetch status of tile, load a valid ELF file and run it on a tile and get and set \
+               fetch status of tile, load a valid ELF file and run it on a tile and get and set \
-time of day."
+               time of day."
+HOMEPAGE = "https://github.com/nxp-qoriq/gpp-aioptool"
 SECTION = "dpaa2"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9"
 SRC_URI = "git://github.com/nxp-qoriq/gpp-aioptool;protocol=https;nobranch=1 \
-    file://0001-remove-libio.h.patch \
+           file://0001-remove-libio.h.patch \
-    file://0001-add-fcommon-to-fix-gcc-10-build-issue.patch \
+           file://0001-add-fcommon-to-fix-gcc-10-build-issue.patch \
 "
 SRCREV = "6ead470dde043f3ca67f1ba19b313dd64ec199e1"
diff --git a/recipes-dpaa2/management-complex/management-complex_10.39.0.bb b/recipes-dpaa2/management-complex/management-complex_10.39.0.bb
index 3b5ae98ed..3e25e929c 100644
--- a/recipes-dpaa2/management-complex/management-complex_10.39.0.bb
+++ b/recipes-dpaa2/management-complex/management-complex_10.39.0.bb
@@ -1,4 +1,7 @@
 SUMMARY = "DPAA2 Management Complex Firmware"
+DESCRIPTION = "DPAA2 Management Complex (MC) firmware for NXP QorIQ Layerscape SoCs."
+HOMEPAGE = "https://github.com/nxp/qoriq-mc-binary"
+SECTION = "bsp"
 LICENSE = "NXP-Binary-EULA"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=0701845051a61f6012009d7d6d11b32b"
diff --git a/recipes-dpaa2/restool/restool_git.bb b/recipes-dpaa2/restool/restool_git.bb
index 7a90bc996..601517115 100644
--- a/recipes-dpaa2/restool/restool_git.bb
+++ b/recipes-dpaa2/restool/restool_git.bb
@@ -1,4 +1,7 @@
 SUMMARY = "DPAA2 Resource Manager Tool"
+DESCRIPTION = "Userspace resource manager tool for DPAA2 objects on NXP QorIQ SoCs."
+HOMEPAGE = "https://github.com/nxp-qoriq/restool"
+SECTION = "base"
 LICENSE = "BSD-3-Clause | GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=83af78c71766dd5fb1c1c3dd64a75ee7"
diff --git a/recipes-dpaa2/spc/spc_git.bb b/recipes-dpaa2/spc/spc_git.bb
index 93630a20c..8459dda01 100644
--- a/recipes-dpaa2/spc/spc_git.bb
+++ b/recipes-dpaa2/spc/spc_git.bb
@@ -1,18 +1,21 @@
 SUMMARY = "Soft Parser Configuration tool"
+DESCRIPTION = "Soft Parser Configuration tool for the DPAA Frame Manager."
+HOMEPAGE = "https://github.com/nxp-qoriq/spc"
+SECTION = "base"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=163b09a1c249a6ff2b28da1ceca2e0a8"
-DEPENDS = "libxml2 fmlib tclap"
+DEPENDS = "fmlib libxml2 tclap"
 SRC_URI = "git://github.com/nxp-qoriq/spc;protocol=https;nobranch=1"
 SRCREV = "b8d69580e5c6aeeb9f1354ee2faed6e0134eaef4"
 EXTRA_OEMAKE = 'FMD_USPACE_HEADER_PATH="${STAGING_INCDIR}/fmd" \
-    FMD_USPACE_LIB_PATH="${STAGING_LIBDIR}" LIBXML2_HEADER_PATH="${STAGING_INCDIR}/libxml2" \
+               FMD_USPACE_LIB_PATH="${STAGING_LIBDIR}" LIBXML2_HEADER_PATH="${STAGING_INCDIR}/libxml2" \
-    TCLAP_HEADER_PATH="${STAGING_INCDIR}" '
+               TCLAP_HEADER_PATH="${STAGING_INCDIR}" '
 EXTRA_OEMAKE:class-native = 'FMCHOSTMODE=1 FMD_USPACE_HEADER_PATH="${STAGING_INCDIR}/fmd" \
-    FMD_USPACE_LIB_PATH="${STAGING_LIBDIR}" LIBXML2_HEADER_PATH="${STAGING_INCDIR}/libxml2" \
+                            FMD_USPACE_LIB_PATH="${STAGING_LIBDIR}" LIBXML2_HEADER_PATH="${STAGING_INCDIR}/libxml2" \
-    TCLAP_HEADER_PATH="${STAGING_INCDIR}" '
+                            TCLAP_HEADER_PATH="${STAGING_INCDIR}" '
 EXTRA_OEMAKE_PLATFORM ?= ""
diff --git a/recipes-extended/crconf/crconf_git.bb b/recipes-extended/crconf/crconf_git.bb
index ed76351e1..5483c5a6c 100644
--- a/recipes-extended/crconf/crconf_git.bb
+++ b/recipes-extended/crconf/crconf_git.bb
@@ -1,4 +1,6 @@
 SUMMARY = "crconf -Linux crypto layer configuraton tool"
+DESCRIPTION = "Command-line tool to configure the Linux kernel crypto layer (crconf)."
+HOMEPAGE = "https://sourceforge.net/projects/crconf/"
 SECTION = "base"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://Makefile;beginline=1;endline=5;md5=0f77fc44eb5911007ae4ac9f6736e111"
diff --git a/recipes-extended/dpdk/dpdk_22.11.bb b/recipes-extended/dpdk/dpdk_22.11.bb
index 84bda4770..6460c855a 100644
--- a/recipes-extended/dpdk/dpdk_22.11.bb
+++ b/recipes-extended/dpdk/dpdk_22.11.bb
@@ -9,7 +9,7 @@ DEPENDS = "python3-pyelftools-native"
 DPDK_SRC ?= "git://github.com/nxp-qoriq/dpdk;protocol=https"
 SRC_URI = "${DPDK_SRC};nobranch=1 \
-          file://0001-meson.build-march-and-mcpu-already-passed-by-Yocto.patch"
+           file://0001-meson.build-march-and-mcpu-already-passed-by-Yocto.patch"
 SRCREV = "e09ece7ebcda131ee3d5a45999ad3396ee2092ae"
 inherit meson pkgconfig
@@ -25,14 +25,14 @@ DPDK_EXAMPLES ?= "l2fwd,l3fwd,l2fwd-crypto,ipsec-secgw,ip_fragmentation,ip_reass
 DPDK_APPS ?= "pdump,test-pmd,proc-info,test-crypto-perf"
 # kernel module is provide by dpdk-module recipe, so disable here
-EXTRA_OEMESON = " \
+EXTRA_OEMESON = "\
-        -Denable_kmods=false \
+    -Denable_kmods=false \
-        -Doptimization=3 \
+    -Doptimization=3 \
-        --cross-file ${S}/config/arm/arm64_poky_linux_gcc \
+    --cross-file ${S}/config/arm/arm64_poky_linux_gcc \
-        -Denable_driver_sdk=true \
+    -Denable_driver_sdk=true \
-        ${@bb.utils.contains('DISTRO_FEATURES', 'vpp', '-Dc_args="-Ofast -fPIC -ftls-model=local-dynamic"', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'vpp', '-Dc_args="-Ofast -fPIC -ftls-model=local-dynamic"', '', d)} \
-        -Denable_examples_source_install=false \
+    -Denable_examples_source_install=false \
-        -Denable_apps=${DPDK_APPS} \
+    -Denable_apps=${DPDK_APPS} \
 "
 do_install:append(){
diff --git a/recipes-extended/jailhouse/jailhouse-imx_git.bb b/recipes-extended/jailhouse/jailhouse-imx_git.bb
index 4bcb597e7..0eb23807a 100644
--- a/recipes-extended/jailhouse/jailhouse-imx_git.bb
+++ b/recipes-extended/jailhouse/jailhouse-imx_git.bb
@@ -4,13 +4,13 @@ SECTION = "jailhouse"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \
-                 file://tools/root-cell-config.c.tmpl;beginline=6;endline=33;md5=2825581c1666c44a17955dc574cfbfb3 \
+                    file://tools/root-cell-config.c.tmpl;beginline=6;endline=33;md5=2825581c1666c44a17955dc574cfbfb3 \
-                 file://include/jailhouse/hypercall.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \
+                    file://include/jailhouse/hypercall.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \
-                 file://include/jailhouse/cell-config.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \
+                    file://include/jailhouse/cell-config.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \
-                 file://include/arch/arm/asm/jailhouse_hypercall.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \
+                    file://include/arch/arm/asm/jailhouse_hypercall.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \
-                 file://include/arch/arm64/asm/jailhouse_hypercall.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \
+                    file://include/arch/arm64/asm/jailhouse_hypercall.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \
-                 file://include/arch/x86/asm/jailhouse_hypercall.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \
+                    file://include/arch/x86/asm/jailhouse_hypercall.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \
-                 file://driver/jailhouse.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \
+                    file://driver/jailhouse.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \
 "
 PROVIDES = "jailhouse"
@@ -26,9 +26,9 @@ SRC_URI = "${IMX_JAILHOUSE_SRC};branch=${SRCBRANCH} \
           file://arm-arm64-Makefile-Remove-march-option-from-Makefile.patch \
           file://0001-YOCIMX-9281-1-Fix-gcc15-errors.patch \
           file://0002-YOCIMX-9281-2-hypervisor-arm64-fix-strh-usage.patch \
-          "
+           "
-DEPENDS = " \
+DEPENDS = "\
    make-native \
    python3-mako-native \
    python3-mako \
@@ -96,14 +96,14 @@ FILES:${PN} += "${nonarch_base_libdir}/firmware ${libexecdir} ${sbindir} ${JH_DA
 FILES:${PN}:remove = "${libdir}/*"
 FILES:pyjailhouse = "${PYTHON_SITEPACKAGES_DIR}"
-RDEPENDS:${PN} += " \
+RDEPENDS:${PN} += "\
    pyjailhouse \
    python3-curses \
    python3-datetime \
    python3-mmap \
 "
-RDEPENDS:pyjailhouse = " \
+RDEPENDS:pyjailhouse = "\
    python3-core \
    python3-ctypes \
    python3-fcntl \
diff --git a/recipes-extended/libpkcs11/libpkcs11_git.bb b/recipes-extended/libpkcs11/libpkcs11_git.bb
index 347a8ef9a..2f97de27e 100644
--- a/recipes-extended/libpkcs11/libpkcs11_git.bb
+++ b/recipes-extended/libpkcs11/libpkcs11_git.bb
@@ -1,9 +1,10 @@
 DESCRIPTION = "PKCS library"
+HOMEPAGE = "https://github.com/nxp-qoriq/libpkcs11"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=803852533e29eb1d6d5e55ad3078b625"
 SRC_URI = "git://github.com/nxp-qoriq/libpkcs11;protocol=https;nobranch=1 \
-    file://0001-fix-multiple-definition-error.patch \
+           file://0001-fix-multiple-definition-error.patch \
 "
 SRCREV = "8d85182b7a7cd393ab6dd72930f8d1b69468f741"
@@ -20,7 +21,7 @@ EXTRA_OEMAKE = 'CC="${CC}" LD="${CC}" CFLAGS="${CFLAGS}"'
 do_compile() {
        export OPENSSL_PATH="${RECIPE_SYSROOT}/usr"
        export CROSS_COMPILE="${WRAP_TARGET_PREFIX}"
-        oe_runmake all 
+        oe_runmake all
 }
 do_install(){
diff --git a/recipes-extended/merge-files/merge-files_1.0.bb b/recipes-extended/merge-files/merge-files_1.0.bb
index a1f8a35a7..b3ed0040c 100644
--- a/recipes-extended/merge-files/merge-files_1.0.bb
+++ b/recipes-extended/merge-files/merge-files_1.0.bb
@@ -1,4 +1,7 @@
+SUMMARY = "Merge extra files into the rootfs"
 DESCRIPTION = "Merge prebuilt/extra files into rootfs"
+HOMEPAGE = "https://github.com/Freescale/meta-freescale/"
+SECTION = "base"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
diff --git a/recipes-extended/odp/odp.inc b/recipes-extended/odp/odp.inc
index 412667f01..adfd936d7 100644
--- a/recipes-extended/odp/odp.inc
+++ b/recipes-extended/odp/odp.inc
@@ -1,6 +1,6 @@
 SUMMARY = "Open Data Plane Interface Implementation"
 DESCRIPTION = "OpenDataPlane (ODP) provides a data plane application programming \
-        environment that is easy to use, high performance, and portable between networking SoCs."
+               environment that is easy to use, high performance, and portable between networking SoCs."
 HOMEPAGE = "http://www.opendataplane.org"
 SECTION = "console/network"
 LICENSE = "BSD-3-Clause"
@@ -8,10 +8,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ca6103dc75397fb6bec596187d6b7829"
 FILESEXTRAPATHS:prepend := "${THISDIR}/odp:"
-SRC_URI = " \
+SRC_URI = "\
-git://github.com/nxp-qoriq/odp;protocol=https;nobranch=1 \
+    git://github.com/nxp-qoriq/odp;protocol=https;nobranch=1 \
-git://github.com/nxp-qoriq/qbman_userspace;protocol=https;nobranch=1;name=qbman;destsuffix=${S}/platform/linux-dpaa2/flib/qbman \
+    git://github.com/nxp-qoriq/qbman_userspace;protocol=https;nobranch=1;name=qbman;destsuffix=${S}/platform/linux-dpaa2/flib/qbman \
-git://github.com/nxp-qoriq/flib;protocol=https;nobranch=1;name=rta;destsuffix=${S}/platform/linux-dpaa2/flib/rta \
+    git://github.com/nxp-qoriq/flib;protocol=https;nobranch=1;name=rta;destsuffix=${S}/platform/linux-dpaa2/flib/rta \
 "
 SRC_URI += "file://0001-Fix-this-build-error.patch"
diff --git a/recipes-extended/odp/odp_git.bb b/recipes-extended/odp/odp_git.bb
index 7d6600d00..e531515b1 100644
--- a/recipes-extended/odp/odp_git.bb
+++ b/recipes-extended/odp/odp_git.bb
@@ -4,9 +4,9 @@ inherit autotools-brokensep
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-DEPENDS = "openssl cunit libxml2"
+DEPENDS = "cunit libxml2 openssl"
-RDEPENDS:${PN} = "bash libcrypto libssl odp-module odp-counters"
+RDEPENDS:${PN} = "bash libcrypto libssl odp-counters odp-module"
 ODP_SOC ?= ""
 ODP_SOC:ls1043ardb = "LS1043"
@@ -28,7 +28,7 @@ EXTRA_OEMAKE = "CROSS_COMPILE="${TARGET_PREFIX}" \
 "
 CFLAGS += "-Wno-format-truncation -Wno-maybe-uninitialized -Wno-implicit-fallthrough -Wno-cpp -Wno-cast-function-type \
-          -Wno-stringop-truncation \
+           -Wno-stringop-truncation \
 "
 PACKAGECONFIG[perf] = "--enable-test-perf,,,"
diff --git a/recipes-extended/ofp/ofp_git.bb b/recipes-extended/ofp/ofp_git.bb
index 0f90dc5bb..98816ae60 100644
--- a/recipes-extended/ofp/ofp_git.bb
+++ b/recipes-extended/ofp/ofp_git.bb
@@ -1,4 +1,4 @@
-SUMMARY = "An open source user space fast path TCP/IP stack" 
+SUMMARY = "An open source user space fast path TCP/IP stack"
 DESCRIPTION = "openfastpath is used to enable accelerated routing/forwarding for IPv4 and IPv6, \
               tunneling and termination for a variety of protocols."
 HOMEPAGE = "http://www.openfastpath.org"
@@ -16,7 +16,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 DEPENDS = "odp"
-EXTRA_OECONF = " \
+EXTRA_OECONF = "\
    --prefix=/usr \
    --libdir=${libdir} \
    --host=${SIMPLE_TARGET_SYS} \
diff --git a/recipes-extended/ovs-dpdk/ovs-dpdk_3.1.bb b/recipes-extended/ovs-dpdk/ovs-dpdk_3.1.bb
index 5f235b4cf..263f1c12c 100644
--- a/recipes-extended/ovs-dpdk/ovs-dpdk_3.1.bb
+++ b/recipes-extended/ovs-dpdk/ovs-dpdk_3.1.bb
@@ -1,8 +1,9 @@
 DESCRIPTION = "Open Virtual switch based on DPDK"
+HOMEPAGE = "https://github.com/nxp-qoriq/ovs-dpdk"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1ce5d23a6429dff345518758f13aaeab"
-DEPENDS = "dpdk python3-six-native coreutils-native autoconf-native automake-native"
+DEPENDS = "autoconf-native automake-native coreutils-native dpdk python3-six-native"
 RDEPENDS:${PN} = "bash libcrypto libssl python3"
 inherit python3native pkgconfig
@@ -13,7 +14,7 @@ SRCREV = "7b4861e1f77bbea5ff9952717b66362fdecbca4d"
 do_configure() {
    export SYSROOT_DPDK=${PKG_CONFIG_SYSROOT_DIR}
    ${S}/boot.sh
-    ${S}/configure --host aarch64-fsl-linux --with-dpdk=static --with-openssl=${SYSROOT_DPDK}/usr CFLAGS="-g -Wno-cast-align -Ofast" 
+    ${S}/configure --host aarch64-fsl-linux --with-dpdk=static --with-openssl=${SYSROOT_DPDK}/usr CFLAGS="-g -Wno-cast-align -Ofast"
 }
 do_install:append() {
@@ -27,8 +28,8 @@ do_install:append() {
    install -m 0755 ${S}/utilities/ovs-ofctl ${D}${bindir}/ovs-dpdk
 }
-INSANE_SKIP:${PN}-dbg += " buildpaths"
+INSANE_SKIP:${PN}-dbg += "buildpaths"
-INSANE_SKIP:${PN} += " buildpaths"
+INSANE_SKIP:${PN} += "buildpaths"
 ALLOW_EMPTY:${PN} = "1"
 INHIBIT_PACKAGE_STRIP = "1"
diff --git a/recipes-extended/pktgen-dpdk/pktgen-dpdk_21.05.0.bb b/recipes-extended/pktgen-dpdk/pktgen-dpdk_21.05.0.bb
index 485f763bf..49a506a13 100644
--- a/recipes-extended/pktgen-dpdk/pktgen-dpdk_21.05.0.bb
+++ b/recipes-extended/pktgen-dpdk/pktgen-dpdk_21.05.0.bb
@@ -1,11 +1,12 @@
 DESCRIPTION = "PKTGEN DPDK"
+HOMEPAGE = "https://git.dpdk.org/apps/pktgen-dpdk/"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=0245ceedaef59ae0129500b0ce1e8a45"
-DEPENDS += "libpcap dpdk lua lua-native"
+DEPENDS += "dpdk libpcap lua lua-native"
 SRC_URI = "git://dpdk.org/git/apps/pktgen-dpdk;protocol=https;nobranch=1 \
-    file://fix-gcc11-mismatched-dealloc-error.patch \
+           file://fix-gcc11-mismatched-dealloc-error.patch \
 "
 SRCREV = "3a09aa916597fb9a97ee8eec50044cbdb9c4abde"
@@ -23,9 +24,9 @@ do_configure:prepend() {
 }
 do_install() {
-        install -d ${D}${bindir}/
+    install -d ${D}${bindir}/
-        install -m 0755 app/pktgen ${D}${bindir}/
+    install -m 0755 app/pktgen ${D}${bindir}/
-        install -m 0644 ${S}/Pktgen.lua ${D}${bindir}/
+    install -m 0644 ${S}/Pktgen.lua ${D}${bindir}/
 }
 INSANE_SKIP:${PN} = "ldflags"
diff --git a/recipes-extended/secure-obj/secure-obj-module_git.bb b/recipes-extended/secure-obj/secure-obj-module_git.bb
index c6bbc41df..73adcebf1 100644
--- a/recipes-extended/secure-obj/secure-obj-module_git.bb
+++ b/recipes-extended/secure-obj/secure-obj-module_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://../LICENSE;md5=751419260aa954499f7abaabaa882bbe"
 DEPENDS += "virtual/kernel"
-inherit module 
+inherit module
 S = "${UNPACKDIR}/${BP}/securekeydev"
diff --git a/recipes-extended/secure-obj/secure-obj.inc b/recipes-extended/secure-obj/secure-obj.inc
index 16115ff03..4ce06d17b 100644
--- a/recipes-extended/secure-obj/secure-obj.inc
+++ b/recipes-extended/secure-obj/secure-obj.inc
@@ -1,7 +1,8 @@
 DESCRIPTION = "Secure Object"
+HOMEPAGE = "https://github.com/nxp-qoriq/secure_obj"
 LICENSE = "BSD-3-Clause"
-DEPENDS = "openssl optee-os-qoriq optee-client-qoriq"
+DEPENDS = "openssl optee-client-qoriq optee-os-qoriq"
 RDEPENDS:${PN} = "bash libcrypto libssl"
 DEPENDS += "python3-pycryptodomex-native"
diff --git a/recipes-extended/secure-obj/secure-obj_git.bb b/recipes-extended/secure-obj/secure-obj_git.bb
index 4d197f57c..d0c513ba5 100644
--- a/recipes-extended/secure-obj/secure-obj_git.bb
+++ b/recipes-extended/secure-obj/secure-obj_git.bb
@@ -2,9 +2,9 @@ require secure-obj.inc
 LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
-DEPENDS:remove = " python3-pycryptodomex-native"
+DEPENDS:remove = "python3-pycryptodomex-native"
 DEPENDS:append = " python3-cryptography-native optee-os-qoriq-tadevkit"
-RDEPENDS:{PN}  += "secure-obj-module"
+RDEPENDS:${PN} += "secure-obj-module"
 WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}"
 export SECURE_STORAGE_PATH = "${S}/secure_storage_ta/ta/"
@@ -24,23 +24,23 @@ do_compile() {
        for APP in  secure_storage_ta securekey_lib secure_obj-openssl-engine; do
            cd  ${APP}
            oe_runmake
-            cd ..
+        cd ..
        done
 }
 do_install() {
-        install -d ${D}${bindir}
+    install -d ${D}${bindir}
-        install -d ${D}${includedir}
+    install -d ${D}${includedir}
-        install -d ${D}${base_libdir}/optee_armtz
+    install -d ${D}${base_libdir}/optee_armtz
-        install -d ${D}${libdir}/${ARCH}-linux-gnu/openssl-1.0.0/engines
+    install -d ${D}${libdir}/${ARCH}-linux-gnu/openssl-1.0.0/engines
-        cp ${S}/secure_storage_ta/ta/b05bcf48-9732-4efa-a9e0-141c7c888c34.ta ${D}${base_libdir}/optee_armtz
+    cp ${S}/secure_storage_ta/ta/b05bcf48-9732-4efa-a9e0-141c7c888c34.ta ${D}${base_libdir}/optee_armtz
-        cp ${S}/securekey_lib/out/export/lib/libsecure_obj.so ${D}${libdir}
+    cp ${S}/securekey_lib/out/export/lib/libsecure_obj.so ${D}${libdir}
-        cp ${S}/secure_obj-openssl-engine/libeng_secure_obj.so ${D}${libdir}/${ARCH}-linux-gnu/openssl-1.0.0/engines
+    cp ${S}/secure_obj-openssl-engine/libeng_secure_obj.so ${D}${libdir}/${ARCH}-linux-gnu/openssl-1.0.0/engines
-        cp ${S}/securekey_lib/out/export/app/*_app ${D}${bindir}
+    cp ${S}/securekey_lib/out/export/app/*_app ${D}${bindir}
-        cp ${S}/securekey_lib/out/export/app/mp_verify ${D}${bindir}
+    cp ${S}/securekey_lib/out/export/app/mp_verify ${D}${bindir}
-        cp ${S}/secure_obj-openssl-engine/app/sobj_eng_app ${D}${bindir}
+    cp ${S}/secure_obj-openssl-engine/app/sobj_eng_app ${D}${bindir}
-        cp ${S}/securekey_lib/out/export/include/*  ${D}${includedir}
+    cp ${S}/securekey_lib/out/export/include/*  ${D}${includedir}
-        rm -rf ${D}${bindir}/test
+    rm -rf ${D}${bindir}/test
 }
 FILES:${PN} += "${base_libdir}/optee_armtz ${libdir}/${ARCH}-linux-gnu/openssl-1.0.0/engines"
diff --git a/recipes-extended/skmm-ep/skmm-ep_git.bb b/recipes-extended/skmm-ep/skmm-ep_git.bb
index 72638766c..e6211ed9f 100644
--- a/recipes-extended/skmm-ep/skmm-ep_git.bb
+++ b/recipes-extended/skmm-ep/skmm-ep_git.bb
@@ -1,4 +1,6 @@
+SUMMARY = "SKMM PCIe endpoint application"
 DESCRIPTION = "SKMM application for PCIe endpoint"
+HOMEPAGE = "https://github.com/nxp-qoriq-yocto-sdk/skmm-ep"
 SECTION = "skmm-ep"
 LICENSE = "BSD & GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://Makefile;endline=30;md5=39e58bedc879163c9338596e52df5b1f"
@@ -8,7 +10,7 @@ DEPENDS = "libedit openssl virtual/kernel"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/skmm-ep;protocol=https;nobranch=1 \
-    file://add-two-missing-header-files.patch \
+           file://add-two-missing-header-files.patch \
 "
 SRCREV = "de6816c7d66129683bc62229b482ac3cf585d896"
@@ -18,11 +20,11 @@ export LIBEDIT_CFLAGS = "`pkg-config --cflags libedit`"
 export LIBEDIT_LDFLAGS = "`pkg-config --libs --static libedit`"
 do_compile () {
-        oe_runmake
+    oe_runmake
 }
 do_install () {
-        oe_runmake install DESTDIR=${D}
+    oe_runmake install DESTDIR=${D}
 }
 COMPATIBLE_MACHINE = "(p4080ds|t4240qds|c293pcie)"
diff --git a/recipes-extended/testfloat/testfloat_2a.bb b/recipes-extended/testfloat/testfloat_2a.bb
index 45e9365da..87187aa83 100644
--- a/recipes-extended/testfloat/testfloat_2a.bb
+++ b/recipes-extended/testfloat/testfloat_2a.bb
@@ -1,14 +1,17 @@
+SUMMARY = "Floating-point implementation test suite"
 DESCRIPTION = "A program for testing floating-point implementation"
+HOMEPAGE = "http://www.jhauser.us/arithmetic/TestFloat.html"
+SECTION = "devel"
 LICENSE = "TestFloat"
 LIC_FILES_CHKSUM = "file://testfloat/testfloat.txt;beginline=87;endline=95;md5=bdb2e8111838a48015c29bd97f5b6145"
-SRC_URI = " http://www.jhauser.us/arithmetic/TestFloat-2a.tar.Z;name=TestFloat \
+SRC_URI = "http://www.jhauser.us/arithmetic/TestFloat-2a.tar.Z;name=TestFloat \
-            http://www.jhauser.us/arithmetic/SoftFloat-2b.tar.Z;name=SoftFloat \
+           http://www.jhauser.us/arithmetic/SoftFloat-2b.tar.Z;name=SoftFloat \
-          "
+           "
 SRC_URI:append:qoriq-ppc = " file://SoftFloat-powerpc-1.patch \
-                              file://TestFloat-powerpc-E500v2-SPE-1.patch \
+                            file://TestFloat-powerpc-E500v2-SPE-1.patch \
-                              file://Yocto-replace-COMPILE_PREFIX-gcc.patch \
+                            file://Yocto-replace-COMPILE_PREFIX-gcc.patch \
                            "
 SRC_URI[TestFloat.sha256sum] = "84d14aa42adefbda2ec9708b42946f7fa59f93689b042684bd027863481f8e4e"
 SRC_URI[SoftFloat.sha256sum] = "89d14b55113a2ba8cbda7011443ba1d298d381c89d939515d56c5f18f2febf81"
diff --git a/recipes-extended/tsntool/tsntool_git.bb b/recipes-extended/tsntool/tsntool_git.bb
index f70e64e2b..f2911ddab 100644
--- a/recipes-extended/tsntool/tsntool_git.bb
+++ b/recipes-extended/tsntool/tsntool_git.bb
@@ -1,5 +1,6 @@
 SUMMARY = "Configure TSN funtionalitie"
 DESCRIPTION = "A tool to configure TSN funtionalities in user space"
+HOMEPAGE = "https://github.com/nxp-qoriq/tsntool"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ef58f855337069acd375717db0dbbb6d"
@@ -13,7 +14,7 @@ SRC_URI = "git://github.com/nxp-qoriq/tsntool;protocol=https;nobranch=1"
 SRCREV = "a0769e23304957a22f0cbeee6d1f547b20c3c21e"
 SRC_URI:append = " \
-        file://0001-tsntool-remove-redundant-parameters-from-BIN_LDFLAGS.patch \
+    file://0001-tsntool-remove-redundant-parameters-from-BIN_LDFLAGS.patch \
 "
 do_configure[depends] += "virtual/kernel:do_shared_workdir"
@@ -21,7 +22,7 @@ do_configure[depends] += "virtual/kernel:do_shared_workdir"
 do_compile:prepend() {
        mkdir -p ${S}/include/linux
        cp -r ${STAGING_KERNEL_DIR}/include/uapi/linux/tsn.h ${S}/include/linux
-}     
+}
 do_install() {
    install -d ${D}${bindir} ${D}${libdir}
    install -m 0755 ${S}/tsntool ${D}${bindir}
diff --git a/recipes-fsl/fsl-rc-local/fsl-rc-local.bb b/recipes-fsl/fsl-rc-local/fsl-rc-local.bb
index d5c8ebc31..607790f47 100644
--- a/recipes-fsl/fsl-rc-local/fsl-rc-local.bb
+++ b/recipes-fsl/fsl-rc-local/fsl-rc-local.bb
@@ -1,6 +1,9 @@
 # Copyright (C) 2012 O.S. Systems Software LTDA.
-DESCRIPTION = "Extra files for fsl-gui-image"
+SUMMARY = "Extra rc.local files for i.MX images"
+DESCRIPTION = "rc.local init snippets and helper files for Freescale/NXP images."
+HOMEPAGE = "https://github.com/Freescale/meta-freescale/"
+SECTION = "base"
 LICENSE = "LGPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=39ec502560ab2755c4555ee8416dfe42"
diff --git a/recipes-fsl/images/fsl-image-machine-test.bb b/recipes-fsl/images/fsl-image-machine-test.bb
index 43af6f7e9..34be8b32a 100644
--- a/recipes-fsl/images/fsl-image-machine-test.bb
+++ b/recipes-fsl/images/fsl-image-machine-test.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "A console-only image that includes gstreamer packages, \
-Freescale's multimedia packages (VPU and GPU) when available, and \
+               Freescale's multimedia packages (VPU and GPU) when available, and \
-test and benchmark applications."
+               test and benchmark applications."
-IMAGE_FEATURES += " \
+IMAGE_FEATURES += "\
    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \
       bb.utils.contains('DISTRO_FEATURES',     'x11', 'x11-base', \
                                                       '', d), d)} \
@@ -15,7 +15,7 @@ LICENSE = "MIT"
 inherit core-image
-CORE_IMAGE_EXTRA_INSTALL += " \
+CORE_IMAGE_EXTRA_INSTALL += "\
    packagegroup-fsl-gstreamer1.0 \
    packagegroup-fsl-gstreamer1.0-full \
    packagegroup-fsl-tools-gpu \
diff --git a/recipes-fsl/images/fsl-image-mfgtool-initramfs.bb b/recipes-fsl/images/fsl-image-mfgtool-initramfs.bb
index 7d79d1efe..63a599e13 100644
--- a/recipes-fsl/images/fsl-image-mfgtool-initramfs.bb
+++ b/recipes-fsl/images/fsl-image-mfgtool-initramfs.bb
@@ -1,7 +1,7 @@
 # Copyright (C) 2014 O.S. Systems Software LTDA.
 DESCRIPTION = "Small image to be used with Manufacturing Tool \
-(mfg-tool) in a production environment."
+               (mfg-tool) in a production environment."
 LICENSE = "MIT"
diff --git a/recipes-fsl/images/fsl-image-multimedia-full.bb b/recipes-fsl/images/fsl-image-multimedia-full.bb
index 0384162bc..24fdeae9e 100644
--- a/recipes-fsl/images/fsl-image-multimedia-full.bb
+++ b/recipes-fsl/images/fsl-image-multimedia-full.bb
@@ -3,6 +3,6 @@
 require fsl-image-multimedia.bb
-CORE_IMAGE_EXTRA_INSTALL += " \
+CORE_IMAGE_EXTRA_INSTALL += "\
    packagegroup-fsl-gstreamer1.0-full \
 "
diff --git a/recipes-fsl/images/fsl-image-multimedia.bb b/recipes-fsl/images/fsl-image-multimedia.bb
index 3a3ce28b8..86730c5cc 100644
--- a/recipes-fsl/images/fsl-image-multimedia.bb
+++ b/recipes-fsl/images/fsl-image-multimedia.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "A console-only image that includes gstreamer packages and \
-Freescale's multimedia packages (VPU and GPU) when available for the specific \
+               Freescale's multimedia packages (VPU and GPU) when available for the specific \
-machine."
+               machine."
 IMAGE_FEATURES += "\
    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'weston', \
@@ -12,7 +12,7 @@ LICENSE = "MIT"
 inherit core-image
-CORE_IMAGE_EXTRA_INSTALL += " \
+CORE_IMAGE_EXTRA_INSTALL += "\
    packagegroup-fsl-tools-gpu \
    packagegroup-fsl-gstreamer1.0 \
    packagegroup-imx-tools-audio \
diff --git a/recipes-fsl/images/fsl-image-network-full-cmdline.bb b/recipes-fsl/images/fsl-image-network-full-cmdline.bb
index 01f47c3e5..6b9fa705e 100644
--- a/recipes-fsl/images/fsl-image-network-full-cmdline.bb
+++ b/recipes-fsl/images/fsl-image-network-full-cmdline.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "A console-only image that includes full cmdline and \
-Freescale's networking packages (QorIQ DPAA/DPAA2) when available."
+               Freescale's networking packages (QorIQ DPAA/DPAA2) when available."
-IMAGE_FEATURES += " \
+IMAGE_FEATURES += "\
    debug-tweaks \
    tools-profile \
 "
diff --git a/recipes-fsl/mcore-demos/imx-mcore-demos.inc b/recipes-fsl/mcore-demos/imx-mcore-demos.inc
index 2375e471d..0d6797b59 100644
--- a/recipes-fsl/mcore-demos/imx-mcore-demos.inc
+++ b/recipes-fsl/mcore-demos/imx-mcore-demos.inc
@@ -2,38 +2,40 @@
 # Released under the MIT license (see COPYING.MIT for the terms)
 SUMMARY = "i.MX M4/M7/M33 core Demo images"
+DESCRIPTION = "Prebuilt demo firmware images for the Cortex-M auxiliary cores (M4/M7/M33) found on i.MX application processors."
+HOMEPAGE = "https://www.nxp.com/"
 SECTION = "app"
 LICENSE = "Proprietary"
 inherit deploy fsl-eula-unpack
-SOC                ?= "INVALID"
+SOC ?= "INVALID"
-SOC:mx7ulp-nxp-bsp  = "imx7ulp"
+SOC:mx7ulp-nxp-bsp = "imx7ulp"
-SOC:mx7d-nxp-bsp    = "imx7d-sabresd"
+SOC:mx7d-nxp-bsp = "imx7d-sabresd"
-SOC:mx8dxl-nxp-bsp  = "imx8dxl"
+SOC:mx8dxl-nxp-bsp = "imx8dxl"
-SOC:mx8mm-nxp-bsp   = "imx8mm"
+SOC:mx8mm-nxp-bsp = "imx8mm"
-SOC:mx8mn-nxp-bsp   = "imx8mn"
+SOC:mx8mn-nxp-bsp = "imx8mn"
 SOC:mx8mnul-nxp-bsp = "imx8mnddr3l"
-SOC:mx8mp-nxp-bsp   = "imx8mp"
+SOC:mx8mp-nxp-bsp = "imx8mp"
 SOC:mx8mpul-nxp-bsp = "imx8mp"
-SOC:mx8mq-nxp-bsp   = "imx8mq"
+SOC:mx8mq-nxp-bsp = "imx8mq"
-SOC:mx8qm-nxp-bsp   = "imx8qm"
+SOC:mx8qm-nxp-bsp = "imx8qm"
-SOC:mx8qxp-nxp-bsp  = "imx8qx"
+SOC:mx8qxp-nxp-bsp = "imx8qx"
-SOC:mx8dx-nxp-bsp   = "imx8qx"
+SOC:mx8dx-nxp-bsp = "imx8qx"
-SOC:mx8ulp-nxp-bsp  = "imx8ulp"
+SOC:mx8ulp-nxp-bsp = "imx8ulp"
-SOC:mx93-nxp-bsp    = "imx93"
+SOC:mx93-nxp-bsp = "imx93"
-SOC:mx94-nxp-bsp    = "imx943"
+SOC:mx94-nxp-bsp = "imx943"
-SOC:mx95-nxp-bsp    = "imx95"
+SOC:mx95-nxp-bsp = "imx95"
-MCORE_TYPE  ?= "m4"
+MCORE_TYPE ?= "m4"
-MCORE_TYPE:mx8mn-nxp-bsp  = "m7"
+MCORE_TYPE:mx8mn-nxp-bsp = "m7"
 MCORE_TYPE:mx8mnul-nxp-bsp = "m7"
-MCORE_TYPE:mx8mp-nxp-bsp  = "m7"
+MCORE_TYPE:mx8mp-nxp-bsp = "m7"
-MCORE_TYPE:mx8mpul-nxp-bsp  = "m7"
+MCORE_TYPE:mx8mpul-nxp-bsp = "m7"
-MCORE_TYPE:mx8ulp-nxp-bsp  = "m33"
+MCORE_TYPE:mx8ulp-nxp-bsp = "m33"
-MCORE_TYPE:mx93-nxp-bsp  = "m33"
+MCORE_TYPE:mx93-nxp-bsp = "m33"
-MCORE_TYPE:mx943-nxp-bsp  = "mcore"
+MCORE_TYPE:mx943-nxp-bsp = "mcore"
-MCORE_TYPE:mx95-nxp-bsp  = "m7"
+MCORE_TYPE:mx95-nxp-bsp = "m7"
 SRC_URI = "${FSL_MIRROR}/${SOC}-${MCORE_TYPE}-demo-${PV}.bin;name=${SOC};fsl-eula=true"
@@ -41,7 +43,7 @@ S = "${UNPACKDIR}/${SOC}-${MCORE_TYPE}-demo-${PV}"
 SCR = "SCR-${SOC}-${MCORE_TYPE}-demo.txt"
-MCORE_DEMO_FILE_EXTENSION               ?= "bin"
+MCORE_DEMO_FILE_EXTENSION ?= "bin"
 MCORE_DEMO_FILE_EXTENSION:mx7ulp-nxp-bsp = "img"
 do_install () {
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer1.0-commercial.bb b/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer1.0-commercial.bb
index 9a86e5013..e4f8d5e05 100644
--- a/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer1.0-commercial.bb
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer1.0-commercial.bb
@@ -1,17 +1,17 @@
 DESCRIPTION = "Package group used by FSL Community to provide audio and video plugins \
-that are subject to restricted licensing and/or royalties and thus require \
+               that are subject to restricted licensing and/or royalties and thus require \
-the 'commercial' license whitelist flag"
+               the 'commercial' license whitelist flag"
 SUMMARY = "FSL Community package group - set of GStreamer 1.0 plugins with commercial licence flag"
 LICENSE_FLAGS = "commercial"
 inherit packagegroup
-RDEPENDS:${PN} = " \
+RDEPENDS:${PN} = "\
    packagegroup-fsl-gstreamer1.0 \
 "
 # Plugins from the -ugly collection which require the "commercial" flag in LICENSE_FLAGS_ACCEPTED to be set
-RDEPENDS:${PN} = " \
+RDEPENDS:${PN} = "\
    gstreamer1.0-plugins-ugly-asf \
    gstreamer1.0-libav \
 "
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer1.0-full.bb b/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer1.0-full.bb
index 6b2c3ac0e..0dc138bac 100644
--- a/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer1.0-full.bb
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer1.0-full.bb
@@ -1,11 +1,11 @@
 DESCRIPTION = "Package group used by FSL Community to provide all GStreamer plugins from the \
-base, good, and bad packages, as well as the ugly and libav ones if commercial packages \
+               base, good, and bad packages, as well as the ugly and libav ones if commercial packages \
-are whitelisted, and plugins for the required hardware acceleration (if supported by the SoC)."
+               are whitelisted, and plugins for the required hardware acceleration (if supported by the SoC)."
 SUMMARY = "FSL Community package group - full set of all GStreamer 1.0 plugins"
 inherit packagegroup
-RDEPENDS:${PN} = " \
+RDEPENDS:${PN} = "\
    packagegroup-fsl-gstreamer1.0 \
    ${@bb.utils.contains('LICENSE_FLAGS_ACCEPTED', 'commercial', 'packagegroup-fsl-gstreamer1.0-commercial', '', d)} \
    gstreamer1.0-plugins-base-meta \
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer1.0.bb b/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer1.0.bb
index aef582a57..ebc098664 100644
--- a/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer1.0.bb
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer1.0.bb
@@ -1,12 +1,12 @@
 DESCRIPTION = "Package group used by FSL Community to provide audio, video, networking and debug \
-GStreamer plugins with the required hardware acceleration (if supported by the SoC)."
+               GStreamer plugins with the required hardware acceleration (if supported by the SoC)."
 SUMMARY = "FSL Community package group - set of commonly used GStreamer 1.0 plugins"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 inherit packagegroup
-PACKAGES += " \
+PACKAGES += "\
    ${PN}-base \
    ${PN}-audio \
    ${PN}-video \
@@ -18,26 +18,26 @@ PACKAGES += " \
 MACHINE_GSTREAMER_1_0_PLUGIN ?= ""
-RDEPENDS:${PN} = " \
+RDEPENDS:${PN} = "\
    ${PN}-audio \
-    ${PN}-video \
-    ${PN}-network-base \
    ${PN}-debug \
+    ${PN}-network-base \
+    ${PN}-video \
 "
 # List of X11 specific plugins
-GST_X11_PACKAGES = " \
+GST_X11_PACKAGES = "\
    gstreamer1.0-plugins-base-ximagesink \
    gstreamer1.0-plugins-base-xvimagesink \
 "
 # List of Wayland specific plugins
-GST_WAYLAND_PACKAGES = " \
+GST_WAYLAND_PACKAGES = "\
    gstreamer1.0-plugins-bad-waylandsink \
 "
 # basic plugins required in virtually every pipeline
-RDEPENDS:${PN}-base = " \
+RDEPENDS:${PN}-base = "\
    gstreamer1.0 \
    gstreamer1.0-plugins-base-playback \
    ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'gstreamer1.0-plugins-base-alsa', '', d)} \
@@ -52,14 +52,14 @@ RDEPENDS:${PN}-base = " \
    ${@bb.utils.contains("MACHINE_GSTREAMER_1_0_PLUGIN", "imx-gst1.0-plugin", "imx-gst1.0-plugin-tools", "", d)} \
 "
-RRECOMMENDS:${PN}-base = " \
+RRECOMMENDS:${PN}-base = "\
    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${GST_X11_PACKAGES}', \
                          bb.utils.contains('DISTRO_FEATURES', 'wayland', \
                                            '${GST_WAYLAND_PACKAGES}', '', d), d)} \
 "
 # Basic audio plugins: parsers, demuxers, decoders
-RDEPENDS:${PN}-audio = " \
+RDEPENDS:${PN}-audio = "\
    ${PN}-base \
    gstreamer1.0-plugins-base-ogg \
    gstreamer1.0-plugins-good-audioparsers \
@@ -71,7 +71,7 @@ RDEPENDS:${PN}-audio = " \
 "
 # Basic video plugins: parsers, demuxers
-RDEPENDS:${PN}-video = " \
+RDEPENDS:${PN}-video = "\
    ${PN}-base \
    gstreamer1.0-plugins-base-subparse \
    gstreamer1.0-plugins-base-theora \
@@ -81,12 +81,12 @@ RDEPENDS:${PN}-video = " \
    gstreamer1.0-plugins-good-matroska \
 "
-RRECOMMENDS:${PN}-video = " \
+RRECOMMENDS:${PN}-video = "\
    ${PN}-audio \
 "
 # Additional video plugins from the -bad collection
-RDEPENDS:${PN}-video-bad = " \
+RDEPENDS:${PN}-video-bad = "\
    ${PN}-video \
    gstreamer1.0-plugins-bad-mpegpsdemux \
    gstreamer1.0-plugins-bad-mpegtsdemux \
@@ -94,7 +94,7 @@ RDEPENDS:${PN}-video-bad = " \
 "
 # Plugins used for diagnostics and debugging of pipelines
-RDEPENDS:${PN}-debug = " \
+RDEPENDS:${PN}-debug = "\
    ${PN}-base \
    gstreamer1.0-plugins-base-audiotestsrc \
    gstreamer1.0-plugins-base-videotestsrc \
@@ -103,14 +103,14 @@ RDEPENDS:${PN}-debug = " \
 "
 # Basic networking plugins required by most pipelines that receive and/or send data
-RDEPENDS:${PN}-network-base = " \
+RDEPENDS:${PN}-network-base = "\
    gstreamer1.0-plugins-base-tcp \
    gstreamer1.0-plugins-good-soup \
    gstreamer1.0-plugins-good-udp \
 "
 # Additional networking plugins
-RDEPENDS:${PN}-network = " \
+RDEPENDS:${PN}-network = "\
    ${PN}-network-base \
    gstreamer1.0-plugins-good-rtp \
    gstreamer1.0-plugins-good-rtpmanager \
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-isp.bb b/recipes-fsl/packagegroups/packagegroup-fsl-isp.bb
index 09eac053b..60905bd8a 100644
--- a/recipes-fsl/packagegroups/packagegroup-fsl-isp.bb
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-isp.bb
@@ -4,12 +4,12 @@ DESCRIPTION = "Add packages for ISP build"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 inherit packagegroup
-ISP_PKGS      ?= ""
+ISP_PKGS ?= ""
-ISP_PKGS:mx8mp-nxp-bsp = " \
+ISP_PKGS:mx8mp-nxp-bsp = "\
    isp-imx \
    basler-camera \
    kernel-module-isp-vvcam \
 "
-RDEPENDS:${PN} = " \
+RDEPENDS:${PN} = "\
    ${ISP_PKGS} \
 "
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bb b/recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bb
index d0367fdb7..890cd3cea 100644
--- a/recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bb
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bb
@@ -7,7 +7,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 inherit packagegroup
-PACKAGES = " \
+PACKAGES = "\
    ${PN}-base \
    ${PN}-mtd \
    ${PN}-extfs \
@@ -20,7 +20,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
 # Distro can override the following VIRTUAL-RUNTIME providers:
 VIRTUAL-RUNTIME_keymaps ?= "keymaps"
-RDEPENDS:${PN}-base = " \
+RDEPENDS:${PN}-base = "\
    bash \
    imx-uuc \
    util-linux \
@@ -34,16 +34,16 @@ RDEPENDS:${PN}-base = " \
    ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \
 "
-RDEPENDS:${PN}-mtd = " \
+RDEPENDS:${PN}-mtd = "\
    ${PN}-base \
    imx-kobs \
    mtd-utils \
    mtd-utils-ubifs \
 "
-RDEPENDS:${PN}-extfs = " \
+RDEPENDS:${PN}-extfs = "\
    ${PN}-base \
-    e2fsprogs-mke2fs \
    e2fsprogs-e2fsck \
+    e2fsprogs-mke2fs \
 "
 COMPATIBLE_MACHINE = "(imx-generic-bsp)"
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-network.bb b/recipes-fsl/packagegroups/packagegroup-fsl-network.bb
index 96e3097d5..12c0aa3eb 100644
--- a/recipes-fsl/packagegroups/packagegroup-fsl-network.bb
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-network.bb
@@ -9,41 +9,41 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 inherit packagegroup
 NETWORK_TOOLS = "\
-        ethtool \
+    ethtool \
 "
 NETWORK_TOOLS:append:qoriq = " \
-        ceetm \
+    ceetm \
-        dpdk \
+    dpdk \
-        ovs-dpdk \
+    ovs-dpdk \
-        pktgen-dpdk \
+    pktgen-dpdk \
-        tsntool \
+    tsntool \
 "
 # Data Place Acceleration Architecture
-NETWORK_TOOLS:append:fsl-lsch2 = "\
+NETWORK_TOOLS:append:fsl-lsch2 = " \
-        eth-config \
+    eth-config \
 "
 # 2nd generation Data Place Acceleration Architecture
-NETWORK_TOOLS:append:ls1088a = "\
+NETWORK_TOOLS:append:ls1088a = " \
-        aiopsl \
+    aiopsl \
-        gpp-aioptool \
+    gpp-aioptool \
-        ofp \
+    ofp \
 "
-NETWORK_TOOLS:append:ls2088a = "\
+NETWORK_TOOLS:append:ls2088a = " \
-        aiopsl \
+    aiopsl \
-        gpp-aioptool \
+    gpp-aioptool \
-        ofp \
+    ofp \
 "
-NETWORK_TOOLS:append:fsl-lsch3 = "\
+NETWORK_TOOLS:append:fsl-lsch3 = " \
-        dce \
+    dce \
-        restool \
+    restool \
-        spc \
+    spc \
 "
-RDEPENDS:${PN} = " \
+RDEPENDS:${PN} = "\
    ${NETWORK_TOOLS} \
 "
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb
index a361a4dd2..6011fff27 100644
--- a/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb
@@ -2,8 +2,8 @@
 # Copyright (C) 2015, 2016 O.S. Systems Software LTDA.
 # Released under the MIT license (see COPYING.MIT for the terms)
 DESCRIPTION = "Package group used by FSL Community to provide graphic packages used \
-to test the several hardware accelerated graphics APIs including packages not \
+               to test the several hardware accelerated graphics APIs including packages not \
-provided by Freescale."
+               provided by Freescale."
 SUMMARY = "FSL Community Package group - tools/gpu/external"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -11,7 +11,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 inherit packagegroup
 SOC_TOOLS_GPU_X11 = ""
-SOC_TOOLS_GPU_X11:imxgpu2d = " mesa-demos glmark2 gtkperf"
+SOC_TOOLS_GPU_X11:imxgpu2d = "mesa-demos glmark2 gtkperf"
 SOC_TOOLS_GPU_FB = ""
@@ -20,7 +20,7 @@ SOC_TOOLS_GPU_WAYLAND = ""
 SOC_TOOLS_GPU_XWAYLAND = ""
 SOC_TOOLS_GPU_XWAYLAND:imxgpu2d = "mesa-demos gtkperf"
-RDEPENDS:${PN} = " \
+RDEPENDS:${PN} = "\
    ${@bb.utils.contains("DISTRO_FEATURES", "x11 wayland", "${SOC_TOOLS_GPU_XWAYLAND}", \
       bb.utils.contains("DISTRO_FEATURES",     "wayland", "${SOC_TOOLS_GPU_WAYLAND}", \
       bb.utils.contains("DISTRO_FEATURES",         "x11", "${SOC_TOOLS_GPU_X11}", \
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb
index c7e820adb..11c6a9b55 100644
--- a/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb
@@ -12,7 +12,7 @@ inherit packagegroup
 SOC_TOOLS_GPU = ""
 # i.MX6 SoloLite does not support apitrace because of its dependency on gles2.
-SOC_TOOLS_GPU:imxgpu2d = " \
+SOC_TOOLS_GPU:imxgpu2d = "\
    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \
       bb.utils.contains('DISTRO_FEATURES',     'x11', 'xserver-xorg-extension-viv-autohdmi', \
                                                       '', d), d)} \
@@ -27,6 +27,6 @@ SOC_TOOLS_GPU:append:imxgpu = " \
    imx-gpu-viv-tools \
 "
-RDEPENDS:${PN} = " \
+RDEPENDS:${PN} = "\
    ${SOC_TOOLS_GPU} \
 "
diff --git a/recipes-fsl/packagegroups/packagegroup-imx-tools-audio.bb b/recipes-fsl/packagegroups/packagegroup-imx-tools-audio.bb
index 54a428fdf..ae4683723 100644
--- a/recipes-fsl/packagegroups/packagegroup-imx-tools-audio.bb
+++ b/recipes-fsl/packagegroups/packagegroup-imx-tools-audio.bb
@@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 inherit packagegroup
-ALSA_INSTALL = " \
+ALSA_INSTALL = "\
    alsa-utils \
    alsa-tools \
 "
-PULSEAUDIO_INSTALL = " \
+PULSEAUDIO_INSTALL = "\
    pulseaudio-server \
    pulseaudio-module-cli \
    pulseaudio-misc \
@@ -27,7 +27,7 @@ PULSEAUDIO_INSTALL = " \
                                           "", d)} \
 "
-RDEPENDS:${PN} = " \
+RDEPENDS:${PN} = "\
    ${@bb.utils.contains("DISTRO_FEATURES", "alsa",  "${ALSA_INSTALL}", "", d)} \
    ${@bb.utils.contains("DISTRO_FEATURES", "pulseaudio",  "${PULSEAUDIO_INSTALL}", "", d)} \
 "
diff --git a/recipes-graphics/devil/devil_1.8.0.bb b/recipes-graphics/devil/devil_1.8.0.bb
index dcbdf3ac1..4c37b6298 100644
--- a/recipes-graphics/devil/devil_1.8.0.bb
+++ b/recipes-graphics/devil/devil_1.8.0.bb
@@ -1,10 +1,12 @@
+SUMMARY = "Cross-platform image library"
 DESCRIPTION = "A full featured cross-platform image library"
+HOMEPAGE = "https://openil.sourceforge.net/"
 SECTION = "libs"
 LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1-only;md5=1a6d268fd218675ffea8be556788b780"
 PR = "r0"
-DEPENDS = "libpng jpeg tiff xz"
+DEPENDS = "jpeg libpng tiff xz"
 SRC_URI = "http://sourceforge.net/projects/openil/files/DevIL/${PV}/DevIL-${PV}.zip"
 SRC_URI[sha256sum] = "451337f392c65bfb83698a781370534dc63d7bafca21e9b37178df0518f7e895"
diff --git a/recipes-graphics/drm/libdrm_2.4.127.imx.bb b/recipes-graphics/drm/libdrm_2.4.127.imx.bb
index 198db014e..685e3f04a 100644
--- a/recipes-graphics/drm/libdrm_2.4.127.imx.bb
+++ b/recipes-graphics/drm/libdrm_2.4.127.imx.bb
@@ -7,9 +7,9 @@ HOMEPAGE = "http://dri.freedesktop.org"
 SECTION = "x11/base"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=9eb1f4831351ab42d762c40b3ebb7add \
-                    file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71"
+            file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71"
-PROVIDES = "drm"
 DEPENDS = "libpthread-stubs"
+PROVIDES = "drm"
 SRC_URI = "${IMX_LIBDRM_SRC};branch=${SRCBRANCH}"
 IMX_LIBDRM_SRC ?= "git://github.com/nxp-imx/libdrm-imx.git;protocol=https"
@@ -46,10 +46,6 @@ PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \
             ${PN}-intel ${PN}-exynos ${PN}-freedreno ${PN}-amdgpu \
             ${PN}-etnaviv"
-RRECOMMENDS:${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \
-                             ${PN}-exynos ${PN}-freedreno ${PN}-amdgpu \
-                             ${PN}-etnaviv"
 FILES:${PN}-tests = "${bindir}/*"
 FILES:${PN}-radeon = "${libdir}/libdrm_radeon.so.*"
 FILES:${PN}-nouveau = "${libdir}/libdrm_nouveau.so.*"
@@ -60,6 +56,10 @@ FILES:${PN}-freedreno = "${libdir}/libdrm_freedreno.so.*"
 FILES:${PN}-amdgpu = "${libdir}/libdrm_amdgpu.so.* ${datadir}/${PN}/amdgpu.ids"
 FILES:${PN}-etnaviv = "${libdir}/libdrm_etnaviv.so.*"
+RRECOMMENDS:${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \
+                             ${PN}-exynos ${PN}-freedreno ${PN}-amdgpu \
+                             ${PN}-etnaviv"
 BBCLASSEXTEND = "native nativesdk"
 PACKAGES:prepend:imxgpu = "${PN}-vivante "
diff --git a/recipes-graphics/gli/gli_0.8.4.0.bb b/recipes-graphics/gli/gli_0.8.4.0.bb
index 14d6a75ed..f1ab37606 100644
--- a/recipes-graphics/gli/gli_0.8.4.0.bb
+++ b/recipes-graphics/gli/gli_0.8.4.0.bb
@@ -9,7 +9,7 @@ SECTION = "libs"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://readme.md;beginline=19;endline=20;md5=ab03b667ee630c1abb1add70365a50fb"
-SRC_URI = " \
+SRC_URI = "\
    git://github.com/g-truc/gli;protocol=https;branch=master \
 "
 SRCREV = "0c171ee87fcfe35a7e0e0445adef06f92e0b6a91"
diff --git a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.5.0.2.bb b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.5.0.2.bb
index 94a876a94..320ba3017 100644
--- a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.5.0.2.bb
+++ b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.5.0.2.bb
@@ -2,12 +2,15 @@
 # Copyright 2017-2025 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
+SUMMARY = "i.MX DPU G2D library"
 DESCRIPTION = "G2D library using i.MX DPU"
+HOMEPAGE = "https://www.nxp.com/"
+SECTION = "graphics"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac" 
+LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
 DEPENDS = "libdrm ${LIBGAL_IMX}"
-LIBGAL_IMX        = ""
+LIBGAL_IMX = ""
 LIBGAL_IMX:imxviv = "libgal-imx"
 PROVIDES += "virtual/libg2d"
@@ -33,6 +36,8 @@ do_install () {
    cp -Pr ${S}/g2d/usr/include/* ${D}${includedir}
 }
+PACKAGE_ARCH = "${MACHINE_SOCARCH}"
 INSANE_SKIP:append:libc-musl = " file-rdeps"
 RDEPENDS:${PN}:append:libc-musl = " gcompat"
@@ -42,5 +47,4 @@ INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_SYSROOT_STRIP = "1"
-PACKAGE_ARCH = "${MACHINE_SOCARCH}"
 COMPATIBLE_MACHINE = "(imxdpu)"
diff --git a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
index af92476e1..147b0620c 100644
--- a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
+++ b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
@@ -1,5 +1,7 @@
 SUMMARY = "i.MX G2D Samples"
 DESCRIPTION = "Set of sample applications for i.MX G2D"
+HOMEPAGE = "https://github.com/nxp-imx/g2d-samples"
+SECTION = "graphics"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=0858ec9c7a80c4a2cf16e4f825a2cc91"
@@ -15,13 +17,13 @@ SRCREV = "22ca65feb57702832fbaca7f7c9c8d691466e649"
 inherit pkgconfig
 PACKAGECONFIG ??= "${PACKAGECONFIG_IMPLEMENTATION}"
-PACKAGECONFIG_IMPLEMENTATION                   = ""
+PACKAGECONFIG_IMPLEMENTATION = ""
-PACKAGECONFIG_IMPLEMENTATION:imxgpu2d:imxdpu   = "dpu"
+PACKAGECONFIG_IMPLEMENTATION:imxgpu2d:imxdpu = "dpu"
-PACKAGECONFIG_IMPLEMENTATION:mx95-nxp-bsp      = "dpu95"
+PACKAGECONFIG_IMPLEMENTATION:mx95-nxp-bsp = "dpu95"
-PACKAGECONFIG_IMPLEMENTATION:imxgpu2d          = "gpu-drm"
+PACKAGECONFIG_IMPLEMENTATION:imxgpu2d = "gpu-drm"
 PACKAGECONFIG_IMPLEMENTATION:imxgpu2d:imxfbdev = "gpu-fbdev"
-PACKAGECONFIG_IMPLEMENTATION:mx93-nxp-bsp      = "pxp"
+PACKAGECONFIG_IMPLEMENTATION:mx93-nxp-bsp = "pxp"
-PACKAGECONFIG_IMPLEMENTATION:mx943-nxp-bsp     = "pxp"
+PACKAGECONFIG_IMPLEMENTATION:mx943-nxp-bsp = "pxp"
 PACKAGECONFIG[dpu] = " \
    BUILD_IMPLEMENTATION=dpu, \
@@ -59,7 +61,7 @@ PACKAGECONFIG[pxp] = " \
    , \
    dpu dpu95 gpu-drm gpu-fbdev"
-EXTRA_OEMAKE += " \
+EXTRA_OEMAKE += "\
    SDKTARGETSYSROOT=${STAGING_DIR_HOST} \
    ${PACKAGECONFIG_CONFARGS} \
 "
@@ -68,8 +70,8 @@ do_install() {
    oe_runmake install DESTDIR=${D}
 }
-FILES:${PN} += "/opt"
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
+FILES:${PN} += "/opt"
 COMPATIBLE_MACHINE = "(imxgpu2d|mx93-nxp-bsp|mx943-nxp-bsp|mx95-nxp-bsp)"
diff --git a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p4.4.bb b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p4.4.bb
index 1a359676f..fbb937b18 100644
--- a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p4.4.bb
+++ b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p4.4.bb
@@ -3,7 +3,10 @@
 # Copyright 2018 (C) O.S. Systems Software LTDA.
 # Released under the MIT license (see COPYING.MIT for the terms)
+SUMMARY = "i.MX GPU G2D library"
 DESCRIPTION = "G2D library using i.MX GPU"
+HOMEPAGE = "https://www.nxp.com/"
+SECTION = "graphics"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
 DEPENDS = "libgal-imx"
@@ -19,7 +22,7 @@ S = "${UNPACKDIR}/${IMX_BIN_NAME}"
 inherit fsl-eula-unpack
-SOC_INSTALL_DIR               = "SOC_INSTALL_DIR_NOT_SET"
+SOC_INSTALL_DIR = "SOC_INSTALL_DIR_NOT_SET"
 SOC_INSTALL_DIR:mx8mm-nxp-bsp = "mx8mm"
 do_install () {
diff --git a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb
index 2b848e89c..e99e8165a 100644
--- a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb
+++ b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb
@@ -2,7 +2,10 @@
 # Copyright 2017-2026 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
+SUMMARY = "i.MX PXP G2D library"
 DESCRIPTION = "G2D library using i.MX PXP"
+HOMEPAGE = "https://github.com/nxp-imx/imx-g2d-pxp"
+SECTION = "graphics"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a93b654673e1bc8398ed1f30e0813359"
@@ -18,7 +21,7 @@ SRCREV = "7dd4ca631b894a29389dadda5bd112cfa576b2d9"
 inherit use-imx-headers
 EXTRA_OEMAKE = "PLATFORM=${IMX_PLATFORM} INCLUDE='-I${STAGING_INCDIR_IMX}' DEST_DIR=${D}"
-IMX_PLATFORM:mx93-nxp-bsp  = "IMX93"
+IMX_PLATFORM:mx93-nxp-bsp = "IMX93"
 IMX_PLATFORM:mx943-nxp-bsp = "IMX943"
 do_install() {
diff --git a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb
index 5dea367a9..e846126b0 100644
--- a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb
+++ b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb
@@ -1,8 +1,11 @@
 # Copyright 2018 (C) O.S. Systems Software LTDA.
 SUMMARY = "Samples for OpenGL ES"
+DESCRIPTION = "OpenGL ES / EGL API tracing, replay and inspection tools for i.MX GPUs."
+HOMEPAGE = "https://github.com/nxp-imx/apitrace-imx"
+SECTION = "graphics"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=aeb969185a143c3c25130bc2c3ef9a50"
-DEPENDS = "zlib libpng procps"
+DEPENDS = "libpng procps zlib"
 SRC_URI = "git://github.com/nxp-imx/apitrace-imx.git;protocol=https;branch=imx_10.0 \
           file://0001-dlsym-workaround-glibc-2.34-build-failure.patch \
@@ -11,17 +14,17 @@ SRCREV = "522cb2981289b7ba20d6dd4b4bf75097e079815b"
 inherit cmake pkgconfig perlnative python3native
-PACKAGECONFIG ??= " \
+PACKAGECONFIG ??= "\
    egl \
    ${PACKAGECONFIG_BACKEND} \
    ${PACKAGECONFIG_GPU2D} \
 "
-PACKAGECONFIG_BACKEND = " \
+PACKAGECONFIG_BACKEND = "\
    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'waffle', \
       bb.utils.contains('DISTRO_FEATURES',     'x11',    'x11', \
                                                             '', d), d)} \
 "
-PACKAGECONFIG_GPU2D                 = ""
+PACKAGECONFIG_GPU2D = ""
 PACKAGECONFIG_GPU2D:imxviv:imxgpu2d = "vivante"
 PACKAGECONFIG[egl] = "-DENABLE_EGL=ON,-DENABLE_EGL=OFF,virtual/egl"
@@ -31,9 +34,11 @@ PACKAGECONFIG[waffle] = "-DENABLE_WAFFLE=ON,-DENABLE_WAFFLE=OFF,waffle"
 PACKAGECONFIG[x11] = "-DENABLE_X11=ON,-DENABLE_X11=OFF"
 PACKAGECONFIG[vivante] = "-DENABLE_VIVANTE=ON,-DENABLE_VIVANTE=OFF,virtual/libg2d"
+PACKAGE_ARCH = "${MACHINE_SOCARCH}"
 SOLIBS = ".so"
 FILES_SOLIBSDEV = ""
-FILES:${PN} += " \
+FILES:${PN} += "\
    ${libdir}/apitrace/scripts/* \
    ${libdir}/apitrace/wrappers/* \
 "
@@ -43,7 +48,6 @@ EXTRA_OECMAKE += "\
    -DENABLE_STATIC_LIBSTDCXX=OFF \
    -DPython3_ROOT_DIR=/usr/bin/python3-native \
 "
-PACKAGE_ARCH = "${MACHINE_SOCARCH}"
 COMPATIBLE_MACHINE = "(imxgpu)"
 SECURITY_CFLAGS:toolchain-clang = ""
diff --git a/recipes-graphics/imx-gpu-sdk/imx-gpu-sdk_6.1.1.bb b/recipes-graphics/imx-gpu-sdk/imx-gpu-sdk_6.1.1.bb
index e1510baf3..c51d112c2 100644
--- a/recipes-graphics/imx-gpu-sdk/imx-gpu-sdk_6.1.1.bb
+++ b/recipes-graphics/imx-gpu-sdk/imx-gpu-sdk_6.1.1.bb
@@ -1,5 +1,7 @@
 SUMMARY = "i.MX GPU SDK Samples"
 DESCRIPTION = "Set of sample applications for i.MX GPU"
+HOMEPAGE = "https://github.com/nxp-imx/gtec-demo-framework"
+SECTION = "graphics"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://License.md;md5=9d58a2573275ce8c35d79576835dbeb8"
@@ -7,8 +9,8 @@ DEPENDS_BACKEND = \
    "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', ' libxdg-shell wayland', \
        bb.utils.contains('DISTRO_FEATURES',     'x11',               ' xrandr', \
                                                                             '', d), d)}"
-DEPENDS_MX8       = ""
+DEPENDS_MX8 = ""
-DEPENDS_MX8:mx8-nxp-bsp   = " \
+DEPENDS_MX8:mx8-nxp-bsp = "\
    glslang-native \
    opencv \
    rapidopencl \
@@ -17,10 +19,10 @@ DEPENDS_MX8:mx8-nxp-bsp   = " \
    vulkan-headers \
    vulkan-loader \
 "
-DEPENDS_MX8:mx8mm-nxp-bsp = " \
+DEPENDS_MX8:mx8mm-nxp-bsp = "\
    opencv \
 "
-DEPENDS = " \
+DEPENDS = "\
    assimp \
    cmake-native \
    devil \
@@ -44,28 +46,27 @@ DEPENDS:append:imxgpu3d = " virtual/libgles2"
 require imx-gpu-sdk-src.inc
 WINDOW_SYSTEM = \
    "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'Wayland_XDG', \
        bb.utils.contains('DISTRO_FEATURES',     'x11',         'X11', \
                                                                 'FB', d), d)}"
-FEATURES                  = "ConsoleHost,EarlyAccess,EGL,GoogleUnitTest,Lib_NlohmannJson,OpenVG,Test_RequireUserInputToExit,WindowHost"
+FEATURES = "ConsoleHost,EarlyAccess,EGL,GoogleUnitTest,Lib_NlohmannJson,OpenVG,Test_RequireUserInputToExit,WindowHost"
-FEATURES:append:imxgpu    = ",HW_GPU_VIVANTE"
+FEATURES:append:imxgpu = ",HW_GPU_VIVANTE"
-FEATURES:append:imxgpu2d  = ",G2D"
+FEATURES:append:imxgpu2d = ",G2D"
-FEATURES:append:imxgpu3d  = ",OpenGLES2"
+FEATURES:append:imxgpu3d = ",OpenGLES2"
-FEATURES:append           = "${FEATURES_SOC}"
+FEATURES:append = "${FEATURES_SOC}"
-FEATURES_SOC              = ""
+FEATURES_SOC = ""
-FEATURES_SOC:mx6q-nxp-bsp         = ",OpenGLES3"
+FEATURES_SOC:mx6q-nxp-bsp = ",OpenGLES3"
-FEATURES_SOC:mx6dl-nxp-bsp        = ",OpenGLES3"
+FEATURES_SOC:mx6dl-nxp-bsp = ",OpenGLES3"
-FEATURES_SOC:mx8-nxp-bsp          = ",OpenCV4,Vulkan1.2,OpenGLES3.2,OpenCL1.2,OpenVX1.2"
+FEATURES_SOC:mx8-nxp-bsp = ",OpenCV4,Vulkan1.2,OpenGLES3.2,OpenCL1.2,OpenVX1.2"
-FEATURES_SOC:mx8mm-nxp-bsp        = ",OpenCV4"
+FEATURES_SOC:mx8mm-nxp-bsp = ",OpenCV4"
-EXTENSIONS               = "*"
+EXTENSIONS = "*"
-EXTENSIONS:mx6q-nxp-bsp  = "OpenGLES:GL_VIV_direct_texture,OpenGLES3:GL_EXT_geometry_shader,OpenGLES3:GL_EXT_tessellation_shader"
+EXTENSIONS:mx6q-nxp-bsp = "OpenGLES:GL_VIV_direct_texture,OpenGLES3:GL_EXT_geometry_shader,OpenGLES3:GL_EXT_tessellation_shader"
 EXTENSIONS:mx6dl-nxp-bsp = "OpenGLES:GL_VIV_direct_texture,OpenGLES3:GL_EXT_geometry_shader,OpenGLES3:GL_EXT_tessellation_shader"
-EXTENSIONS:mx8m-nxp-bsp  = "OpenGLES:GL_VIV_direct_texture,OpenGLES3:GL_EXT_color_buffer_float"
+EXTENSIONS:mx8m-nxp-bsp = "OpenGLES:GL_VIV_direct_texture,OpenGLES3:GL_EXT_color_buffer_float"
 EXTENSIONS:mx8mm-nxp-bsp = "*"
 do_compile () {
@@ -75,7 +76,7 @@ do_compile () {
    FslBuild.py -vvvvv -t sdk --UseFeatures [${FEATURES}] --UseExtensions [${EXTENSIONS}] --Variants [WindowSystem=${WINDOW_SYSTEM}] --BuildThreads ${@oe.utils.parallel_make(d)} -c install --CMakeInstallPrefix ${S}
 }
-REMOVALS = " \
+REMOVALS = "\
    GLES2/DeBayer \
    GLES2/DirectMultiSamplingVideoYUV \
    GLES3/DirectMultiSamplingVideoYUV \
@@ -108,7 +109,7 @@ INSANE_SKIP:${PN} += "already-stripped rpaths"
 # Unfortunately recipes with an empty main package, like header-only libraries,
 # are not included in the SDK. Use RDEPENDS as a workaround.
-RDEPENDS_EMPTY_MAIN_PACKAGE = " \
+RDEPENDS_EMPTY_MAIN_PACKAGE = "\
    fmt \
    gli \
    glm \
@@ -118,8 +119,8 @@ RDEPENDS_EMPTY_MAIN_PACKAGE = " \
    rapidjson \
    stb \
 "
-RDEPENDS_EMPTY_MAIN_PACKAGE_MX8       = ""
+RDEPENDS_EMPTY_MAIN_PACKAGE_MX8 = ""
-RDEPENDS_EMPTY_MAIN_PACKAGE_MX8:mx8-nxp-bsp   = " \
+RDEPENDS_EMPTY_MAIN_PACKAGE_MX8:mx8-nxp-bsp = "\
    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'libxdg-shell', '', d)} \
    rapidopencl \
    rapidopenvx \
@@ -128,10 +129,10 @@ RDEPENDS_EMPTY_MAIN_PACKAGE_MX8:mx8-nxp-bsp   = " \
 RDEPENDS_EMPTY_MAIN_PACKAGE_MX8:mx8mm-nxp-bsp = ""
 # vulkan-loader is dynamically loaded, so need to add an explicit
 # dependency
-RDEPENDS_VULKAN_LOADER       = ""
+RDEPENDS_VULKAN_LOADER = ""
-RDEPENDS_VULKAN_LOADER:mx8-nxp-bsp   = "vulkan-validation-layers vulkan-loader"
+RDEPENDS_VULKAN_LOADER:mx8-nxp-bsp = "vulkan-loader vulkan-validation-layers"
 RDEPENDS_VULKAN_LOADER:mx8mm-nxp-bsp = ""
-RDEPENDS:${PN} += " \
+RDEPENDS:${PN} += "\
    ${RDEPENDS_EMPTY_MAIN_PACKAGE} \
    ${RDEPENDS_EMPTY_MAIN_PACKAGE_MX8} \
    ${RDEPENDS_VULKAN_LOADER} \
diff --git a/recipes-graphics/imx-gpu-sdk/libxdg-shell.bb b/recipes-graphics/imx-gpu-sdk/libxdg-shell.bb
index a5637869a..56b89c159 100644
--- a/recipes-graphics/imx-gpu-sdk/libxdg-shell.bb
+++ b/recipes-graphics/imx-gpu-sdk/libxdg-shell.bb
@@ -1,8 +1,11 @@
 SUMMARY = "Provides XDG shell header and glue code library"
+DESCRIPTION = "XDG shell protocol header and glue-code library used by the i.MX GPU SDK samples."
+HOMEPAGE = "https://github.com/nxp-imx/gtec-demo-framework"
+SECTION = "graphics"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://${UNPACKDIR}/${BP}/License.md;md5=9d58a2573275ce8c35d79576835dbeb8"
-DEPENDS = "wayland-native wayland wayland-protocols"
+DEPENDS = "wayland wayland-native wayland-protocols"
 require imx-gpu-sdk-src.inc
@@ -12,7 +15,7 @@ S = "${UNPACKDIR}/${BP}/ThirdParty/Recipe/xdg-shell"
 inherit cmake pkgconfig
-EXTRA_OECMAKE = " \
+EXTRA_OECMAKE = "\
    -DWAYLAND_SCANNER=${STAGING_BINDIR_NATIVE}/wayland-scanner \
    -DWAYLAND_PROTOCOLS_DIR=${STAGING_DATADIR}/wayland-protocols \
 "
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 38f976c71..ea76e2af8 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -3,18 +3,19 @@
 # Copyright 2017-2024 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
+SUMMARY = "i.MX Vivante GPU driver"
 DESCRIPTION = "GPU driver and apps for i.MX"
 HOMEPAGE = "https://www.nxp.com/"
 SECTION = "libs"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://COPYING;md5=ea25d099982d035af85d193c88a1b479"
-DEPENDS += " \
+DEPENDS += "\
    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \
       bb.utils.contains('DISTRO_FEATURES',     'x11', 'virtual/libx11 libxdamage libxext libxfixes', \
                                                       '', d), d)} \
 "
-DEPENDS += " \
+DEPENDS += "\
    ${@bb.utils.contains('DISTRO_FEATURES',     'x11', 'libxcb libxshmfence libxxf86vm', \
                                                       '', d)} \
 "
@@ -23,14 +24,14 @@ DEPENDS:append:mx8-nxp-bsp = " patchelf-native"
 DEPENDS:append:libc-musl = " gcompat"
-PROVIDES += " \
+PROVIDES += "\
    imx-gpu-viv \
    libgal-imx \
    virtual/egl \
    virtual/libopenvg \
    ${EXTRA_PROVIDES} \
 "
-EXTRA_PROVIDES = " \
+EXTRA_PROVIDES = "\
    ${PROVIDES_OPENCL} \
    ${PROVIDES_OPENVX} \
 "
@@ -43,21 +44,21 @@ EXTRA_PROVIDES:append:mx8-nxp-bsp = " \
    virtual/libgbm \
 "
-PROVIDES_OPENCL = " \
+PROVIDES_OPENCL = "\
    opencl-headers \
    opencl-clhpp \
    opencl-icd-loader \
    virtual/libopencl1 \
 "
-PROVIDES_OPENCL:mx7-nxp-bsp   = ""
+PROVIDES_OPENCL:mx7-nxp-bsp = ""
 PROVIDES_OPENCL:mx8mm-nxp-bsp = ""
 # Note: OpenVX is fully supported on i.MX 8 QuadMax and 8 QuadPlus.
 # However, only limited support is provided on other i.MX 8 machines
 # as needed for i.MX machine learning packages.
-PROVIDES_OPENVX                  = ""
+PROVIDES_OPENVX = ""
-PROVIDES_OPENVX:mx8-nxp-bsp      = "virtual/libopenvx"
+PROVIDES_OPENVX:mx8-nxp-bsp = "virtual/libopenvx"
-PROVIDES_OPENVX:mx8mm-nxp-bsp    = ""
+PROVIDES_OPENVX:mx8mm-nxp-bsp = ""
 RPROVIDES:${PN}:imxgpu3d += "imx-gpu-viv"
@@ -76,39 +77,39 @@ PACKAGECONFIG ?= ""
 PACKAGECONFIG[valgrind] = ""
 # Note : If you add a package here, to prevent a naming conflict see the python_anonymous() futher below
-PACKAGES =+ " \
+PACKAGES =+ "\
-        libgles1-imx libgles1-imx-dev \
+    libgles1-imx libgles1-imx-dev \
-        libgles2-imx libgles2-imx-dev \
+    libgles2-imx libgles2-imx-dev \
-        libgles3-imx-dev \
+    libgles3-imx-dev \
-        libglslc-imx libglslc-imx-dev \
+    libglslc-imx libglslc-imx-dev \
-        ${PACKAGES_OPENCL} \
+    ${PACKAGES_OPENCL} \
-        libopenvg-imx libopenvg-imx-dev \
+    libopenvg-imx libopenvg-imx-dev \
-        libvdk-imx libvdk-imx-dev \
+    libvdk-imx libvdk-imx-dev \
-        libegl-imx libegl-imx-dev \
+    libegl-imx libegl-imx-dev \
-        libgal-imx libgal-imx-dev \
+    libgal-imx libgal-imx-dev \
-        libvsc-imx \
+    libvsc-imx \
-        ${PACKAGES_GBM} \
+    ${PACKAGES_GBM} \
-        imx-gpu-viv-tools \
+    imx-gpu-viv-tools \
-        imx-gpu-viv-demos \
+    imx-gpu-viv-demos \
-        ${PACKAGES_VULKAN} \
+    ${PACKAGES_VULKAN} \
-        ${PACKAGES_OPENVX} \
+    ${PACKAGES_OPENVX} \
-        libnn-imx \
+    libnn-imx \
-        libspirv-imx \
+    libspirv-imx \
 "
-PACKAGES_GBM                  = ""
+PACKAGES_GBM = ""
-PACKAGES_GBM:mx8-nxp-bsp      = "libgbm-imx libgbm-imx-dev"
+PACKAGES_GBM:mx8-nxp-bsp = "libgbm-imx libgbm-imx-dev"
-PACKAGES_OPENCL               = "libclc-imx libopencl-imx libopencl-imx-dev"
+PACKAGES_OPENCL = "libclc-imx libopencl-imx libopencl-imx-dev"
-PACKAGES_OPENCL:mx7-nxp-bsp   = ""
+PACKAGES_OPENCL:mx7-nxp-bsp = ""
 PACKAGES_OPENCL:mx8mm-nxp-bsp = ""
 PACKAGES_OPENVX = \
    "${@bb.utils.contains("PROVIDES_OPENVX", "virtual/libopenvx", \
        "libopenvx-imx libopenvx-imx-dev", "", d)}"
-PACKAGES_VULKAN               = ""
+PACKAGES_VULKAN = ""
-PACKAGES_VULKAN:imxvulkan     = "libvulkan-imx libvulkan-imx-dev"
+PACKAGES_VULKAN:imxvulkan = "libvulkan-imx libvulkan-imx-dev"
 PACKAGES_VULKAN:mx8mm-nxp-bsp = "libvulkan-imx libvulkan-imx-dev"
 python __anonymous () {
@@ -166,16 +167,16 @@ IS_MX8:mx8-nxp-bsp = "1"
 PACKAGE_FP_TYPE = "hardfp"
-HAS_GBM     = "false"
+HAS_GBM = "false"
 HAS_GBM:mx8-nxp-bsp = "true"
-IMX_SOC        = "IMX_SOC_NOT_SET"
+IMX_SOC = "IMX_SOC_NOT_SET"
-IMX_SOC:mx8qm-nxp-bsp  = "mx8qm"
+IMX_SOC:mx8qm-nxp-bsp = "mx8qm"
 IMX_SOC:mx8qxp-nxp-bsp = "mx8qxp"
-IMX_SOC:mx8dx-nxp-bsp  = "mx8qxp"
+IMX_SOC:mx8dx-nxp-bsp = "mx8qxp"
-IMX_SOC:mx8mp-nxp-bsp  = "mx8mp"
+IMX_SOC:mx8mp-nxp-bsp = "mx8mp"
-IMX_SOC:mx8mq-nxp-bsp  = "mx8mq"
+IMX_SOC:mx8mq-nxp-bsp = "mx8mq"
-IMX_SOC:mx8mn-nxp-bsp  = "mx8mn"
+IMX_SOC:mx8mn-nxp-bsp = "mx8mn"
 IMX_SOC:mx8ulp-nxp-bsp = "mx8ulp"
 do_install () {
@@ -332,8 +333,8 @@ INSANE_SKIP:libgal-imx += "build-deps"
 FILES:libvsc-imx = "${libdir}/libVSC${SOLIBS}"
-FILES:libgbm-imx           = "${libdir}/libgbm*${REALSOLIBS} ${libdir}/libgbm${SOLIBS} ${libdir}/libgbm_viv${SOLIBS}"
+FILES:libgbm-imx = "${libdir}/libgbm*${REALSOLIBS} ${libdir}/libgbm${SOLIBS} ${libdir}/libgbm_viv${SOLIBS}"
-FILES:libgbm-imx-dev       = "${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h"
+FILES:libgbm-imx-dev = "${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h"
 RDEPENDS:libgbm-imx:append = " libdrm"
 INSANE_SKIP:libgbm-imx += "dev-so"
@@ -343,11 +344,11 @@ FILES:libvulkan-imx = "\
 FILES:libvulkan-imx-dev = "${includedir}/vulkan ${libdir}/libvulkan_VSI${SOLIBSDEV}"
 RPROVIDES:libvulkan-imx = "virtual-vulkan-icd"
-FILES:libspirv-imx = " \
+FILES:libspirv-imx = "\
    ${libdir}/libSPIRV_viv${SOLIBS} \
 "
-FILES:libopenvx-imx = " \
+FILES:libopenvx-imx = "\
    ${libdir}/libOpenVX${REALSOLIBS} \
    ${libdir}/libOpenVXC${SOLIBS} \
    ${libdir}/libOpenVXU${SOLIBS} \
@@ -356,7 +357,7 @@ FILES:libopenvx-imx = " \
 "
 FILES:libopenvx-imx-dev = "${includedir}/VX ${libdir}/libOpenVX${SOLIBSDEV}"
 RDEPENDS:libopenvx-imx = "${OPENCL_VX_INTRINSIC_EXTENSION_PACKAGES}"
-OPENCL_VX_INTRINSIC_EXTENSION_PACKAGES               = ""
+OPENCL_VX_INTRINSIC_EXTENSION_PACKAGES = ""
 OPENCL_VX_INTRINSIC_EXTENSION_PACKAGES:mx8qm-nxp-bsp = "libclc-imx libopencl-imx-dev"
 OPENCL_VX_INTRINSIC_EXTENSION_PACKAGES:mx8mp-nxp-bsp = "libclc-imx libopencl-imx-dev"
 INSANE_SKIP:libopenvx-imx += "dev-deps"
@@ -387,8 +388,8 @@ FILES:libopencl-imx = "${libdir}/libOpenCL${REALSOLIBS} \
                       ${sysconfdir}/OpenCL/vendors/Vivante.icd"
 FILES:libopencl-imx-dev = "${includedir}/CL ${libdir}/libOpenCL${SOLIBSDEV}"
 RDEPENDS:libopencl-imx = "libclc-imx"
-RPROVIDES:libopencl-imx               = "virtual-opencl-icd"
+RPROVIDES:libopencl-imx = "virtual-opencl-icd"
-RPROVIDES:libopencl-imx:mx7-nxp-bsp   = ""
+RPROVIDES:libopencl-imx:mx7-nxp-bsp = ""
 RPROVIDES:libopencl-imx:mx8mm-nxp-bsp = ""
 FILES:libopenvg-imx = "${libdir}/libOpenVG*${REALSOLIBS} ${libdir}/libOpenVG*${SOLIBS}"
diff --git a/recipes-graphics/mali/mali-imx.inc b/recipes-graphics/mali/mali-imx.inc
index 97a1175e7..f3ef8f474 100644
--- a/recipes-graphics/mali/mali-imx.inc
+++ b/recipes-graphics/mali/mali-imx.inc
@@ -1,11 +1,13 @@
 SUMMARY = "Graphics libraries and driver for i.MX Mali GPU"
+DESCRIPTION = "Arm Mali GPU user-space graphics libraries and driver for i.MX SoCs."
+HOMEPAGE = "https://www.nxp.com/"
 SECTION = "libs"
-DEPENDS = " \
+DEPENDS = "\
    libdrm \
    vulkan-loader \
    wayland \
    wayland-protocols"
-PROVIDES = " \
+PROVIDES = "\
    virtual/egl \
    virtual/libgbm \
    virtual/libgles1 \
@@ -18,7 +20,7 @@ INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_SYSROOT_STRIP = "1"
-PACKAGES =+ " \
+PACKAGES =+ "\
    ${PN}-libegl     ${PN}-libegl-dev \
    ${PN}-libgbm     ${PN}-libgbm-dev \
    ${PN}-libgles1   ${PN}-libgles1-dev \
@@ -28,42 +30,42 @@ PACKAGES =+ " \
    ${PN}-opencl-icd ${PN}-opencl-icd-dev"
 # Since libmali.so is loaded by dlopen, include it in the main package
-FILES:${PN} += " \
+FILES:${PN} += "\
    ${libdir}/libmali.so \
    ${nonarch_base_libdir}/firmware"
 FILES_SOLIBSDEV = ""
 INSANE_SKIP:${PN} = "dev-so"
-FILES:${PN}-libegl = " \
+FILES:${PN}-libegl = "\
    ${libdir}/libEGL${SOLIBS}"
-FILES:${PN}-libgbm = " \
+FILES:${PN}-libgbm = "\
    ${libdir}/libgbm${SOLIBS}"
-FILES:${PN}-libgles1 = " \
+FILES:${PN}-libgles1 = "\
    ${libdir}/libGLESv1_CM${SOLIBS}"
-FILES:${PN}-libgles2 = " \
+FILES:${PN}-libgles2 = "\
    ${libdir}/libGLESv2${SOLIBS}"
-FILES:${PN}-opencl-icd = " \
+FILES:${PN}-opencl-icd = "\
    ${sysconfdir}/OpenCL"
 RPROVIDES:${PN}-opencl-icd = "virtual-opencl-icd"
-FILES:${PN}-libvulkan = " \
+FILES:${PN}-libvulkan = "\
    ${sysconfdir}/vulkan"
 RDEPENDS:${PN}-libvulkan = "vulkan-wsi-layer"
 RPROVIDES:${PN}-libvulkan = "virtual-vulkan-icd"
-FILES:${PN}-dev = " \
+FILES:${PN}-dev = "\
    ${bindir}/malisc"
-FILES:${PN}-libegl-dev = " \
+FILES:${PN}-libegl-dev = "\
    ${includedir}/EGL \
    ${includedir}/KHR \
    ${libdir}/libEGL${SOLIBSDEV} \
    ${libdir}/pkgconfig/egl.pc"
-FILES:${PN}-libgbm-dev = " \
+FILES:${PN}-libgbm-dev = "\
    ${includedir}/gbm.h \
    ${libdir}/libgbm${SOLIBSDEV} \
    ${libdir}/pkgconfig/gbm.pc"
 # Consolidate GLES dev packages
 PACKAGES =+ "${PN}-libgles-dev"
-FILES:${PN}-libgles-dev = " \
+FILES:${PN}-libgles-dev = "\
    ${includedir}/GLES* \
    ${libdir}/libGLES*${SOLIBSDEV} \
    ${libdir}/pkgconfig/gles*.pc"
@@ -78,7 +80,7 @@ RDEPENDS:${PN}-libgles1-dev = "${PN}-libgles-dev"
 RDEPENDS:${PN}-libgles2-dev = "${PN}-libgles-dev"
 RDEPENDS:${PN}-libgles3-dev = "${PN}-libgles-dev"
-FILES:${PN}-opencl-icd-dev = " \
+FILES:${PN}-opencl-icd-dev = "\
    ${bindir}/mali_clcc"
 python __anonymous() {
diff --git a/recipes-graphics/mesa/mesa-demos_%.bbappend b/recipes-graphics/mesa/mesa-demos_%.bbappend
index 7d3e7ca1c..fe2f5dd7f 100644
--- a/recipes-graphics/mesa/mesa-demos_%.bbappend
+++ b/recipes-graphics/mesa/mesa-demos_%.bbappend
@@ -9,18 +9,18 @@ SRC_URI:append:imxgpu = " \
 REQUIRED_DISTRO_FEATURES:remove:imxgpu = "x11"
-PACKAGECONFIG:remove = " \
+PACKAGECONFIG:remove = "\
    ${PACKAGECONFIG_REMOVE_IF_2D_ONLY} \
    ${PACKAGECONFIG_REMOVE_IF_GPU}"
-PACKAGECONFIG_REMOVE_IF_2D_ONLY          = ""
+PACKAGECONFIG_REMOVE_IF_2D_ONLY = ""
 PACKAGECONFIG_REMOVE_IF_2D_ONLY:imxgpu2d = "gles1 gles2"
 PACKAGECONFIG_REMOVE_IF_2D_ONLY:imxgpu3d = ""
-PACKAGECONFIG_REMOVE_IF_GPU              = ""
+PACKAGECONFIG_REMOVE_IF_GPU = ""
-PACKAGECONFIG_REMOVE_IF_GPU:imxgpu       = "x11"
+PACKAGECONFIG_REMOVE_IF_GPU:imxgpu = "x11"
 PACKAGECONFIG:append = " \
    ${PACKAGECONFIG_APPEND_IF_GPU}"
-PACKAGECONFIG_APPEND_IF_GPU        = ""
+PACKAGECONFIG_APPEND_IF_GPU = ""
 PACKAGECONFIG_APPEND_IF_GPU:imxgpu = "glu"
 PACKAGECONFIG[glu] = ",,libglu"
diff --git a/recipes-graphics/mesa/mesa-etnaviv-env_0.1.bb b/recipes-graphics/mesa/mesa-etnaviv-env_0.1.bb
index 2a5bc1568..9df4d4f40 100644
--- a/recipes-graphics/mesa/mesa-etnaviv-env_0.1.bb
+++ b/recipes-graphics/mesa/mesa-etnaviv-env_0.1.bb
@@ -1,15 +1,17 @@
 SUMMARY = "Mesa environment variables for etnaviv on xserver"
+DESCRIPTION = "Environment variable configuration to enable the etnaviv Mesa driver on the X server."
 HOMEPAGE = "https://github.com/Freescale/meta-freescale/"
+SECTION = "graphics"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
 SRC_URI = "\
    file://mesa-etnaviv.conf \
    file://mesa-etnaviv.sh \
 "
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 S = "${UNPACKDIR}"
 do_configure[noexec] = "1"
diff --git a/recipes-graphics/piglit/piglit_%.bbappend b/recipes-graphics/piglit/piglit_%.bbappend
index 0a4a3a4a4..57120b65d 100644
--- a/recipes-graphics/piglit/piglit_%.bbappend
+++ b/recipes-graphics/piglit/piglit_%.bbappend
@@ -4,19 +4,19 @@ SRC_URI += "file://0001-tests-Fix-cl-test-Include-Directories-error-Error-0-.pat
            file://0002-cl-Add-mutually-exclusive-memory-flags-for-CL_MEM_KE.patch"
 PACKAGECONFIG:append = " ${PACKAGECONFIG_APPEND}"
-PACKAGECONFIG:remove = " ${PACKAGECONFIG_REMOVE}"
+PACKAGECONFIG:remove = "${PACKAGECONFIG_REMOVE}"
-PACKAGECONFIG_APPEND ?= " \
+PACKAGECONFIG_APPEND ?= "\
    gbm \
    ${@bb.utils.filter('DISTRO_FEATURES', 'vulkan', d)}"
 PACKAGECONFIG_APPEND:append:imxviv:mx8-nxp-bsp = " opencl"
-PACKAGECONFIG_APPEND:imxgpu:mx6-nxp-bsp  = ""
+PACKAGECONFIG_APPEND:imxgpu:mx6-nxp-bsp = ""
-PACKAGECONFIG_APPEND:imxgpu:mx7-nxp-bsp  = ""
+PACKAGECONFIG_APPEND:imxgpu:mx7-nxp-bsp = ""
 PACKAGECONFIG_REMOVE ?= ""
-PACKAGECONFIG_REMOVE:imxgpu              = "glx"
+PACKAGECONFIG_REMOVE:imxgpu = "glx"
-PACKAGECONFIG_REMOVE:imxgpu:mx6-nxp-bsp  = "glx x11"
+PACKAGECONFIG_REMOVE:imxgpu:mx6-nxp-bsp = "glx x11"
-PACKAGECONFIG_REMOVE:imxgpu:mx7-nxp-bsp  = "glx x11"
+PACKAGECONFIG_REMOVE:imxgpu:mx7-nxp-bsp = "glx x11"
 PACKAGECONFIG[gbm] = "-DPIGLIT_USE_GBM=1,-DPIGLIT_USE_GBM=0,virtual/libgbm"
diff --git a/recipes-graphics/rapidopencl/rapidopencl_1.1.0.1.bb b/recipes-graphics/rapidopencl/rapidopencl_1.1.0.1.bb
index d4200d394..d770faeb9 100644
--- a/recipes-graphics/rapidopencl/rapidopencl_1.1.0.1.bb
+++ b/recipes-graphics/rapidopencl/rapidopencl_1.1.0.1.bb
@@ -1,4 +1,7 @@
 SUMMARY = "Experimental low level header only C++11 RAII wrapper classes for the OpenCL API"
+DESCRIPTION = "Experimental header-only C++11 RAII wrapper classes that manage OpenCL API object lifetimes automatically."
+HOMEPAGE = "https://github.com/Unarmed1000/RapidOpenCL"
+SECTION = "graphics"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b98f636daed34d12d11e25f3185c0204"
diff --git a/recipes-graphics/rapidopenvx/rapidopenvx_1.1.0.bb b/recipes-graphics/rapidopenvx/rapidopenvx_1.1.0.bb
index 049fca0fd..7db3a0cc4 100644
--- a/recipes-graphics/rapidopenvx/rapidopenvx_1.1.0.bb
+++ b/recipes-graphics/rapidopenvx/rapidopenvx_1.1.0.bb
@@ -1,4 +1,7 @@
 SUMMARY = "Low level header only C++11 RAII wrapper classes for the OpenVX API"
+DESCRIPTION = "Header-only C++11 RAII wrapper classes that manage OpenVX API object lifetimes automatically."
+HOMEPAGE = "https://github.com/Unarmed1000/RapidOpenVX"
+SECTION = "graphics"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b98f636daed34d12d11e25f3185c0204"
diff --git a/recipes-graphics/rapidvulkan/rapidvulkan_1.2.162.0.bb b/recipes-graphics/rapidvulkan/rapidvulkan_1.2.162.0.bb
index c37cf7411..5616b264b 100644
--- a/recipes-graphics/rapidvulkan/rapidvulkan_1.2.162.0.bb
+++ b/recipes-graphics/rapidvulkan/rapidvulkan_1.2.162.0.bb
@@ -1,4 +1,7 @@
 SUMMARY = "Low level header only C++11 RAII wrapper classes for the Vulkan API"
+DESCRIPTION = "Header-only C++11 RAII wrapper classes that manage Vulkan API object lifetimes automatically."
+HOMEPAGE = "https://github.com/Unarmed1000/RapidVulkan"
+SECTION = "graphics"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b98f636daed34d12d11e25f3185c0204"
@@ -7,7 +10,6 @@ DEPENDS = "vulkan-loader"
 SRC_URI = "git://github.com/Unarmed1000/RapidVulkan;protocol=https;branch=master"
 SRCREV = "e39a407c5ae880792d8843ada65a19dd26b3dca7"
 REQUIRED_DISTRO_FEATURES = "vulkan"
 inherit cmake features_check
diff --git a/recipes-graphics/vulkan/assimp_5.4.3.bb b/recipes-graphics/vulkan/assimp_5.4.3.bb
index ff4fb7719..c7d19c3f6 100644
--- a/recipes-graphics/vulkan/assimp_5.4.3.bb
+++ b/recipes-graphics/vulkan/assimp_5.4.3.bb
@@ -1,3 +1,4 @@
+SUMMARY = "Portable library to import 3D model formats"
 DESCRIPTION = "Open Asset Import Library is a portable Open Source library to import \
               various well-known 3D model formats in a uniform manner."
 HOMEPAGE = "http://www.assimp.org/"
diff --git a/recipes-graphics/vulkan/vulkan-loader_%.bbappend b/recipes-graphics/vulkan/vulkan-loader_%.bbappend
index ce120937a..1e506c01b 100644
--- a/recipes-graphics/vulkan/vulkan-loader_%.bbappend
+++ b/recipes-graphics/vulkan/vulkan-loader_%.bbappend
@@ -9,6 +9,6 @@ SRC_URI:append:imx-nxp-bsp = " \
 PACKAGE_ARCH:imx-nxp-bsp = "${MACHINE_SOCARCH}"
 # libvulkan.so is loaded dynamically, so put it in the main package
-SOLIBS:imx-nxp-bsp          = ".so*"
+SOLIBS:imx-nxp-bsp = ".so*"
 FILES_SOLIBSDEV:imx-nxp-bsp = ""
 INSANE_SKIP:${PN}:imx-nxp-bsp += "dev-so"
diff --git a/recipes-graphics/vulkan/vulkan-wsi-layer_git.bb b/recipes-graphics/vulkan/vulkan-wsi-layer_git.bb
index 0118975a5..0bbebf5c2 100644
--- a/recipes-graphics/vulkan/vulkan-wsi-layer_git.bb
+++ b/recipes-graphics/vulkan/vulkan-wsi-layer_git.bb
@@ -1,4 +1,7 @@
+SUMMARY = "Vulkan WSI layer"
 DESCRIPTION = "Vulkan Window System Integration Layer"
+HOMEPAGE = "https://gitlab.freedesktop.org/mesa/vulkan-wsi-layer"
+SECTION = "graphics"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c2e771b72d60a13d2de384cb49055d00"
 DEPENDS = "libdrm vulkan-loader"
@@ -29,7 +32,7 @@ PACKAGECONFIG[wayland] = " \
    wayland wayland-native wayland-protocols,,, \
    headless"
-EXTRA_OECMAKE = " \
+EXTRA_OECMAKE = "\
    -DBUILD_WSI_DISPLAY=0 \
    -DBUILD_WSI_IMAGE_COMPRESSION_CONTROL_SWAPCHAIN=1 \
    -DCMAKE_BUILD_TYPE=Release \
diff --git a/recipes-graphics/waffle/waffle_%.bbappend b/recipes-graphics/waffle/waffle_%.bbappend
index fd375271f..1456655ee 100644
--- a/recipes-graphics/waffle/waffle_%.bbappend
+++ b/recipes-graphics/waffle/waffle_%.bbappend
@@ -5,12 +5,12 @@ SRC_URI:append:imxgpu = " \
    file://0002-meson-Separate-surfaceless-option-from-x11.patch \
 "
-PACKAGECONFIG_IMXGPU_X11          = ""
+PACKAGECONFIG_IMXGPU_X11 = ""
 PACKAGECONFIG_IMXGPU_X11:imxgpu3d = "x11-egl glx"
-PACKAGECONFIG_IMXGPU_GBM          = "gbm"
+PACKAGECONFIG_IMXGPU_GBM = "gbm"
-PACKAGECONFIG_IMXGPU_GBM:mx6-nxp-bsp      = ""
+PACKAGECONFIG_IMXGPU_GBM:mx6-nxp-bsp = ""
-PACKAGECONFIG_IMXGPU_GBM:mx7-nxp-bsp      = ""
+PACKAGECONFIG_IMXGPU_GBM:mx7-nxp-bsp = ""
-PACKAGECONFIG:imxgpu = " \
+PACKAGECONFIG:imxgpu = "\
    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland',                     'wayland', \
       bb.utils.contains('DISTRO_FEATURES',     'x11', '${PACKAGECONFIG_IMXGPU_X11}', \
                                                                                  '', d), d)} \
diff --git a/recipes-graphics/wayland/wayland-protocols_%.bbappend b/recipes-graphics/wayland/wayland-protocols_%.bbappend
index 762b47a31..041cb491a 100644
--- a/recipes-graphics/wayland/wayland-protocols_%.bbappend
+++ b/recipes-graphics/wayland/wayland-protocols_%.bbappend
@@ -1,6 +1,6 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
-NXP_PATCHES = " \
+NXP_PATCHES = "\
    file://0001-unstable-Add-alpha-compositing-protocol.patch \
    file://0002-unstable-Add-hdr10-metadata-protocol.patch \
    file://0003-linux-dmabuf-support-passing-buffer-DTRC-meta-to-com.patch \
diff --git a/recipes-graphics/wayland/weston-init.bbappend b/recipes-graphics/wayland/weston-init.bbappend
index 1b08b1955..c8c0470fe 100644
--- a/recipes-graphics/wayland/weston-init.bbappend
+++ b/recipes-graphics/wayland/weston-init.bbappend
@@ -1,14 +1,14 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 # OpenGL is not required for parts with GPU support for 2D but not 3D
-IMX_REQUIRED_DISTRO_FEATURES_REMOVE          = ""
+IMX_REQUIRED_DISTRO_FEATURES_REMOVE = ""
 IMX_REQUIRED_DISTRO_FEATURES_REMOVE:imxgpu2d = "opengl"
 IMX_REQUIRED_DISTRO_FEATURES_REMOVE:imxgpu3d = ""
 REQUIRED_DISTRO_FEATURES:remove = "${IMX_REQUIRED_DISTRO_FEATURES_REMOVE}"
 SRC_URI:append:mx6sl-nxp-bsp = " file://weston.config"
-PACKAGECONFIG ??= " \
+PACKAGECONFIG ??= "\
    no-idle-timeout \
    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xwayland', '', d)} \
    ${PACKAGECONFIG_GBM_FORMAT} \
@@ -20,34 +20,34 @@ PACKAGECONFIG ??= " \
 # Mainline BSPs dont support xwayland
 PACKAGECONFIG:remove:use-mainline-bsp = "xwayland"
-PACKAGECONFIG_GBM_FORMAT               ?= ""
+PACKAGECONFIG_GBM_FORMAT ?= ""
 PACKAGECONFIG_GBM_FORMAT:mx8mq-nxp-bsp ?= "gbm-format"
-PACKAGECONFIG_GBM_FORMAT:mx93-nxp-bsp  ?= "gbm-format"
+PACKAGECONFIG_GBM_FORMAT:mx93-nxp-bsp ?= "gbm-format"
 GBM_FORMAT_VALUE:mx8mq-nxp-bsp = "argb8888"
-GBM_FORMAT_VALUE:mx93-nxp-bsp  = "argb8888"
+GBM_FORMAT_VALUE:mx93-nxp-bsp = "argb8888"
-PACKAGECONFIG_REPAINT_WINDOW             ?= ""
+PACKAGECONFIG_REPAINT_WINDOW ?= ""
 PACKAGECONFIG_REPAINT_WINDOW:mx8-nxp-bsp ?= "repaint-window"
 PACKAGECONFIG_REPAINT_WINDOW:mx9-nxp-bsp ?= "repaint-window"
-PACKAGECONFIG_SIZE                     ?= ""
+PACKAGECONFIG_SIZE ?= ""
-PACKAGECONFIG_SIZE:mx8mq-nxp-bsp       ?= "size"
+PACKAGECONFIG_SIZE:mx8mq-nxp-bsp ?= "size"
 SIZE_VALUE:mx8mq-nxp-bsp = "1920x1080"
-HAS_G2D          = "false"
+HAS_G2D = "false"
 HAS_G2D:imxgpu2d = "true"
-PACKAGECONFIG_USE_G2D                ?= ""
+PACKAGECONFIG_USE_G2D ?= ""
-PACKAGECONFIG_USE_G2D:imxgpu2d       ?= "use-g2d"
+PACKAGECONFIG_USE_G2D:imxgpu2d ?= "use-g2d"
-PACKAGECONFIG_USE_G2D:mx8qm-nxp-bsp  ?= ""
+PACKAGECONFIG_USE_G2D:mx8qm-nxp-bsp ?= ""
 PACKAGECONFIG_USE_G2D:mx8qxp-nxp-bsp ?= ""
-PACKAGECONFIG_USE_G2D:mx8dx-nxp-bsp  ?= ""
+PACKAGECONFIG_USE_G2D:mx8dx-nxp-bsp ?= ""
-PACKAGECONFIG_USE_G2D:mx93-nxp-bsp   ?= "use-g2d"
+PACKAGECONFIG_USE_G2D:mx93-nxp-bsp ?= "use-g2d"
-PACKAGECONFIG_USE_G2D:mx943-nxp-bsp   ?= "use-g2d"
+PACKAGECONFIG_USE_G2D:mx943-nxp-bsp ?= "use-g2d"
-USE_G2D_VALUE             = "true"
+USE_G2D_VALUE = "true"
 USE_G2D_VALUE:mx6-nxp-bsp = "1"
 USE_G2D_VALUE:mx7-nxp-bsp = "1"
diff --git a/recipes-graphics/wayland/weston_10.0.5.imx.bb b/recipes-graphics/wayland/weston_10.0.5.imx.bb
index 991650fb9..2e1c136ff 100644
--- a/recipes-graphics/wayland/weston_10.0.5.imx.bb
+++ b/recipes-graphics/wayland/weston_10.0.5.imx.bb
@@ -31,8 +31,8 @@ inherit meson pkgconfig useradd
 #
 require ${THISDIR}/required-distro-features.inc
-DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0"
+DEPENDS = "cairo gdk-pixbuf glib-2.0 libinput libxkbcommon pango pixman \
-DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native"
+           virtual/egl wayland wayland-native wayland-protocols"
 LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'lto', '-Wl,-z,undefs', '', d)}"
@@ -103,29 +103,29 @@ PACKAGECONFIG[image-jpeg] = "-Dimage-jpeg=true,-Dimage-jpeg=false, jpeg"
 PACKAGECONFIG[launcher-libseat] = "-Dlauncher-libseat=true,-Dlauncher-libseat=false,seatd"
 do_install:append() {
-        # Weston doesn't need the .la files to load modules, so wipe them
+    # Weston doesn't need the .la files to load modules, so wipe them
-        rm -f ${D}/${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.la
+    rm -f ${D}/${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.la
-        # If X11, ship a desktop file to launch it
+    # If X11, ship a desktop file to launch it
-        if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then
+    if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then
-                install -d ${D}${datadir}/applications
+        install -d ${D}${datadir}/applications
-                install ${UNPACKDIR}/weston.desktop ${D}${datadir}/applications
+        install ${UNPACKDIR}/weston.desktop ${D}${datadir}/applications
-                install -d ${D}${datadir}/icons/hicolor/48x48/apps
+        install -d ${D}${datadir}/icons/hicolor/48x48/apps
-                install ${UNPACKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps
+        install ${UNPACKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps
-        fi
+    fi
-        if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then
+    if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then
-                install -Dm 644 ${UNPACKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland
+        install -Dm 644 ${UNPACKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland
-        fi
+    fi
-        if [ "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'yes', 'no', d)}" = "yes" ]; then
+    if [ "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'yes', 'no', d)}" = "yes" ]; then
-                install -Dm 644 ${UNPACKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify
+        install -Dm 644 ${UNPACKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify
-        fi
+    fi
-        if [ "${@bb.utils.contains('PACKAGECONFIG', 'launch', 'yes', 'no', d)}" = "yes" ]; then
+    if [ "${@bb.utils.contains('PACKAGECONFIG', 'launch', 'yes', 'no', d)}" = "yes" ]; then
-                chmod u+s ${D}${bindir}/weston-launch
+        chmod u+s ${D}${bindir}/weston-launch
-        fi
+    fi
 }
 PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', '', d)} \
@@ -156,7 +156,7 @@ GROUPADD_PARAM:${PN} = "--system weston-launch"
 SUMMARY = "Weston, a Wayland compositor, i.MX fork"
 LIC_FILES_CHKSUM:remove = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70"
-LIC_FILES_CHKSUM:append = "file://LICENSE;md5=d79ee9e66bb0f95d3386a7acae780b70"
+LIC_FILES_CHKSUM:append = " file://LICENSE;md5=d79ee9e66bb0f95d3386a7acae780b70"
 DEFAULT_PREFERENCE = "-1"
@@ -169,12 +169,12 @@ SRCBRANCH = "weston-imx-10.0.5"
 SRCREV = "5223a3c86177709d25f86a96622c0829da955a0e"
 # Disable OpenGL for parts with GPU support for 2D but not 3D
-REQUIRED_DISTRO_FEATURES          = "opengl"
+REQUIRED_DISTRO_FEATURES = "opengl"
 REQUIRED_DISTRO_FEATURES:imxgpu2d = ""
 REQUIRED_DISTRO_FEATURES:imxgpu3d = "opengl"
-PACKAGECONFIG_OPENGL              = "opengl"
+PACKAGECONFIG_OPENGL = "opengl"
-PACKAGECONFIG_OPENGL:imxgpu2d     = ""
+PACKAGECONFIG_OPENGL:imxgpu2d = ""
-PACKAGECONFIG_OPENGL:imxgpu3d     = "opengl"
+PACKAGECONFIG_OPENGL:imxgpu3d = "opengl"
 PACKAGECONFIG_IMX_REMOVALS ?= "wayland x11"
 PACKAGECONFIG:remove = "${PACKAGECONFIG_IMX_REMOVALS}"
@@ -182,7 +182,7 @@ PACKAGECONFIG:append = " ${@bb.utils.filter('DISTRO_FEATURES', '${PACKAGECONFIG_
 PACKAGECONFIG:remove:imxfbdev = "kms"
 PACKAGECONFIG:append:imxfbdev = " fbdev clients"
-PACKAGECONFIG:append:imxgpu   = " imxgpu"
+PACKAGECONFIG:append:imxgpu = " imxgpu"
 PACKAGECONFIG:append:imxgpu2d = " imxg2d"
 SIMPLECLIENTS:imxfbdev = "damage,im,egl,shm,touch,dmabuf-v4l"
diff --git a/recipes-graphics/wayland/weston_14.0.2.imx.bb b/recipes-graphics/wayland/weston_14.0.2.imx.bb
index 2c0b13d41..025c65d7a 100644
--- a/recipes-graphics/wayland/weston_14.0.2.imx.bb
+++ b/recipes-graphics/wayland/weston_14.0.2.imx.bb
@@ -32,8 +32,8 @@ inherit meson pkgconfig useradd
 #
 require ${THISDIR}/required-distro-features.inc
-DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0"
+DEPENDS = "cairo gdk-pixbuf glib-2.0 libdisplay-info libinput libxkbcommon \
-DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native libdisplay-info"
+           pango pixman virtual/egl wayland wayland-native wayland-protocols"
 LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'lto', '-Wl,-z,undefs', '', d)}"
@@ -103,29 +103,29 @@ PACKAGECONFIG[pipewire] = "-Dbackend-pipewire=true,-Dbackend-pipewire=false,pipe
 PACKAGECONFIG[vnc] = "-Dbackend-vnc=true,-Dbackend-vnc=false,neatvnc libpam"
 do_install:append() {
-        # Weston doesn't need the .la files to load modules, so wipe them
+    # Weston doesn't need the .la files to load modules, so wipe them
-        rm -f ${D}/${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.la
+    rm -f ${D}/${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.la
-        # If X11, ship a desktop file to launch it
+    # If X11, ship a desktop file to launch it
-        if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then
+    if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then
-                install -d ${D}${datadir}/applications
+        install -d ${D}${datadir}/applications
-                install ${UNPACKDIR}/weston.desktop ${D}${datadir}/applications
+        install ${UNPACKDIR}/weston.desktop ${D}${datadir}/applications
-                install -d ${D}${datadir}/icons/hicolor/48x48/apps
+        install -d ${D}${datadir}/icons/hicolor/48x48/apps
-                install ${UNPACKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps
+        install ${UNPACKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps
-        fi
+    fi
-        if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then
+    if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then
-                install -Dm 644 ${UNPACKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland
+        install -Dm 644 ${UNPACKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland
-        fi
+    fi
-        if [ "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'yes', 'no', d)}" = "yes" ]; then
+    if [ "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'yes', 'no', d)}" = "yes" ]; then
-                install -Dm 644 ${UNPACKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify
+        install -Dm 644 ${UNPACKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify
-        fi
+    fi
-        if [ "${@bb.utils.contains('PACKAGECONFIG', 'launch', 'yes', 'no', d)}" = "yes" ]; then
+    if [ "${@bb.utils.contains('PACKAGECONFIG', 'launch', 'yes', 'no', d)}" = "yes" ]; then
-                chmod u+s ${D}${bindir}/weston-launch
+        chmod u+s ${D}${bindir}/weston-launch
-        fi
+    fi
 }
 PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', '', d)} \
@@ -155,7 +155,7 @@ GROUPADD_PARAM:${PN} = "--system weston-launch"
 SUMMARY = "Weston, a Wayland compositor, i.MX fork"
 LIC_FILES_CHKSUM:remove = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70"
-LIC_FILES_CHKSUM +=       "file://LICENSE;md5=d79ee9e66bb0f95d3386a7acae780b70"
+LIC_FILES_CHKSUM += "file://LICENSE;md5=d79ee9e66bb0f95d3386a7acae780b70"
 DEFAULT_PREFERENCE = "-1"
@@ -169,12 +169,12 @@ PACKAGECONFIG:remove = "${PACKAGECONFIG_IMX_REMOVALS}"
 PACKAGECONFIG_IMX_REMOVALS ?= "wayland x11"
 PACKAGECONFIG:append = " ${PACKAGECONFIG_G2D} ${PACKAGECONFIG_PIPEWIRE}"
-PACKAGECONFIG_G2D               ??= ""
+PACKAGECONFIG_G2D ??= ""
-PACKAGECONFIG_G2D:imxgpu2d      ??= "imxg2d"
+PACKAGECONFIG_G2D:imxgpu2d ??= "imxg2d"
-PACKAGECONFIG_G2D:mx93-nxp-bsp  ??= "imxg2d"
+PACKAGECONFIG_G2D:mx93-nxp-bsp ??= "imxg2d"
 PACKAGECONFIG_G2D:mx943-nxp-bsp ??= "imxg2d"
-PACKAGECONFIG_PIPEWIRE             ??= ""
+PACKAGECONFIG_PIPEWIRE ??= ""
 PACKAGECONFIG_PIPEWIRE:mx8-nxp-bsp ??= "pipewire"
 PACKAGECONFIG_PIPEWIRE:mx9-nxp-bsp ??= "pipewire"
diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend b/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend
index 3fe677b34..4029ee84b 100644
--- a/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend
+++ b/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend
@@ -1,2 +1,2 @@
-# Append path for freescale layer to include bsp xorg.conf 
+# Append path for freescale layer to include bsp xorg.conf
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
index 161df0498..7b14cc454 100644
--- a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
+++ b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
@@ -2,8 +2,8 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 SRC_URI:append:use-mainline-bsp = " file://0001-Allow-to-enable-atomic-in-modesetting-DDX.patch"
-IMX_OPENGL_PKGCONFIGS_REMOVE        = ""
+IMX_OPENGL_PKGCONFIGS_REMOVE = ""
 IMX_OPENGL_PKGCONFIGS_REMOVE:imxgpu = "glamor"
-OPENGL_PKGCONFIGS:remove:mx6-nxp-bsp        = "${IMX_OPENGL_PKGCONFIGS_REMOVE}"
+OPENGL_PKGCONFIGS:remove:mx6-nxp-bsp = "${IMX_OPENGL_PKGCONFIGS_REMOVE}"
-OPENGL_PKGCONFIGS:remove:mx7-nxp-bsp        = "${IMX_OPENGL_PKGCONFIGS_REMOVE}"
+OPENGL_PKGCONFIGS:remove:mx7-nxp-bsp = "${IMX_OPENGL_PKGCONFIGS_REMOVE}"
-OPENGL_PKGCONFIGS:remove:imxdrm     = "dri glx"
+OPENGL_PKGCONFIGS:remove:imxdrm = "dri glx"
diff --git a/recipes-graphics/xwayland/xwayland_%.bbappend b/recipes-graphics/xwayland/xwayland_%.bbappend
index d8f5bdde5..fc0d10e74 100644
--- a/recipes-graphics/xwayland/xwayland_%.bbappend
+++ b/recipes-graphics/xwayland/xwayland_%.bbappend
@@ -5,7 +5,7 @@ SRC_URI:append:imxgpu = " \
 "
 OPENGL_PKGCONFIGS:remove:imxgpu = "${OPENGL_PKGCONFIGS_REMOVE_IMXGPU}"
-OPENGL_PKGCONFIGS_REMOVE_IMXGPU             = ""
+OPENGL_PKGCONFIGS_REMOVE_IMXGPU = ""
 OPENGL_PKGCONFIGS_REMOVE_IMXGPU:imx-nxp-bsp = "glamor glx"
 OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx8-nxp-bsp = "glx"
diff --git a/recipes-kernel/ceetm/ceetm_git.bb b/recipes-kernel/ceetm/ceetm_git.bb
index 2356b8db4..f33a8f95f 100644
--- a/recipes-kernel/ceetm/ceetm_git.bb
+++ b/recipes-kernel/ceetm/ceetm_git.bb
@@ -1,11 +1,14 @@
-DESCRIPTION = "CEETM TC QDISC"
+SUMMARY = "CEETM traffic-control qdisc"
+DESCRIPTION = "Traffic-control qdisc for the QorIQ DPAA CEETM hardware scheduler."
+HOMEPAGE = "https://github.com/nxp-qoriq/ceetm"
+SECTION = "kernel"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 SRC_URI = "git://github.com/nxp-qoriq/ceetm;protocol=https;nobranch=1"
 SRCREV = "46b3565a48ca20f90ad601cef8250cdd35f18b22"
 SRC_URI:append = " file://0001-Makefile-update-CFLAGS.patch \
-                   file://0001-Makefile-Fix-build-error-with-gcc15-YOCIMX-8305.patch \
+                  file://0001-Makefile-Fix-build-error-with-gcc15-YOCIMX-8305.patch \
 "
 DEPENDS = "iproute2"
diff --git a/recipes-kernel/kernel-modules/kernel-module-ar_git.bb b/recipes-kernel/kernel-modules/kernel-module-ar_git.bb
index 054cb1fb9..9303459a0 100644
--- a/recipes-kernel/kernel-modules/kernel-module-ar_git.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-ar_git.bb
@@ -1,11 +1,14 @@
 SUMMARY = "Auto Response Control Module"
+DESCRIPTION = "Kernel module providing QorIQ SEC auto-response control."
+HOMEPAGE = "https://github.com/nxp-qoriq-yocto-sdk/auto-resp"
+SECTION = "kernel"
 LICENSE = "GPL-2.0-only & BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b5881ecf398da8a03a3f4c501e29d287"
 inherit module
 SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/auto-resp;branch=nxp/sdk-v2.0.x;protocol=https"
-SRCREV =  "9a74743167dcfcfbca5056eedbff9a52337c9712"
+SRCREV = "9a74743167dcfcfbca5056eedbff9a52337c9712"
 EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} SYSROOT=${STAGING_DIR_TARGET}"
 export KERNEL_PATH
@@ -17,10 +20,10 @@ do_compile:prepend() {
 }
 do_install(){
-        install -d ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}
+    install -d ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}
-        install -d ${D}${bindir}
+    install -d ${D}${bindir}
-        install -m 644 ${B}/bin/ar.ko ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/
+    install -m 644 ${B}/bin/ar.ko ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/
-        cp -f ${S}/bin/ar_* ${D}${bindir}/ 
+    cp -f ${S}/bin/ar_* ${D}${bindir}/
 }
 FILES:${PN} += "${bindir}/"
diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2+fslc.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2+fslc.bb
index 053239365..66889ae65 100644
--- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2+fslc.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2+fslc.bb
@@ -3,7 +3,9 @@
 SUMMARY = "Kernel loadable module for Vivante GPU"
 DESCRIPTION = "This package uses an exact copy of the GPU kernel driver source code of \
-the same version as base and include fixes and improvements developed by FSL Community"
+               the same version as base and include fixes and improvements developed by FSL Community"
+HOMEPAGE = "https://github.com/Freescale/kernel-module-imx-gpu-viv"
+SECTION = "kernel"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p4.4.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p4.4.bb
index 5dc9ab894..29697b5f7 100644
--- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p4.4.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p4.4.bb
@@ -3,7 +3,9 @@
 SUMMARY = "Kernel loadable module for Vivante GPU"
 DESCRIPTION = "Builds the Vivante GPU kernel driver as a loadable kernel module, \
-allowing flexibility to use a newer graphics release with an older kernel."
+               allowing flexibility to use a newer graphics release with an older kernel."
+HOMEPAGE = "https://github.com/nxp-imx/linux-imx"
+SECTION = "kernel"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
diff --git a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.26.1.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.26.1.bb
index dfe55bc80..5276a4dea 100644
--- a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.26.1.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.26.1.bb
@@ -1,6 +1,9 @@
 # Copyright 2020-2026 NXP
+SUMMARY = "i.MX ISP kernel module"
 DESCRIPTION = "Kernel loadable module for ISP"
+HOMEPAGE = "https://github.com/nxp-imx/isp-vvcam"
+SECTION = "kernel"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://${S}/../LICENSE;md5=64381a6ea83b48c39fe524c85f65fb44"
@@ -17,7 +20,7 @@ inherit module
 MODULES_MODULE_SYMVERS_LOCATION = "dwe"
-DEBUG_PREFIX_MAP:prepend = " \
+DEBUG_PREFIX_MAP:prepend = "\
    -fmacro-prefix-map=${UNPACKDIR}/${BP}/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
    -fdebug-prefix-map=${UNPACKDIR}/${BP}/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} "
diff --git a/recipes-kernel/kernel-modules/kernel-module-ls-debug_git.bb b/recipes-kernel/kernel-modules/kernel-module-ls-debug_git.bb
index 9c5ce8f17..4e97bfdc2 100644
--- a/recipes-kernel/kernel-modules/kernel-module-ls-debug_git.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-ls-debug_git.bb
@@ -1,6 +1,7 @@
 SUMMARY = "Layerscape Debug File System Module"
 DESCRIPTION = "This package is the kernel module which is used for \
-ls102xa targets debug."
+               ls102xa targets debug."
+HOMEPAGE = "https://github.com/nxp-qoriq-yocto-sdk/ls-dbg"
 SECTION = "ls-debug"
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94263f12f9416f9fd0493c8f9e8085a3"
diff --git a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb
index d22b643c7..7af9d3e4b 100644
--- a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb
@@ -1,4 +1,7 @@
 SUMMARY = "NXP Wi-Fi driver for module 88w8801/8987/8997/9098 IW416/610/612"
+DESCRIPTION = "Kernel driver for NXP 88W8801/8987/8997/9098 and IW416/610/612 Wi-Fi modules."
+HOMEPAGE = "https://github.com/nxp-imx/mwifiex"
+SECTION = "kernel"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ab04ac0f249af12befccb94447c08b77"
@@ -10,7 +13,7 @@ RCONFLICTS:${PN} = "kernel-module-nxp89xx"
 KERNEL_MODULE_PROBECONF += "moal"
 module_conf_moal = "options moal mod_para=nxp/wifi_mod_para.conf"
-SRC_URI = " \
+SRC_URI = "\
    ${MRVL_SRC};branch=${SRCBRANCH} \
    file://0001-mlinux-moal_main-fix-device-wakeup-capability.patch \
 "
diff --git a/recipes-kernel/kernel-modules/kernel-module-uio-seville_0.1.bb b/recipes-kernel/kernel-modules/kernel-module-uio-seville_0.1.bb
index e7ae8556e..e8852b9a0 100644
--- a/recipes-kernel/kernel-modules/kernel-module-uio-seville_0.1.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-uio-seville_0.1.bb
@@ -1,4 +1,7 @@
+SUMMARY = "T1040 L2 switch UIO driver"
 DESCRIPTION = "UIO driver for T1040 L2 Switch"
+HOMEPAGE = "https://github.com/nxp-qoriq-yocto-sdk/l2switch-uio"
+SECTION = "kernel"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
diff --git a/recipes-kernel/linux/linux-fslc-imx_6.18.bb b/recipes-kernel/linux/linux-fslc-imx_6.18.bb
index 229ec1dcb..ca917f22a 100644
--- a/recipes-kernel/linux/linux-fslc-imx_6.18.bb
+++ b/recipes-kernel/linux/linux-fslc-imx_6.18.bb
@@ -5,9 +5,10 @@
 SUMMARY = "Linux Kernel provided by NXP and supported by Community"
 DESCRIPTION = "Linux Kernel provided by NXP as the part of release distribution. \
-Main focus is set on i.MX Family Reference Boards. \
+               Main focus is set on i.MX Family Reference Boards. \
-It includes support for many NXP Proprietary IPs (GPU, VPU, IPU). \
+               It includes support for many NXP Proprietary IPs (GPU, VPU, IPU). \
-Latest stable Kernel patchlevel is applied and maintained by Community."
+               Latest stable Kernel patchlevel is applied and maintained by Community."
+HOMEPAGE = "https://github.com/Freescale/linux-fslc"
 ###############################################################################
 # This recipe (and corresponding kernel repository and branch) receives updates
diff --git a/recipes-kernel/linux/linux-fslc-lts_6.1.bb b/recipes-kernel/linux/linux-fslc-lts_6.1.bb
index ae1e71b18..e490755e7 100644
--- a/recipes-kernel/linux/linux-fslc-lts_6.1.bb
+++ b/recipes-kernel/linux/linux-fslc-lts_6.1.bb
@@ -6,9 +6,10 @@
 SUMMARY = "FSL Community BSP Linux LTS based kernel with backported features and fixes"
 DESCRIPTION = "Linux kernel based on LTS kernel used by FSL Community BSP in order to \
-provide support for some backported features and fixes, or because it was applied in upstream \
+               provide support for some backported features and fixes, or because it was applied in upstream \
-and will not become part of a LTS version, or because it is not applicable for \
+               and will not become part of a LTS version, or because it is not applicable for \
-upstreaming in any form."
+               upstreaming in any form."
+HOMEPAGE = "https://github.com/Freescale/linux-fslc"
 require linux-imx.inc
diff --git a/recipes-kernel/linux/linux-fslc-lts_6.6.bb b/recipes-kernel/linux/linux-fslc-lts_6.6.bb
index cc067262a..a4d15e0cc 100644
--- a/recipes-kernel/linux/linux-fslc-lts_6.6.bb
+++ b/recipes-kernel/linux/linux-fslc-lts_6.6.bb
@@ -6,9 +6,10 @@
 SUMMARY = "FSL Community BSP Linux LTS based kernel with backported features and fixes"
 DESCRIPTION = "Linux kernel based on LTS kernel used by FSL Community BSP in order to \
-provide support for some backported features and fixes, or because it was applied in upstream \
+               provide support for some backported features and fixes, or because it was applied in upstream \
-and will not become part of a LTS version, or because it is not applicable for \
+               and will not become part of a LTS version, or because it is not applicable for \
-upstreaming in any form."
+               upstreaming in any form."
+HOMEPAGE = "https://github.com/Freescale/linux-fslc"
 require linux-imx.inc
diff --git a/recipes-kernel/linux/linux-fslc-qoriq_5.4.bb b/recipes-kernel/linux/linux-fslc-qoriq_5.4.bb
index 212e7858e..7264709a4 100644
--- a/recipes-kernel/linux/linux-fslc-qoriq_5.4.bb
+++ b/recipes-kernel/linux/linux-fslc-qoriq_5.4.bb
@@ -2,9 +2,10 @@
 SUMMARY = "Mainline/LTS rebased NXP/QorIQ patches + FSLC patches."
 DESCRIPTION = "Linux kernel based on LTS kernel used by FSL Community BSP in order to \
-provide support for some backported features and fixes, or because it was applied in linux-next \
+               provide support for some backported features and fixes, or because it was applied in linux-next \
-and takes some time to become part of a stable version, or because it is not applicable for \
+               and takes some time to become part of a stable version, or because it is not applicable for \
-upstreaming."
+               upstreaming."
+HOMEPAGE = "https://github.com/Freescale/linux-fslc"
 require recipes-kernel/linux/linux-qoriq.inc
diff --git a/recipes-kernel/linux/linux-fslc_6.12.bb b/recipes-kernel/linux/linux-fslc_6.12.bb
index 8b66b82d4..45db75ecf 100644
--- a/recipes-kernel/linux/linux-fslc_6.12.bb
+++ b/recipes-kernel/linux/linux-fslc_6.12.bb
@@ -6,15 +6,16 @@
 SUMMARY = "FSL Community BSP Linux mainline based kernel with backported features and fixes"
 DESCRIPTION = "Linux kernel based on mainline kernel used by FSL Community BSP in order to \
-provide support for some backported features and fixes, or because it was applied in linux-next \
+               provide support for some backported features and fixes, or because it was applied in linux-next \
-and takes some time to become part of a stable version, or because it is not applicable for \
+               and takes some time to become part of a stable version, or because it is not applicable for \
-upstreaming."
+               upstreaming."
+HOMEPAGE = "https://github.com/Freescale/linux-fslc"
 require linux-imx.inc
 SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https"
-DEPENDS += " \
+DEPENDS += "\
    coreutils-native \
 "
diff --git a/recipes-kernel/linux/linux-imx-headers_6.18.bb b/recipes-kernel/linux/linux-imx-headers_6.18.bb
index b6d7f8eb8..4e4c986b1 100644
--- a/recipes-kernel/linux/linux-imx-headers_6.18.bb
+++ b/recipes-kernel/linux/linux-imx-headers_6.18.bb
@@ -3,7 +3,8 @@
 SUMMARY = "Installs i.MX-specific kernel headers"
 DESCRIPTION = "Installs i.MX-specific kernel headers to userspace. \
-New headers are installed in ${includedir}/imx."
+               New headers are installed in ${includedir}/imx."
+HOMEPAGE = "https://github.com/nxp-imx/linux-imx"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
@@ -16,12 +17,11 @@ LOCALVERSION = "-lts-${SRCBRANCH}"
 KBRANCH = "${SRCBRANCH}"
 SRCREV = "f49f45233f7b10006ce7e9c826ee882bb14ac8b5"
 do_configure[noexec] = "1"
 do_compile[noexec] = "1"
-IMX_UAPI_HEADERS = " \
+IMX_UAPI_HEADERS = "\
    dma-buf.h \
    hantrodec.h \
    hx280enc.h \
@@ -38,7 +38,7 @@ IMX_UAPI_HEADERS = " \
    videodev2.h \
 "
-IMX_UAPI_HEADERS_SOUND = " \
+IMX_UAPI_HEADERS_SOUND = "\
    sound/compress_offload.h \
    sound/compress_params.h \
 "
@@ -80,7 +80,7 @@ do_install() {
 ALLOW_EMPTY:${PN} = "1"
 INHIBIT_DEFAULT_DEPS = "1"
-DEPENDS += "unifdef-native bison-native rsync-native"
+DEPENDS += "bison-native rsync-native unifdef-native"
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
diff --git a/recipes-kernel/linux/linux-imx_6.18.bb b/recipes-kernel/linux/linux-imx_6.18.bb
index 5010f66c7..769ef7677 100644
--- a/recipes-kernel/linux/linux-imx_6.18.bb
+++ b/recipes-kernel/linux/linux-imx_6.18.bb
@@ -8,7 +8,8 @@
 SUMMARY = "Linux Kernel provided and supported by NXP"
 DESCRIPTION = "Linux Kernel provided and supported by NXP with focus on \
-i.MX Family Reference Boards. It includes support for many IPs such as GPU, VPU and IPU."
+               i.MX Family Reference Boards. It includes support for many IPs such as GPU, VPU and IPU."
+HOMEPAGE = "https://github.com/nxp-imx/linux-imx"
 require recipes-kernel/linux/linux-imx.inc
diff --git a/recipes-kernel/linux/linux-qoriq.inc b/recipes-kernel/linux/linux-qoriq.inc
index 8c89a33aa..5b40831fd 100644
--- a/recipes-kernel/linux/linux-qoriq.inc
+++ b/recipes-kernel/linux/linux-qoriq.inc
@@ -24,7 +24,7 @@ LOCALVERSION = ""
 KBUILD_DEFCONFIG = "${KERNEL_DEFCONFIG}"
 EXTRA_KBUILD_DEFCONFIG:qoriq-arm64 = "lsdk.config"
-EXTRA_KBUILD_DEFCONFIG:qoriq-arm   = "multi_v7_lpae.config lsdk.config"
+EXTRA_KBUILD_DEFCONFIG:qoriq-arm = "multi_v7_lpae.config lsdk.config"
 do_configure() {
    # create config with make config
@@ -48,5 +48,5 @@ do_configure() {
 }
 FILES:${KERNEL_PACKAGE_NAME}-image += "/boot/zImage*"
-INSANE_SKIP:${PN}-src += " buildpaths"
+INSANE_SKIP:${PN}-src += "buildpaths"
 COMPATIBLE_MACHINE = "(qoriq)"
diff --git a/recipes-kernel/linux/linux-qoriq_6.12.bb b/recipes-kernel/linux/linux-qoriq_6.12.bb
index aa7561e3e..378a5d0af 100644
--- a/recipes-kernel/linux/linux-qoriq_6.12.bb
+++ b/recipes-kernel/linux/linux-qoriq_6.12.bb
@@ -7,3 +7,4 @@ SRC_URI = "${LINUX_QORIQ_SRC};branch=${LINUX_QORIQ_BRANCH}"
 SRCREV = "df24f9428e38740256a410b983003a478e72a7c0"
 require linux-qoriq.inc
+HOMEPAGE = "https://github.com/nxp-qoriq/linux"
diff --git a/recipes-kernel/skmm-host/skmm-host_git.bb b/recipes-kernel/skmm-host/skmm-host_git.bb
index cc226bd9a..2c3cfef32 100644
--- a/recipes-kernel/skmm-host/skmm-host_git.bb
+++ b/recipes-kernel/skmm-host/skmm-host_git.bb
@@ -1,4 +1,6 @@
+SUMMARY = "SKMM host driver"
 DESCRIPTION = "skmm host driver offload data to PCIe EP and push the data en-decrypted back to application"
+HOMEPAGE = "https://github.com/nxp-qoriq-yocto-sdk/skmm-host"
 SECTION = "c293-skmm-host"
 LICENSE = "BSD & GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=99803d8e9a595c0bdb45ca710f353813"
diff --git a/recipes-libraries/ethos-u-driver-stack/ethos-u-driver-stack_24.05.bb b/recipes-libraries/ethos-u-driver-stack/ethos-u-driver-stack_24.05.bb
index b3aae7d46..d83476f64 100644
--- a/recipes-libraries/ethos-u-driver-stack/ethos-u-driver-stack_24.05.bb
+++ b/recipes-libraries/ethos-u-driver-stack/ethos-u-driver-stack_24.05.bb
@@ -1,15 +1,16 @@
 SUMMARY = "The Linux driver stack for Arm(R) Ethos(TM)-U NPU"
 DESCRIPTION = "The Linux driver stack for Arm(R) Ethos(TM)-U provides \
-an example of how a rich operating system like Linux can dispatch \
+               an example of how a rich operating system like Linux can dispatch \
-inferences to an Arm Cortex(R)-M subsystem, consisting of an Arm \
+               inferences to an Arm Cortex(R)-M subsystem, consisting of an Arm \
-Cortex-M of choice and an Arm Ethos-U NPU."
+               Cortex-M of choice and an Arm Ethos-U NPU."
+HOMEPAGE = "https://github.com/nxp-imx/ethos-u-driver-stack-imx"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e3fc50a88d0a364313df4b21ef20c29e"
 DEPENDS = "flatbuffers python3-pybind11 python3-pybind11-native"
 SRC_URI = "${ETHOS_U_SRC};branch=${SRCBRANCH} \
-    file://0001-ethosu.hpp-Fix-gcc15-build-issues.patch \
+           file://0001-ethosu.hpp-Fix-gcc15-build-issues.patch \
 "
 ETHOS_U_SRC ?= "git://github.com/nxp-imx/ethos-u-driver-stack-imx.git;protocol=https"
diff --git a/recipes-libraries/ethos-u-driver-stack/ethos-u-firmware_24.05.bb b/recipes-libraries/ethos-u-driver-stack/ethos-u-firmware_24.05.bb
index 7a6fb5aa7..ae7bc914e 100644
--- a/recipes-libraries/ethos-u-driver-stack/ethos-u-firmware_24.05.bb
+++ b/recipes-libraries/ethos-u-driver-stack/ethos-u-firmware_24.05.bb
@@ -1,5 +1,6 @@
 SUMMARY = "The firmware of Cortex(R)-M33 for Arm(R) Ethos(TM)-U NPU"
 DESCRIPTION = "The firmware of Cortex(R)-M33 for Arm(R) Ethos(TM)-U NPU"
+HOMEPAGE = "https://github.com/nxp-imx/ethos-u-firmware"
 LICENSE = "Apache-2.0 & GPL-2.0-only & BSD-3-Clause"
 LIC_FILES_CHKSUM = "\
    file://LICENSE.txt;md5=e3fc50a88d0a364313df4b21ef20c29e \
@@ -13,7 +14,7 @@ SRCBRANCH = "lf-6.18.2_1.0.0"
 SRCREV = "5c14790b7ed63a52afd2ba6d917070e4c7b4265e"
 ETHOS_U_FIRMWARE = "ethosu_firmware"
-ETHOS_U_FIRMWARE:imx93-9x9-lpddr4-qsb    = "ethosu_firmware_9x9"
+ETHOS_U_FIRMWARE:imx93-9x9-lpddr4-qsb = "ethosu_firmware_9x9"
 ETHOS_U_FIRMWARE:imx93-11x11-lpddr4x-evk = "ethosu_firmware_11x11"
 ETHOS_U_FIRMWARE:imx93-14x14-lpddr4x-evk = "ethosu_firmware_14x14"
diff --git a/recipes-multimedia/alsa/alsa-lib_%.bbappend b/recipes-multimedia/alsa/alsa-lib_%.bbappend
index a8935ed51..5a69da1bd 100644
--- a/recipes-multimedia/alsa/alsa-lib_%.bbappend
+++ b/recipes-multimedia/alsa/alsa-lib_%.bbappend
@@ -1,11 +1,11 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-IMX_PATCH = " \
+IMX_PATCH = "\
    file://0001-add-conf-for-multichannel-support-in-imx.patch \
    file://0005-add-ak4458-conf-for-multichannel-support.patch \
    file://0006-add-conf-for-iMX-XCVR-sound-card.patch \
    file://0007-add-conf-for-imx-cs42448-sound-card.patch \
 "
-SRC_URI:append:imx-nxp-bsp = "${IMX_PATCH}"
+SRC_URI:append:imx-nxp-bsp = " ${IMX_PATCH}"
 PACKAGE_ARCH:imx-nxp-bsp = "${MACHINE_SOCARCH}"
diff --git a/recipes-multimedia/alsa/imx-alsa-plugins_git.bb b/recipes-multimedia/alsa/imx-alsa-plugins_git.bb
index fabbbb4ff..fced1cb66 100644
--- a/recipes-multimedia/alsa/imx-alsa-plugins_git.bb
+++ b/recipes-multimedia/alsa/imx-alsa-plugins_git.bb
@@ -3,6 +3,7 @@
 # Released under the MIT license (see COPYING.MIT for the terms)
 DESCRIPTION = "Freescale alsa-lib plugins"
+HOMEPAGE = "https://github.com/nxp-imx/imx-alsa-plugins"
 LICENSE = "GPL-2.0-only"
 SECTION = "multimedia"
 DEPENDS = "alsa-lib"
@@ -27,7 +28,7 @@ SRCREV = "18eb79b6cf13fb988de7d4eef5b22eb60f8e2533"
 CFLAGS:append = " -I${STAGING_INCDIR_IMX}"
 PACKAGECONFIG ??= "${PACKAGECONFIG_SWPDM}"
-PACKAGECONFIG_SWPDM             = ""
+PACKAGECONFIG_SWPDM = ""
 PACKAGECONFIG_SWPDM:mx8-nxp-bsp = "swpdm"
 PACKAGECONFIG[swpdm] = "--enable-swpdm,--disable-swpdm,imx-sw-pdm"
diff --git a/recipes-multimedia/gstreamer/gst-devtools_1.26.6.bb b/recipes-multimedia/gstreamer/gst-devtools_1.26.6.bb
index ddbe334db..fd32b0a80 100644
--- a/recipes-multimedia/gstreamer/gst-devtools_1.26.6.bb
+++ b/recipes-multimedia/gstreamer/gst-devtools_1.26.6.bb
@@ -14,7 +14,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-${PV}
 SRC_URI[sha256sum] = "dec8fc56d578d65c498e65e56efe44994c5d3f4e85dbbdff0242b441b32e19b2"
-DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base"
+DEPENDS = "glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base json-glib"
 RRECOMMENDS:${PN} = "git"
 FILES:${PN} += "${datadir}/gstreamer-1.0/* ${libdir}/gst-validate-launcher/* ${libdir}/gstreamer-1.0/*"
@@ -33,7 +33,7 @@ def gettext_oemeson(d):
 # Build GstValidateVideo
 PACKAGECONFIG[cairo] = "-Dcairo=enabled,-Dcairo=disabled,cairo"
-EXTRA_OEMESON += " \
+EXTRA_OEMESON += "\
    -Ddoc=disabled \
    -Ddebug_viewer=disabled \
    -Dtests=disabled \
diff --git a/recipes-multimedia/gstreamer/gst-examples_1.26.6.bb b/recipes-multimedia/gstreamer/gst-examples_1.26.6.bb
index 2b31df7df..1a606ad48 100644
--- a/recipes-multimedia/gstreamer/gst-examples_1.26.6.bb
+++ b/recipes-multimedia/gstreamer/gst-examples_1.26.6.bb
@@ -8,9 +8,9 @@ BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-examples/-/issues"
 LICENSE = "LGPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://playback/player/gtk/gtk-play.c;beginline=1;endline=20;md5=f8c72dae3d36823ec716a9ebcae593b9"
-DEPENDS = "glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gtk+3 json-glib glib-2.0-native"
+DEPENDS = "glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-bad gstreamer1.0-plugins-base gtk+3 json-glib"
-SRC_URI = "git://gitlab.freedesktop.org/gstreamer/gstreamer.git;protocol=https;branch=1.26;tag=${PV} \
+SRC_URI = "git://gitlab.freedesktop.org/gstreamer/gstreamer.git;protocol=https;branch=1.26 \
           file://0001-Make-player-examples-installable.patch \
           file://gst-player.desktop \
           "
@@ -29,13 +29,13 @@ UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)"
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 do_install:append() {
-        install -m 0644 -D ${UNPACKDIR}/gst-player.desktop ${D}${datadir}/applications/gst-player.desktop
+    install -m 0644 -D ${UNPACKDIR}/gst-player.desktop ${D}${datadir}/applications/gst-player.desktop
 }
 RDEPENDS:${PN} = "gstreamer1.0-plugins-base-playback"
 RRECOMMENDS:${PN} = "gstreamer1.0-plugins-base-meta \
                     gstreamer1.0-plugins-good-meta \
                     gstreamer1.0-plugins-bad-meta \
-                      ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "gstreamer1.0-libav", "", d)} \
+                     ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "gstreamer1.0-libav", "", d)} \
                     ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "gstreamer1.0-plugins-ugly-meta", "", d)}"
 RPROVIDES:${PN} += "gst-player gst-player-bin"
diff --git a/recipes-multimedia/gstreamer/gst-variable-rtsp-server_1.0.bb b/recipes-multimedia/gstreamer/gst-variable-rtsp-server_1.0.bb
index 96a7ce6ab..59fb98393 100644
--- a/recipes-multimedia/gstreamer/gst-variable-rtsp-server_1.0.bb
+++ b/recipes-multimedia/gstreamer/gst-variable-rtsp-server_1.0.bb
@@ -8,17 +8,16 @@ LICENSE = "GPL-3.0-only"
 inherit pkgconfig
-DEPENDS = "gstreamer1.0 gstreamer1.0-rtsp-server glib-2.0"
+DEPENDS = "glib-2.0 gstreamer1.0 gstreamer1.0-rtsp-server"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-SRC_URI = " \
+SRC_URI = "\
    git://github.com/Gateworks/gst-gateworks-apps;branch=master;protocol=https \
 "
 SRCREV = "490564815d8049dbdd79087f546835b673ba6e88"
 do_install() {
    install -m 0755 -D ${S}/bin/gst-variable-rtsp-server \
        ${D}/${bindir}/gst-variable-rtsp-server
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.26.6.bb b/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.26.6.bb
index e7a4a7dea..a19ccd93d 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.26.6.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.26.6.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Libav-based GStreamer 1.x plugin"
 DESCRIPTION = "Contains a GStreamer plugin for using the encoders, decoders, \
-muxers, and demuxers provided by FFmpeg."
+               muxers, and demuxers provided by FFmpeg."
 HOMEPAGE = "http://gstreamer.freedesktop.org/"
 SECTION = "multimedia"
@@ -20,7 +20,7 @@ DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base ffmpeg"
 inherit meson pkgconfig upstream-version-is-even
-EXTRA_OEMESON += " \
+EXTRA_OEMESON += "\
    -Dtests=disabled \
 "
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.6.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.6.imx.bb
index 36db56eb8..8c294d92f 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.6.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.6.imx.bb
@@ -11,6 +11,7 @@ require recipes-multimedia/gstreamer/gstreamer1.0-plugins-license.inc
 SUMMARY = "'Bad' GStreamer plugins and helper libraries "
 HOMEPAGE = "https://gstreamer.freedesktop.org/"
 BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues"
+CVE_PRODUCT = "gst-plugins-bad"
 SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz \
           file://0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch \
@@ -26,7 +27,7 @@ DEPENDS += "gstreamer1.0-plugins-base"
 inherit gobject-introspection
-PACKAGECONFIG ??= " \
+PACKAGECONFIG ??= "\
    ${GSTREAMER_ORC} \
    ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
    ${@bb.utils.filter('DISTRO_FEATURES', 'directfb vulkan x11', d)} \
@@ -37,74 +38,74 @@ PACKAGECONFIG ??= " \
    ${@bb.utils.contains('TUNE_FEATURES', 'mx32', '', 'rsvg', d)} \
 "
-PACKAGECONFIG[aom]             = "-Daom=enabled,-Daom=disabled,aom"
+PACKAGECONFIG[aom] = "-Daom=enabled,-Daom=disabled,aom"
-PACKAGECONFIG[assrender]       = "-Dassrender=enabled,-Dassrender=disabled,libass"
+PACKAGECONFIG[assrender] = "-Dassrender=enabled,-Dassrender=disabled,libass"
-PACKAGECONFIG[avtp]            = "-Davtp=enabled,-Davtp=disabled,libavtp"
+PACKAGECONFIG[avtp] = "-Davtp=enabled,-Davtp=disabled,libavtp"
-PACKAGECONFIG[bluez]           = "-Dbluez=enabled,-Dbluez=disabled,bluez5"
+PACKAGECONFIG[bluez] = "-Dbluez=enabled,-Dbluez=disabled,bluez5"
-PACKAGECONFIG[bz2]             = "-Dbz2=enabled,-Dbz2=disabled,bzip2"
+PACKAGECONFIG[bz2] = "-Dbz2=enabled,-Dbz2=disabled,bzip2"
-PACKAGECONFIG[closedcaption]   = "-Dclosedcaption=enabled,-Dclosedcaption=disabled,pango cairo"
+PACKAGECONFIG[closedcaption] = "-Dclosedcaption=enabled,-Dclosedcaption=disabled,pango cairo"
-PACKAGECONFIG[curl]            = "-Dcurl=enabled,-Dcurl=disabled,curl"
+PACKAGECONFIG[curl] = "-Dcurl=enabled,-Dcurl=disabled,curl"
-PACKAGECONFIG[dash]            = "-Ddash=enabled,-Ddash=disabled,libxml2"
+PACKAGECONFIG[dash] = "-Ddash=enabled,-Ddash=disabled,libxml2"
-PACKAGECONFIG[dc1394]          = "-Ddc1394=enabled,-Ddc1394=disabled,libdc1394"
+PACKAGECONFIG[dc1394] = "-Ddc1394=enabled,-Ddc1394=disabled,libdc1394"
-PACKAGECONFIG[directfb]        = "-Ddirectfb=enabled,-Ddirectfb=disabled,directfb"
+PACKAGECONFIG[directfb] = "-Ddirectfb=enabled,-Ddirectfb=disabled,directfb"
-PACKAGECONFIG[dtls]            = "-Ddtls=enabled,-Ddtls=disabled,openssl"
+PACKAGECONFIG[dtls] = "-Ddtls=enabled,-Ddtls=disabled,openssl"
-PACKAGECONFIG[faac]            = "-Dfaac=enabled,-Dfaac=disabled,faac"
+PACKAGECONFIG[faac] = "-Dfaac=enabled,-Dfaac=disabled,faac"
-PACKAGECONFIG[faad]            = "-Dfaad=enabled,-Dfaad=disabled,faad2"
+PACKAGECONFIG[faad] = "-Dfaad=enabled,-Dfaad=disabled,faad2"
-PACKAGECONFIG[fluidsynth]      = "-Dfluidsynth=enabled,-Dfluidsynth=disabled,fluidsynth"
+PACKAGECONFIG[fluidsynth] = "-Dfluidsynth=enabled,-Dfluidsynth=disabled,fluidsynth"
-PACKAGECONFIG[hls]             = "-Dhls=enabled,-Dhls=disabled,"
+PACKAGECONFIG[hls] = "-Dhls=enabled,-Dhls=disabled,"
 # Pick atleast one crypto backend below when enabling hls
-PACKAGECONFIG[nettle]          = "-Dhls-crypto=nettle,,nettle"
+PACKAGECONFIG[nettle] = "-Dhls-crypto=nettle,,nettle"
-PACKAGECONFIG[openssl]         = "-Dhls-crypto=openssl,,openssl"
+PACKAGECONFIG[openssl] = "-Dhls-crypto=openssl,,openssl"
-PACKAGECONFIG[gcrypt]          = "-Dhls-crypto=libgcrypt,,libgcrypt"
+PACKAGECONFIG[gcrypt] = "-Dhls-crypto=libgcrypt,,libgcrypt"
 # the gl packageconfig enables OpenGL elements that haven't been ported
 # to -base yet. They depend on the gstgl library in -base, so we do
 # not add GL dependencies here, since these are taken care of in -base.
-PACKAGECONFIG[gl]              = "-Dgl=enabled,-Dgl=disabled,"
+PACKAGECONFIG[gl] = "-Dgl=enabled,-Dgl=disabled,"
-PACKAGECONFIG[kms]             = "-Dkms=enabled,-Dkms=disabled,libdrm"
+PACKAGECONFIG[kms] = "-Dkms=enabled,-Dkms=disabled,libdrm"
-PACKAGECONFIG[libde265]        = "-Dlibde265=enabled,-Dlibde265=disabled,libde265"
+PACKAGECONFIG[libde265] = "-Dlibde265=enabled,-Dlibde265=disabled,libde265"
-PACKAGECONFIG[libssh2]         = "-Dcurl-ssh2=enabled,-Dcurl-ssh2=disabled,libssh2"
+PACKAGECONFIG[libssh2] = "-Dcurl-ssh2=enabled,-Dcurl-ssh2=disabled,libssh2"
-PACKAGECONFIG[lcms2]           = "-Dcolormanagement=enabled,-Dcolormanagement=disabled,lcms"
+PACKAGECONFIG[lcms2] = "-Dcolormanagement=enabled,-Dcolormanagement=disabled,lcms"
-PACKAGECONFIG[modplug]         = "-Dmodplug=enabled,-Dmodplug=disabled,libmodplug"
+PACKAGECONFIG[modplug] = "-Dmodplug=enabled,-Dmodplug=disabled,libmodplug"
-PACKAGECONFIG[msdk]            = "-Dmsdk=enabled -Dmfx_api=oneVPL,-Dmsdk=disabled,onevpl-intel-gpu"
+PACKAGECONFIG[msdk] = "-Dmsdk=enabled -Dmfx_api=oneVPL,-Dmsdk=disabled,onevpl-intel-gpu"
-PACKAGECONFIG[neon]            = "-Dneon=enabled,-Dneon=disabled,neon"
+PACKAGECONFIG[neon] = "-Dneon=enabled,-Dneon=disabled,neon"
-PACKAGECONFIG[openal]          = "-Dopenal=enabled,-Dopenal=disabled,openal-soft"
+PACKAGECONFIG[openal] = "-Dopenal=enabled,-Dopenal=disabled,openal-soft"
-PACKAGECONFIG[opencv]          = "-Dopencv=enabled,-Dopencv=disabled,opencv"
+PACKAGECONFIG[opencv] = "-Dopencv=enabled,-Dopencv=disabled,opencv"
-PACKAGECONFIG[openh264]        = "-Dopenh264=enabled,-Dopenh264=disabled,openh264"
+PACKAGECONFIG[openh264] = "-Dopenh264=enabled,-Dopenh264=disabled,openh264"
-PACKAGECONFIG[openjpeg]        = "-Dopenjpeg=enabled,-Dopenjpeg=disabled,openjpeg"
+PACKAGECONFIG[openjpeg] = "-Dopenjpeg=enabled,-Dopenjpeg=disabled,openjpeg"
-PACKAGECONFIG[openmpt]         = "-Dopenmpt=enabled,-Dopenmpt=disabled,libopenmpt"
+PACKAGECONFIG[openmpt] = "-Dopenmpt=enabled,-Dopenmpt=disabled,libopenmpt"
 # the opus encoder/decoder elements are now in the -base package,
 # but the opus parser remains in -bad
-PACKAGECONFIG[opusparse]       = "-Dopus=enabled,-Dopus=disabled,libopus"
+PACKAGECONFIG[opusparse] = "-Dopus=enabled,-Dopus=disabled,libopus"
-PACKAGECONFIG[resindvd]        = "-Dresindvd=enabled,-Dresindvd=disabled,libdvdread libdvdnav"
+PACKAGECONFIG[resindvd] = "-Dresindvd=enabled,-Dresindvd=disabled,libdvdread libdvdnav"
-PACKAGECONFIG[rsvg]            = "-Drsvg=enabled,-Drsvg=disabled,librsvg"
+PACKAGECONFIG[rsvg] = "-Drsvg=enabled,-Drsvg=disabled,librsvg"
-PACKAGECONFIG[rtmp]            = "-Drtmp=enabled,-Drtmp=disabled,rtmpdump"
+PACKAGECONFIG[rtmp] = "-Drtmp=enabled,-Drtmp=disabled,rtmpdump"
-PACKAGECONFIG[sbc]             = "-Dsbc=enabled,-Dsbc=disabled,sbc"
+PACKAGECONFIG[sbc] = "-Dsbc=enabled,-Dsbc=disabled,sbc"
-PACKAGECONFIG[sctp]            = "-Dsctp=enabled,-Dsctp=disabled"
+PACKAGECONFIG[sctp] = "-Dsctp=enabled,-Dsctp=disabled"
 PACKAGECONFIG[smoothstreaming] = "-Dsmoothstreaming=enabled,-Dsmoothstreaming=disabled,libxml2"
-PACKAGECONFIG[sndfile]         = "-Dsndfile=enabled,-Dsndfile=disabled,libsndfile1"
+PACKAGECONFIG[sndfile] = "-Dsndfile=enabled,-Dsndfile=disabled,libsndfile1"
-PACKAGECONFIG[srt]             = "-Dsrt=enabled,-Dsrt=disabled,srt"
+PACKAGECONFIG[srt] = "-Dsrt=enabled,-Dsrt=disabled,srt"
-PACKAGECONFIG[srtp]            = "-Dsrtp=enabled,-Dsrtp=disabled,libsrtp"
+PACKAGECONFIG[srtp] = "-Dsrtp=enabled,-Dsrtp=disabled,libsrtp"
-PACKAGECONFIG[tinyalsa]        = "-Dtinyalsa=enabled,-Dtinyalsa=disabled,tinyalsa"
+PACKAGECONFIG[tinyalsa] = "-Dtinyalsa=enabled,-Dtinyalsa=disabled,tinyalsa"
-PACKAGECONFIG[ttml]            = "-Dttml=enabled,-Dttml=disabled,libxml2 pango cairo"
+PACKAGECONFIG[ttml] = "-Dttml=enabled,-Dttml=disabled,libxml2 pango cairo"
-PACKAGECONFIG[uvch264]         = "-Duvch264=enabled,-Duvch264=disabled,libusb1 libgudev"
+PACKAGECONFIG[uvch264] = "-Duvch264=enabled,-Duvch264=disabled,libusb1 libgudev"
 # this enables support for stateless V4L2 mem2mem codecs, which is a newer form of
 # V4L2 codec; the V4L2 code in -base supports the older stateful V4L2 mem2mem codecs
-PACKAGECONFIG[v4l2codecs]      = "-Dv4l2codecs=enabled,-Dv4l2codecs=disabled,libgudev"
+PACKAGECONFIG[v4l2codecs] = "-Dv4l2codecs=enabled,-Dv4l2codecs=disabled,libgudev"
-PACKAGECONFIG[va]              = "-Dva=enabled,-Dva=disabled,libva"
+PACKAGECONFIG[va] = "-Dva=enabled,-Dva=disabled,libva"
-PACKAGECONFIG[voaacenc]        = "-Dvoaacenc=enabled,-Dvoaacenc=disabled,vo-aacenc"
+PACKAGECONFIG[voaacenc] = "-Dvoaacenc=enabled,-Dvoaacenc=disabled,vo-aacenc"
-PACKAGECONFIG[voamrwbenc]      = "-Dvoamrwbenc=enabled,-Dvoamrwbenc=disabled,vo-amrwbenc"
+PACKAGECONFIG[voamrwbenc] = "-Dvoamrwbenc=enabled,-Dvoamrwbenc=disabled,vo-amrwbenc"
-PACKAGECONFIG[vulkan]          = "-Dvulkan=enabled,-Dvulkan=disabled,vulkan-loader shaderc-native"
+PACKAGECONFIG[vulkan] = "-Dvulkan=enabled,-Dvulkan=disabled,vulkan-loader shaderc-native"
-PACKAGECONFIG[wayland]         = "-Dwayland=enabled,-Dwayland=disabled,wayland-native wayland wayland-protocols libdrm"
+PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,wayland-native wayland wayland-protocols libdrm"
-PACKAGECONFIG[webp]            = "-Dwebp=enabled,-Dwebp=disabled,libwebp"
+PACKAGECONFIG[webp] = "-Dwebp=enabled,-Dwebp=disabled,libwebp"
-PACKAGECONFIG[webrtc]          = "-Dwebrtc=enabled,-Dwebrtc=disabled,libnice"
+PACKAGECONFIG[webrtc] = "-Dwebrtc=enabled,-Dwebrtc=disabled,libnice"
-PACKAGECONFIG[webrtcdsp]       = "-Dwebrtcdsp=enabled,-Dwebrtcdsp=disabled,webrtc-audio-processing"
+PACKAGECONFIG[webrtcdsp] = "-Dwebrtcdsp=enabled,-Dwebrtcdsp=disabled,webrtc-audio-processing"
-PACKAGECONFIG[zbar]            = "-Dzbar=enabled,-Dzbar=disabled,zbar"
+PACKAGECONFIG[zbar] = "-Dzbar=enabled,-Dzbar=disabled,zbar"
-PACKAGECONFIG[x11]             = "-Dx11=enabled,-Dx11=disabled,libxcb libxkbcommon"
+PACKAGECONFIG[x11] = "-Dx11=enabled,-Dx11=disabled,libxcb libxkbcommon"
-PACKAGECONFIG[x265]            = "-Dx265=enabled,-Dx265=disabled,x265"
+PACKAGECONFIG[x265] = "-Dx265=enabled,-Dx265=disabled,x265"
 GSTREAMER_GPL = "${@bb.utils.filter('PACKAGECONFIG', 'faad resindvd x265', d)}"
-EXTRA_OEMESON += " \
+EXTRA_OEMESON += "\
    -Ddoc=disabled \
    -Daes=enabled \
    -Dcodecalpha=enabled \
@@ -169,7 +170,6 @@ FILES:${PN}-opencv += "${datadir}/gst-plugins-bad/1.0/opencv*"
 FILES:${PN}-transcode += "${datadir}/gstreamer-1.0/encoding-profiles"
 FILES:${PN}-voamrwbenc += "${datadir}/gstreamer-1.0/presets/GstVoAmrwbEnc.prs"
 ########### End of OE-core copy ###########
 ########### i.MX overrides ################
@@ -179,14 +179,14 @@ DEFAULT_PREFERENCE = "-1"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=69333daa044cb77e486cc36129f7a770"
 SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz \
-           file://0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch \
+                  file://0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch \
-           file://0002-avoid-including-sys-poll.h-directly.patch \
+                  file://0002-avoid-including-sys-poll.h-directly.patch \
-           file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \
+                  file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \
-           "
+                  "
 SRC_URI:prepend = "${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} "
-SRC_URI:append:mx93-nxp-bsp = "file://0001-MMFMWK-9590-gstcuda-disable-gir-build-for-cuda-plugi.patch"
+SRC_URI:append:mx93-nxp-bsp = " file://0001-MMFMWK-9590-gstcuda-disable-gir-build-for-cuda-plugi.patch"
-SRC_URI:append:mx943-nxp-bsp = "file://0001-MMFMWK-9590-gstcuda-disable-gir-build-for-cuda-plugi.patch"
+SRC_URI:append:mx943-nxp-bsp = " file://0001-MMFMWK-9590-gstcuda-disable-gir-build-for-cuda-plugi.patch"
 GST1.0-PLUGINS-BAD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-bad.git;protocol=https"
 SRCBRANCH = "MM_04.10.03_2512_L6.18.2"
@@ -197,7 +197,7 @@ inherit use-imx-headers
 PACKAGE_ARCH:imxpxp = "${MACHINE_SOCARCH}"
 PACKAGE_ARCH:mx8-nxp-bsp = "${MACHINE_SOCARCH}"
-PACKAGECONFIG_REMOVE ?= " \
+PACKAGECONFIG_REMOVE ?= "\
    dtls vulkan \
    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', 'gl', d)} \
 "
@@ -207,17 +207,17 @@ PACKAGECONFIG:remove:mx943-nxp-bsp = "gl"
 PACKAGECONFIG:append:mx8-nxp-bsp = " kms tinycompress"
 PACKAGECONFIG:append = " ${PACKAGECONFIG_G2D}"
-PACKAGECONFIG_G2D          ??= ""
+PACKAGECONFIG_G2D ??= ""
 PACKAGECONFIG_G2D:imxgpu2d ??= "g2d"
 PACKAGECONFIG[g2d] = ",,virtual/libg2d"
-PACKAGECONFIG[tinycompress]    = "-Dtinycompress=enabled,-Dtinycompress=disabled,tinycompress"
+PACKAGECONFIG[tinycompress] = "-Dtinycompress=enabled,-Dtinycompress=disabled,tinycompress"
-EXTRA_OEMESON += " \
+EXTRA_OEMESON += "\
    -Dc_args="${CFLAGS} -I${STAGING_INCDIR_IMX}" \
 "
-EXTRA_OEMESON:remove = " \
+EXTRA_OEMESON:remove = "\
    -Dkate=disabled \
 "
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.6.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.6.imx.bb
index 0cfa8c064..86790354e 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.6.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.6.imx.bb
@@ -29,7 +29,7 @@ inherit gobject-introspection
 PACKAGECONFIG_X11 = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl glx', '', d)}"
 PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2 egl ${PACKAGECONFIG_X11}', '', d)}"
-PACKAGECONFIG ??= " \
+PACKAGECONFIG ??= "\
    ${GSTREAMER_ORC} \
    ${PACKAGECONFIG_GL} \
    ${@bb.utils.filter('DISTRO_FEATURES', 'alsa x11', d)} \
@@ -44,40 +44,40 @@ X11DEPENDS = "virtual/libx11 libsm libxrender libxv"
 X11ENABLEOPTS = "-Dx11=enabled -Dxvideo=enabled -Dxshm=enabled"
 X11DISABLEOPTS = "-Dx11=disabled -Dxvideo=disabled -Dxshm=disabled"
-PACKAGECONFIG[alsa]         = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib"
+PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib"
-PACKAGECONFIG[cdparanoia]   = "-Dcdparanoia=enabled,-Dcdparanoia=disabled,cdparanoia"
+PACKAGECONFIG[cdparanoia] = "-Dcdparanoia=enabled,-Dcdparanoia=disabled,cdparanoia"
-PACKAGECONFIG[graphene]     = "-Dgl-graphene=enabled,-Dgl-graphene=disabled,graphene"
+PACKAGECONFIG[graphene] = "-Dgl-graphene=enabled,-Dgl-graphene=disabled,graphene"
-PACKAGECONFIG[jpeg]         = "-Dgl-jpeg=enabled,-Dgl-jpeg=disabled,jpeg"
+PACKAGECONFIG[jpeg] = "-Dgl-jpeg=enabled,-Dgl-jpeg=disabled,jpeg"
-PACKAGECONFIG[ogg]          = "-Dogg=enabled,-Dogg=disabled,libogg"
+PACKAGECONFIG[ogg] = "-Dogg=enabled,-Dogg=disabled,libogg"
-PACKAGECONFIG[opus]         = "-Dopus=enabled,-Dopus=disabled,libopus"
+PACKAGECONFIG[opus] = "-Dopus=enabled,-Dopus=disabled,libopus"
-PACKAGECONFIG[pango]        = "-Dpango=enabled,-Dpango=disabled,pango"
+PACKAGECONFIG[pango] = "-Dpango=enabled,-Dpango=disabled,pango"
-PACKAGECONFIG[png]          = "-Dgl-png=enabled,-Dgl-png=disabled,libpng"
+PACKAGECONFIG[png] = "-Dgl-png=enabled,-Dgl-png=disabled,libpng"
 # This enables Qt5 QML examples in -base. The Qt5 GStreamer
 # qmlglsink and qmlglsrc plugins still exist in -good.
-PACKAGECONFIG[qt5]          = "-Dqt5=enabled,-Dqt5=disabled,qtbase qtdeclarative qtbase-native"
+PACKAGECONFIG[qt5] = "-Dqt5=enabled,-Dqt5=disabled,qtbase qtdeclarative qtbase-native"
-PACKAGECONFIG[theora]       = "-Dtheora=enabled,-Dtheora=disabled,libtheora"
+PACKAGECONFIG[theora] = "-Dtheora=enabled,-Dtheora=disabled,libtheora"
-PACKAGECONFIG[tremor]       = "-Dtremor=enabled,-Dtremor=disabled,tremor"
+PACKAGECONFIG[tremor] = "-Dtremor=enabled,-Dtremor=disabled,tremor"
-PACKAGECONFIG[visual]       = "-Dlibvisual=enabled,-Dlibvisual=disabled,libvisual"
+PACKAGECONFIG[visual] = "-Dlibvisual=enabled,-Dlibvisual=disabled,libvisual"
-PACKAGECONFIG[vorbis]       = "-Dvorbis=enabled,-Dvorbis=disabled,libvorbis"
+PACKAGECONFIG[vorbis] = "-Dvorbis=enabled,-Dvorbis=disabled,libvorbis"
-PACKAGECONFIG[x11]          = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}"
+PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}"
 # OpenGL API packageconfigs
-PACKAGECONFIG[opengl]       = ",,virtual/libgl libglu"
+PACKAGECONFIG[opengl] = ",,virtual/libgl libglu"
-PACKAGECONFIG[gles2]        = ",,virtual/libgles2"
+PACKAGECONFIG[gles2] = ",,virtual/libgles2"
 # OpenGL platform packageconfigs
-PACKAGECONFIG[egl]          = ",,virtual/egl"
+PACKAGECONFIG[egl] = ",,virtual/egl"
-PACKAGECONFIG[glx]          = ",,virtual/libgl"
+PACKAGECONFIG[glx] = ",,virtual/libgl"
 # OpenGL window systems (except for X11)
-PACKAGECONFIG[gbm]          = ",,virtual/libgbm libgudev libdrm"
+PACKAGECONFIG[gbm] = ",,virtual/libgbm libgudev libdrm"
-PACKAGECONFIG[wayland]      = ",,wayland-native wayland wayland-protocols libdrm"
+PACKAGECONFIG[wayland] = ",,wayland-native wayland wayland-protocols libdrm"
-PACKAGECONFIG[dispmanx]     = ",,virtual/libomxil"
+PACKAGECONFIG[dispmanx] = ",,virtual/libomxil"
-PACKAGECONFIG[viv-fb]       = ",,virtual/libgles2 virtual/libg2d"
+PACKAGECONFIG[viv-fb] = ",,virtual/libgles2 virtual/libg2d"
 OPENGL_WINSYS = "${@bb.utils.filter('PACKAGECONFIG', 'x11 gbm wayland dispmanx egl viv-fb', d)}"
-EXTRA_OEMESON += " \
+EXTRA_OEMESON += "\
    -Ddoc=disabled \
    ${@get_opengl_cmdline_list('gl_api', d.getVar('OPENGL_APIS'), d)} \
    ${@get_opengl_cmdline_list('gl_platform', d.getVar('OPENGL_PLATFORMS'), d)} \
@@ -108,15 +108,15 @@ DEFAULT_PREFERENCE = "-1"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=69333daa044cb77e486cc36129f7a770"
-SRC_URI:remove = " \
+SRC_URI:remove = "\
    https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${PV}.tar.xz \
    file://0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch \
    file://0003-viv-fb-Make-sure-config.h-is-included.patch \
    file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch"
 SRC_URI:prepend = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} "
-SRC_URI:append:mx93-nxp-bsp = "file://0001-MMFMWK-9590-gstgl-1.0-disable-gir-build-for-gl-plugi.patch"
+SRC_URI:append:mx93-nxp-bsp = " file://0001-MMFMWK-9590-gstgl-1.0-disable-gir-build-for-gl-plugi.patch"
-SRC_URI:append:mx943-nxp-bsp = "file://0001-MMFMWK-9590-gstgl-1.0-disable-gir-build-for-gl-plugi.patch"
+SRC_URI:append:mx943-nxp-bsp = " file://0001-MMFMWK-9590-gstgl-1.0-disable-gir-build-for-gl-plugi.patch"
 GST1.0-PLUGINS-BASE_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-base.git;protocol=https"
 SRCBRANCH = "MM_04.10.03_2512_L6.18.2"
@@ -128,7 +128,7 @@ PACKAGECONFIG:remove = "${PACKAGECONFIG_REMOVE}"
 PACKAGECONFIG_REMOVE ?= "jpeg"
 PACKAGECONFIG:append = " ${PACKAGECONFIG_G2D}"
-PACKAGECONFIG_G2D          ??= ""
+PACKAGECONFIG_G2D ??= ""
 PACKAGECONFIG_G2D:imxgpu2d ??= "g2d"
 PACKAGECONFIG[g2d] = ",,virtual/libg2d"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.26.6.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.26.6.imx.bb
index 269761536..49ae2311f 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.26.6.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.26.6.imx.bb
@@ -30,7 +30,7 @@ RDEPENDS:${PN}-soup += "${MLPREFIX}${@bb.utils.contains('PACKAGECONFIG', 'soup2'
 PACKAGECONFIG_SOUP ?= "soup3"
-PACKAGECONFIG ??= " \
+PACKAGECONFIG ??= "\
    ${GSTREAMER_ORC} \
    ${PACKAGECONFIG_SOUP} \
    ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio x11', d)} \
@@ -44,33 +44,33 @@ X11DISABLEOPTS = "-Dximagesrc=disabled -Dximagesrc-xshm=disabled -Dximagesrc-xfi
 QT5WAYLANDDEPENDS = "${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}"
-PACKAGECONFIG[asm]        = "-Dasm=enabled,-Dasm=disabled,nasm-native"
+PACKAGECONFIG[asm] = "-Dasm=enabled,-Dasm=disabled,nasm-native"
-PACKAGECONFIG[bz2]        = "-Dbz2=enabled,-Dbz2=disabled,bzip2"
+PACKAGECONFIG[bz2] = "-Dbz2=enabled,-Dbz2=disabled,bzip2"
-PACKAGECONFIG[cairo]      = "-Dcairo=enabled,-Dcairo=disabled,cairo"
+PACKAGECONFIG[cairo] = "-Dcairo=enabled,-Dcairo=disabled,cairo"
-PACKAGECONFIG[dv1394]     = "-Ddv1394=enabled,-Ddv1394=disabled,libiec61883 libavc1394 libraw1394"
+PACKAGECONFIG[dv1394] = "-Ddv1394=enabled,-Ddv1394=disabled,libiec61883 libavc1394 libraw1394"
-PACKAGECONFIG[flac]       = "-Dflac=enabled,-Dflac=disabled,flac"
+PACKAGECONFIG[flac] = "-Dflac=enabled,-Dflac=disabled,flac"
 PACKAGECONFIG[gdk-pixbuf] = "-Dgdk-pixbuf=enabled,-Dgdk-pixbuf=disabled,gdk-pixbuf"
-PACKAGECONFIG[gtk]        = "-Dgtk3=enabled,-Dgtk3=disabled,gtk+3"
+PACKAGECONFIG[gtk] = "-Dgtk3=enabled,-Dgtk3=disabled,gtk+3"
-PACKAGECONFIG[gudev]      = "-Dv4l2-gudev=enabled,-Dv4l2-gudev=disabled,libgudev"
+PACKAGECONFIG[gudev] = "-Dv4l2-gudev=enabled,-Dv4l2-gudev=disabled,libgudev"
-PACKAGECONFIG[jack]       = "-Djack=enabled,-Djack=disabled,jack"
+PACKAGECONFIG[jack] = "-Djack=enabled,-Djack=disabled,jack"
-PACKAGECONFIG[jpeg]       = "-Djpeg=enabled,-Djpeg=disabled,jpeg"
+PACKAGECONFIG[jpeg] = "-Djpeg=enabled,-Djpeg=disabled,jpeg"
-PACKAGECONFIG[lame]       = "-Dlame=enabled,-Dlame=disabled,lame"
+PACKAGECONFIG[lame] = "-Dlame=enabled,-Dlame=disabled,lame"
-PACKAGECONFIG[libpng]     = "-Dpng=enabled,-Dpng=disabled,libpng"
+PACKAGECONFIG[libpng] = "-Dpng=enabled,-Dpng=disabled,libpng"
-PACKAGECONFIG[libv4l2]    = "-Dv4l2-libv4l2=enabled,-Dv4l2-libv4l2=disabled,v4l-utils"
+PACKAGECONFIG[libv4l2] = "-Dv4l2-libv4l2=enabled,-Dv4l2-libv4l2=disabled,v4l-utils"
-PACKAGECONFIG[mpg123]     = "-Dmpg123=enabled,-Dmpg123=disabled,mpg123"
+PACKAGECONFIG[mpg123] = "-Dmpg123=enabled,-Dmpg123=disabled,mpg123"
 PACKAGECONFIG[pulseaudio] = "-Dpulse=enabled,-Dpulse=disabled,pulseaudio"
-PACKAGECONFIG[qt5]        = "-Dqt5=enabled,-Dqt5=disabled,qtbase qtdeclarative qtbase-native ${QT5WAYLANDDEPENDS}"
+PACKAGECONFIG[qt5] = "-Dqt5=enabled,-Dqt5=disabled,qtbase qtdeclarative qtbase-native ${QT5WAYLANDDEPENDS}"
-PACKAGECONFIG[soup2]      = "-Dsoup=enabled,,libsoup-2.4,,,soup3"
+PACKAGECONFIG[soup2] = "-Dsoup=enabled,,libsoup-2.4,,,soup3"
-PACKAGECONFIG[soup3]      = "-Dsoup=enabled,,libsoup,,,soup2"
+PACKAGECONFIG[soup3] = "-Dsoup=enabled,,libsoup,,,soup2"
-PACKAGECONFIG[speex]      = "-Dspeex=enabled,-Dspeex=disabled,speex"
+PACKAGECONFIG[speex] = "-Dspeex=enabled,-Dspeex=disabled,speex"
-PACKAGECONFIG[rpi]        = "-Drpicamsrc=enabled,-Drpicamsrc=disabled,userland"
+PACKAGECONFIG[rpi] = "-Drpicamsrc=enabled,-Drpicamsrc=disabled,userland"
-PACKAGECONFIG[taglib]     = "-Dtaglib=enabled,-Dtaglib=disabled,taglib"
+PACKAGECONFIG[taglib] = "-Dtaglib=enabled,-Dtaglib=disabled,taglib"
-PACKAGECONFIG[v4l2]       = "-Dv4l2=enabled -Dv4l2-probe=true,-Dv4l2=disabled -Dv4l2-probe=false"
+PACKAGECONFIG[v4l2] = "-Dv4l2=enabled -Dv4l2-probe=true,-Dv4l2=disabled -Dv4l2-probe=false"
-PACKAGECONFIG[vpx]        = "-Dvpx=enabled,-Dvpx=disabled,libvpx"
+PACKAGECONFIG[vpx] = "-Dvpx=enabled,-Dvpx=disabled,libvpx"
-PACKAGECONFIG[wavpack]    = "-Dwavpack=enabled,-Dwavpack=disabled,wavpack"
+PACKAGECONFIG[wavpack] = "-Dwavpack=enabled,-Dwavpack=disabled,wavpack"
-PACKAGECONFIG[x11]        = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}"
+PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}"
-EXTRA_OEMESON += " \
+EXTRA_OEMESON += "\
    -Ddoc=disabled \
    -Daalib=disabled \
    -Ddirectsound=disabled \
@@ -93,7 +93,7 @@ FILES:${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs"
 DEFAULT_PREFERENCE = "-1"
-LIC_FILES_CHKSUM = " \
+LIC_FILES_CHKSUM = "\
    file://LICENSE.txt;md5=69333daa044cb77e486cc36129f7a770 \
    file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe \
 "
@@ -109,8 +109,8 @@ DEPENDS:append:mx93-nxp-bsp = " libdrm"
 DEPENDS:append:mx943-nxp-bsp = " libdrm"
 SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \
-                file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch \
+                  file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch \
-                file://0001-v4l2-Define-ioctl_req_t-for-posix-linux-case.patch \
+                  file://0001-v4l2-Define-ioctl_req_t-for-posix-linux-case.patch \
 "
 SRC_URI:prepend = "${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} "
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb
index b042adb94..2768c6b7e 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb
@@ -1,5 +1,6 @@
 # Copyright (C) 2018 O.S. Systems Software LTDA.
 DESCRIPTION = "GStreamer 1.0 plugins for i.MX platforms"
+HOMEPAGE = "https://github.com/Freescale/gstreamer-imx"
 LICENSE = "LGPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=55ca817ccb7d5b5b66355690e9abc605"
 SECTION = "multimedia"
@@ -8,7 +9,7 @@ DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base libimxdmabuffer"
 # for the uniaudio decoder, videoparsersbad for the VPU video decoder
 # the gstreamer1.0-plugins-imx RDEPENDS is necessary to ensure the -good recipe is
 # built (it is not a compile-time dependency however, hence RDEPENDS and not DEPENDS)
-RDEPENDS:gstreamer1.0-plugins-imx = "gstreamer1.0-plugins-good gstreamer1.0-plugins-bad"
+RDEPENDS:gstreamer1.0-plugins-imx = "gstreamer1.0-plugins-bad gstreamer1.0-plugins-good"
 RDEPENDS:gstreamer1.0-plugins-imx-imxaudio = "gstreamer1.0-plugins-good-audioparsers"
 RDEPENDS:gstreamer1.0-plugins-imx-imxvpu = "gstreamer1.0-plugins-bad-videoparsersbad"
@@ -38,16 +39,16 @@ EXTRA_OEMESON += "-Dimx-headers-path=${STAGING_INCDIR_IMX} -Dv4l2-amphion=disabl
 PACKAGECONFIG ?= "uniaudiodec"
 PACKAGECONFIG:append:imxgpu2d = " g2d"
-PACKAGECONFIG:append:imxvpu   = " vpu"
+PACKAGECONFIG:append:imxvpu = " vpu"
-PACKAGECONFIG:append:imxipu   = " ipu"
+PACKAGECONFIG:append:imxipu = " ipu"
-PACKAGECONFIG:append:imxpxp   = " pxp"
+PACKAGECONFIG:append:imxpxp = " pxp"
 # The custom imxv4l2 source and sink elements are only
 # available on the i.MX6.
 # The 2D blitter sinks require an MXC framebuffer, which
 # is not available anymore on the i.MX8 (since these SoCs
 # now use KMS instead of the old Linux framebuffer).
-PACKAGECONFIG:append:mx6-nxp-bsp      = " imx2dvideosink v4l2-mxc-source-sink"
+PACKAGECONFIG:append:mx6-nxp-bsp = " imx2dvideosink v4l2-mxc-source-sink"
-PACKAGECONFIG:append:mx7-nxp-bsp      = " imx2dvideosink"
+PACKAGECONFIG:append:mx7-nxp-bsp = " imx2dvideosink"
 PACKAGECONFIG[g2d] = "-Dg2d=enabled ${LIBG2D_DPU_OPTION},-Dg2d=disabled,${LIBG2D_DEPENDENCIES}"
 PACKAGECONFIG[pxp] = "-Dpxp=enabled,-Dpxp=disabled,"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.6.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.6.bb
index 71de57530..72e482247 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.6.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.6.bb
@@ -6,14 +6,14 @@ HOMEPAGE = "https://gstreamer.freedesktop.org/"
 BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-ugly/-/issues"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
-                   "
+                    "
 LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later"
 LICENSE_FLAGS = "commercial"
-SRC_URI = " \
+SRC_URI = "\
-            https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \
+    https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \
-            "
+"
 SRC_URI[sha256sum] = "95032eee4580bb9826c008cbce5a2c3a78b980abb270c96a19b645f77255c491"
@@ -23,19 +23,19 @@ DEPENDS += "gstreamer1.0-plugins-base"
 GST_PLUGIN_SET_HAS_EXAMPLES = "0"
-PACKAGECONFIG ??= " \
+PACKAGECONFIG ??= "\
    ${GSTREAMER_ORC} \
 "
-PACKAGECONFIG[a52dec]   = "-Da52dec=enabled,-Da52dec=disabled,liba52"
+PACKAGECONFIG[a52dec] = "-Da52dec=enabled,-Da52dec=disabled,liba52"
-PACKAGECONFIG[cdio]     = "-Dcdio=enabled,-Dcdio=disabled,libcdio"
+PACKAGECONFIG[cdio] = "-Dcdio=enabled,-Dcdio=disabled,libcdio"
-PACKAGECONFIG[dvdread]  = "-Ddvdread=enabled,-Ddvdread=disabled,libdvdread"
+PACKAGECONFIG[dvdread] = "-Ddvdread=enabled,-Ddvdread=disabled,libdvdread"
 PACKAGECONFIG[mpeg2dec] = "-Dmpeg2dec=enabled,-Dmpeg2dec=disabled,mpeg2dec"
-PACKAGECONFIG[x264]     = "-Dx264=enabled,-Dx264=disabled,x264"
+PACKAGECONFIG[x264] = "-Dx264=enabled,-Dx264=disabled,x264"
 GSTREAMER_GPL = "${@bb.utils.filter('PACKAGECONFIG', 'a52dec cdio dvdread mpeg2dec x264', d)}"
-EXTRA_OEMESON += " \
+EXTRA_OEMESON += "\
    -Ddoc=disabled \
    -Dsidplay=disabled \
 "
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-python_1.26.6.bb b/recipes-multimedia/gstreamer/gstreamer1.0-python_1.26.6.bb
index 89306c928..825da8810 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-python_1.26.6.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-python_1.26.6.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Python bindings for GStreamer 1.0"
 DESCRIPTION = "GStreamer Python binding overrides (complementing the bindings \
-provided by python-gi) "
+               provided by python-gi) "
 HOMEPAGE = "http://cgit.freedesktop.org/gstreamer/gst-python/"
 SECTION = "multimedia"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.26.6.bb b/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.26.6.bb
index 9c32413ae..6332145df 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.26.6.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.26.6.bb
@@ -12,7 +12,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz \
           file://0001-YOCIMX-9113-rtsp-examples-install-test-launch-and-te.patch \
-          "
+           "
 SRC_URI[sha256sum] = "ce4e0b7dde7f17dc4f39ffb2dd3db64b0222d11d58be1c9820c20d30370d6f90"
@@ -20,7 +20,7 @@ S = "${UNPACKDIR}/${PNREAL}-${PV}"
 inherit meson pkgconfig upstream-version-is-even gobject-introspection
-EXTRA_OEMESON += " \
+EXTRA_OEMESON += "\
    -Ddoc=disabled \
    -Dexamples=enabled \
    -Dtests=disabled \
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.26.6.bb b/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.26.6.bb
index 559bac064..26cac0a7d 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.26.6.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.26.6.bb
@@ -1,8 +1,8 @@
 SUMMARY = "VA-API support to GStreamer"
 HOMEPAGE = "https://gstreamer.freedesktop.org/"
 DESCRIPTION = "gstreamer-vaapi consists of a collection of VA-API \
-based plugins for GStreamer and helper libraries: `vaapidecode', \
+               based plugins for GStreamer and helper libraries: `vaapidecode', \
-`vaapiconvert', and `vaapisink'."
+               `vaapiconvert', and `vaapisink'."
 REALPN = "gstreamer-vaapi"
@@ -14,13 +14,13 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.x
 SRC_URI[sha256sum] = "d87c57244cecbd17bb030b698dcb67a66225de639f7c5b837391c4a8e5477667"
 S = "${UNPACKDIR}/${REALPN}-${PV}"
-DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
+DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-bad gstreamer1.0-plugins-base libva"
 inherit meson pkgconfig features_check upstream-version-is-even
 REQUIRED_DISTRO_FEATURES ?= "opengl"
-EXTRA_OEMESON += " \
+EXTRA_OEMESON += "\
    -Ddoc=disabled \
    -Dexamples=disabled \
    -Dtests=enabled \
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0_1.26.6.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0_1.26.6.imx.bb
index e602ff35c..c6afdd98d 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0_1.26.6.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0_1.26.6.imx.bb
@@ -7,13 +7,13 @@
 SUMMARY = "GStreamer 1.0 multimedia framework"
 DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \
-It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime."
+               It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime."
 HOMEPAGE = "http://gstreamer.freedesktop.org/"
 BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=Gstreamer"
 SECTION = "multimedia"
 LICENSE = "LGPL-2.1-or-later"
-DEPENDS = "glib-2.0 glib-2.0-native libxml2 bison-native flex-native"
+DEPENDS = "bison-native flex-native glib-2.0 glib-2.0-native libxml2"
 inherit meson pkgconfig gettext upstream-version-is-even gobject-introspection ptest-gnome
@@ -54,7 +54,7 @@ def gettext_oemeson(d):
        return '-Dnls=disabled'
    return '-Dnls=enabled'
-EXTRA_OEMESON += " \
+EXTRA_OEMESON += "\
    -Ddoc=disabled \
    -Dexamples=disabled \
    -Ddbghelp=disabled \
@@ -84,17 +84,17 @@ PTEST_BUILD_HOST_FILES = ""
 DEFAULT_PREFERENCE = "-1"
-LIC_FILES_CHKSUM = " \
+LIC_FILES_CHKSUM = "\
    file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \
    file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d \
 "
 # Use i.MX fork of GST for customizations
 SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \
-                file://0001-tests-respect-the-idententaion-used-in-meson.patch \
+                  file://0001-tests-respect-the-idententaion-used-in-meson.patch \
-                file://0002-tests-add-support-for-install-the-tests.patch \
+                  file://0002-tests-add-support-for-install-the-tests.patch \
-                file://0003-tests-use-a-dictionaries-for-environment.patch;striplevel=3 \
+                  file://0003-tests-use-a-dictionaries-for-environment.patch;striplevel=3 \
-                file://0004-tests-add-helper-script-to-run-the-installed_tests.patch;striplevel=3 \
+                  file://0004-tests-add-helper-script-to-run-the-installed_tests.patch;striplevel=3 \
 "
 SRC_URI:prepend = "${GST1.0_SRC};branch=${SRCBRANCH} "
 GST1.0_SRC ?= "gitsm://github.com/nxp-imx/gstreamer.git;protocol=https"
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb
index 48d84cead..486049d7b 100644
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb
+++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb
@@ -3,11 +3,12 @@
 # Copyright (C) 2012-2015 O.S. Systems Software LTDA.
 # Released under the MIT license (see COPYING.MIT for the terms)
 DESCRIPTION = "Gstreamer freescale plugins"
+HOMEPAGE = "https://github.com/nxp-imx/imx-gst1.0-plugin"
 SECTION = "multimedia"
 LICENSE = "GPL-2.0-only & LGPL-2.0-only & LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbc093901857fcd118f065f900982c24"
-DEPENDS = " \
+DEPENDS = "\
    gstreamer1.0 \
    gstreamer1.0-plugins-base \
    gstreamer1.0-plugins-bad \
@@ -23,16 +24,16 @@ DEPENDS:append:mx93-nxp-bsp = " imx-lib"
 DEPENDS:append:mx943-nxp-bsp = " imx-lib"
 DEPENDS:append:imxvpu = " imx-vpuwrap"
 DEPENDS:append:imxfbdev:imxgpu = " libdrm"
-DEPENDS_IMXGPU        = ""
+DEPENDS_IMXGPU = ""
 DEPENDS_IMXGPU:imxgpu = "${DEPENDS_IMX_OPENCL_CONVERTER}"
-DEPENDS_IMX_OPENCL_CONVERTER               = "imx-opencl-converter"
+DEPENDS_IMX_OPENCL_CONVERTER = "imx-opencl-converter"
-DEPENDS_IMX_OPENCL_CONVERTER:mx6-nxp-bsp   = ""
+DEPENDS_IMX_OPENCL_CONVERTER:mx6-nxp-bsp = ""
-DEPENDS_IMX_OPENCL_CONVERTER:mx7-nxp-bsp   = ""
+DEPENDS_IMX_OPENCL_CONVERTER:mx7-nxp-bsp = ""
 DEPENDS_IMX_OPENCL_CONVERTER:mx8mm-nxp-bsp = ""
 # For backwards compatibility
-RREPLACES:${PN}  = "gst1.0-fsl-plugin"
+RREPLACES:${PN} = "gst1.0-fsl-plugin"
-RPROVIDES:${PN}  = "gst1.0-fsl-plugin"
+RPROVIDES:${PN} = "gst1.0-fsl-plugin"
 RCONFLICTS:${PN} = "gst1.0-fsl-plugin"
 PV = "4.10.3+git${SRCPV}"
@@ -42,7 +43,6 @@ IMXGST_SRC ?= "git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https"
 SRCBRANCH = "MM_04.10.03_2512_L6.18.2"
 SRCREV = "0565fc515612908a353e8378e24f97de17cc56a6"
 inherit meson pkgconfig use-imx-headers
 PLATFORM:mx6-nxp-bsp = "MX6"
@@ -65,10 +65,10 @@ PACKAGES =+ "${PN}-tools ${PN}-libgstfsl"
 # Add codec list that the beep plugin run-time depended
 BEEP_RDEPENDS = "imx-codec-aac imx-codec-mp3 imx-codec-oggvorbis"
 RDEPENDS:${PN} += "imx-parser ${BEEP_RDEPENDS} gstreamer1.0-plugins-good-id3demux "
-RDEPENDS:${PN}:append:mx8qm-nxp-bsp  = " imx-dsp"
+RDEPENDS:${PN}:append:mx8qm-nxp-bsp = " imx-dsp"
 RDEPENDS:${PN}:append:mx8qxp-nxp-bsp = " imx-dsp"
-RDEPENDS:${PN}:append:mx8dx-nxp-bsp  = " imx-dsp"
+RDEPENDS:${PN}:append:mx8dx-nxp-bsp = " imx-dsp"
-RDEPENDS:${PN}:append:mx8mp-nxp-bsp  = " imx-dsp"
+RDEPENDS:${PN}:append:mx8mp-nxp-bsp = " imx-dsp"
 RDEPENDS:${PN}:append:mx8ulp-nxp-bsp = " imx-dsp"
 PACKAGECONFIG ?= ""
diff --git a/recipes-multimedia/imx-codec/imx-codec_4.10.0.bb b/recipes-multimedia/imx-codec/imx-codec_4.10.0.bb
index 6a5c2c32c..1c6e8081c 100644
--- a/recipes-multimedia/imx-codec/imx-codec_4.10.0.bb
+++ b/recipes-multimedia/imx-codec/imx-codec_4.10.0.bb
@@ -3,9 +3,11 @@
 # Copyright 2018 (C) O.S. Systems Software LTDA.
 # Released under the MIT license (see COPYING.MIT for the terms)
+SUMMARY = "i.MX multimedia codec libraries"
 DESCRIPTION = "Freescale Multimedia codec libs"
-LICENSE = "Proprietary"
+HOMEPAGE = "https://www.nxp.com/"
 SECTION = "multimedia"
+LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
 # Backward compatibility
@@ -21,8 +23,8 @@ S = "${UNPACKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}"
 PACKAGECONFIG ??= "${PACKAGECONFIG_VPU}"
 # Support Chips&Media VPU only
-PACKAGECONFIG_VPU               = ""
+PACKAGECONFIG_VPU = ""
-PACKAGECONFIG_VPU:mx6q-nxp-bsp  = "vpu"
+PACKAGECONFIG_VPU:mx6q-nxp-bsp = "vpu"
 PACKAGECONFIG_VPU:mx6dl-nxp-bsp = "vpu"
 PACKAGECONFIG[vpu] = "--enable-vpu,--disable-vpu,virtual/imxvpu"
diff --git a/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.8.bb b/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.8.bb
index d9986456a..90c8e1a36 100644
--- a/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.8.bb
+++ b/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.8.bb
@@ -1,6 +1,9 @@
 # Copyright 2018-2023 NXP
+SUMMARY = "i.MX DSP codec wrapper and library extension"
 DESCRIPTION = "i.MX DSP Codec Wrapper and Lib owned by NXP"
+HOMEPAGE = "https://www.nxp.com/"
+SECTION = "multimedia"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
diff --git a/recipes-multimedia/imx-dsp/imx-dsp_2.1.10.bb b/recipes-multimedia/imx-dsp/imx-dsp_2.1.10.bb
index 96656f85b..f7fac1ad9 100644
--- a/recipes-multimedia/imx-dsp/imx-dsp_2.1.10.bb
+++ b/recipes-multimedia/imx-dsp/imx-dsp_2.1.10.bb
@@ -1,6 +1,9 @@
 # Copyright 2017-2022,2024 NXP
+SUMMARY = "i.MX DSP wrapper, firmware and codec libraries"
 DESCRIPTION = "i.MX DSP Wrapper, Firmware Binary, Codec Libraries"
+HOMEPAGE = "https://www.nxp.com/"
+SECTION = "multimedia"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
@@ -13,20 +16,20 @@ S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
 SRC_URI[sha256sum] = "fc6e6a7c2417730b39eeddc26606c3d58a8f5d0a1521f44bbbd505657046858b"
-EXTRA_OECONF = " \
+EXTRA_OECONF = "\
    -datadir=${base_libdir}/firmware \
    --bindir=/unit_tests \
    ${@bb.utils.contains('TUNE_FEATURES', 'aarch64', '--enable-armv8', '', d)} \
 "
-HIFI4_PLATFORM               ?= "HIFI4_PLATFORM_IS_UNDEFINED"
+HIFI4_PLATFORM ?= "HIFI4_PLATFORM_IS_UNDEFINED"
-HIFI4_PLATFORM:mx8qm-nxp-bsp  = "imx8qmqxp"
+HIFI4_PLATFORM:mx8qm-nxp-bsp = "imx8qmqxp"
 HIFI4_PLATFORM:mx8qxp-nxp-bsp = "imx8qmqxp"
-HIFI4_PLATFORM:mx8dx-nxp-bsp  = "imx8qmqxp"
+HIFI4_PLATFORM:mx8dx-nxp-bsp = "imx8qmqxp"
-HIFI4_PLATFORM:mx8mp-nxp-bsp  = "imx8mp"
+HIFI4_PLATFORM:mx8mp-nxp-bsp = "imx8mp"
 HIFI4_PLATFORM:mx8ulp-nxp-bsp = "imx8ulp"
-UNSUPPORTED_TESTS                = "dsp_tflm"
+UNSUPPORTED_TESTS = "dsp_tflm"
 UNSUPPORTED_TESTS:mx8ulp-nxp-bsp = ""
 do_install:append () {
diff --git a/recipes-multimedia/imx-dspc-asrc/imx-dspc-asrc_1.0.2.bb b/recipes-multimedia/imx-dspc-asrc/imx-dspc-asrc_1.0.2.bb
index 9cf4fa968..10d7d957d 100644
--- a/recipes-multimedia/imx-dspc-asrc/imx-dspc-asrc_1.0.2.bb
+++ b/recipes-multimedia/imx-dspc-asrc/imx-dspc-asrc_1.0.2.bb
@@ -1,7 +1,9 @@
 # Copyright 2019, 2025 NXP
+SUMMARY = "i.MX asynchronous sample rate converter"
 DESCRIPTION = "NXP Asynchronous Sample Rate Converter"
-LICENSE = "Proprietary"
+HOMEPAGE = "https://www.nxp.com/"
 SECTION = "multimedia"
+LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
 SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
@@ -18,7 +20,7 @@ EXTRA_OECONF = "--enable-armv8 --libdir=${libdir} --bindir=/unit_tests"
 INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_SYSROOT_STRIP = "1"
-INHIBIT_PACKAGE_DEBUG_SPLIT  = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 FILES:${PN} += "/unit_tests ${datadir}/imx-mm"
diff --git a/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.11.0.bb b/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.11.0.bb
index eca003737..5745f2300 100644
--- a/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.11.0.bb
+++ b/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.11.0.bb
@@ -1,7 +1,9 @@
 # Copyright 2023-2025 NXP
+SUMMARY = "i.MX multimedia OpenCL converter library"
 DESCRIPTION = "NXP Multimedia opencl converter lib"
-LICENSE = "Proprietary"
+HOMEPAGE = "https://www.nxp.com/"
 SECTION = "multimedia"
+LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
 DEPENDS = "virtual/libopencl1"
@@ -15,6 +17,6 @@ inherit fsl-eula-unpack autotools pkgconfig meson
 FILES:${PN} += "${datadir}/"
-COMPATIBLE_MACHINE               = "(^$)"
+COMPATIBLE_MACHINE = "(^$)"
-COMPATIBLE_MACHINE:imxgpu        = "(mx8-nxp-bsp|mx95-nxp-bsp)"
+COMPATIBLE_MACHINE:imxgpu = "(mx8-nxp-bsp|mx95-nxp-bsp)"
 COMPATIBLE_MACHINE:mx8mm-nxp-bsp = "(^$)"
diff --git a/recipes-multimedia/imx-parser/imx-parser_4.10.3.bb b/recipes-multimedia/imx-parser/imx-parser_4.10.3.bb
index d8f002e64..b6b631ecb 100644
--- a/recipes-multimedia/imx-parser/imx-parser_4.10.3.bb
+++ b/recipes-multimedia/imx-parser/imx-parser_4.10.3.bb
@@ -2,23 +2,25 @@
 # Copyright (C) 2012-2016 Freescale Semiconductor
 # Copyright (C) 2017-2023 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
+SUMMARY = "i.MX multimedia parser libraries"
 DESCRIPTION = "Freescale Multimedia parser libs"
-LICENSE = "Proprietary"
+HOMEPAGE = "https://www.nxp.com/"
 SECTION = "multimedia"
+LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
-# For backwards compatibility
-PROVIDES += "libfslparser"
-RREPLACES:${PN} = "libfslparser"
-RPROVIDES:${PN} = "libfslparser"
-RCONFLICTS:${PN} = "libfslparser"
 SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
 IMX_SRCREV_ABBREV = "65603f3"
 S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
 SRC_URI[sha256sum] = "03079bb0fa989dc50fadb66a0fcc7cf65423833c3def04085603d4b66e8f8c70"
+# For backwards compatibility
+PROVIDES += "libfslparser"
+RREPLACES:${PN} = "libfslparser"
+RPROVIDES:${PN} = "libfslparser"
+RCONFLICTS:${PN} = "libfslparser"
 inherit fsl-eula-unpack autotools pkgconfig
 # Choose between 32-bit and 64-bit binaries and between Soft Float-Point and Hard Float-Point
diff --git a/recipes-multimedia/imx-sw-pdm/imx-sw-pdm_1.0.3.bb b/recipes-multimedia/imx-sw-pdm/imx-sw-pdm_1.0.3.bb
index 68919ac83..647bc7a9c 100644
--- a/recipes-multimedia/imx-sw-pdm/imx-sw-pdm_1.0.3.bb
+++ b/recipes-multimedia/imx-sw-pdm/imx-sw-pdm_1.0.3.bb
@@ -1,8 +1,10 @@
 # Copyright 2020,2023 NXP
+SUMMARY = "i.MX PDM-to-PCM software decimation library"
 DESCRIPTION = "NXP PDM to PCM Software Decimation SIMD Library"
-LICENSE = "Proprietary"
+HOMEPAGE = "https://www.nxp.com/"
 SECTION = "multimedia"
+LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://COPYING;md5=63a38e9f392d8813d6f1f4d0d6fbe657"
 SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
diff --git a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb
index dae99cb13..76109355d 100644
--- a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb
+++ b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb
@@ -2,9 +2,11 @@
 # Copyright (C) 2017-2023,2025 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
+SUMMARY = "i.MX VPU wrapper library"
 DESCRIPTION = "Freescale Multimedia VPU wrapper"
-LICENSE = "Proprietary"
+HOMEPAGE = "https://github.com/NXP/imx-vpuwrap"
 SECTION = "multimedia"
+LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
 DEPENDS = "virtual/imxvpu"
@@ -17,7 +19,7 @@ SRCREV = "1d2136e39789edb1eff730043caf2305ee2c173e"
 inherit autotools pkgconfig
-CFLAGS += " -Wno-error=implicit-function-declaration"
+CFLAGS += "-Wno-error=implicit-function-declaration"
 do_install:append() {
    # FIXME: Drop examples for now
diff --git a/recipes-multimedia/libcamera/libcamera_0.6.0.imx.bb b/recipes-multimedia/libcamera/libcamera_0.6.0.imx.bb
index 6b811b5f1..a1cf4098b 100644
--- a/recipes-multimedia/libcamera/libcamera_0.6.0.imx.bb
+++ b/recipes-multimedia/libcamera/libcamera_0.6.0.imx.bb
@@ -6,6 +6,7 @@
 # Upstream hash: f4b9dfa0c903bc94c344c657917a3fbb229c322f
 SUMMARY = "Linux libcamera framework"
+HOMEPAGE = "https://github.com/nxp-imx/libcamera"
 SECTION = "libs"
 LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later"
@@ -15,8 +16,8 @@ LIC_FILES_CHKSUM = "\
    file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
 "
-SRC_URI = " \
+SRC_URI = "\
-        git://git.libcamera.org/libcamera/libcamera.git;protocol=https;branch=master;tag=v${PV} \
+    git://git.libcamera.org/libcamera/libcamera.git;protocol=https;branch=master \
 "
 SRCREV = "3e6f5d83e397e11cccd3844e121463748f56de39"
@@ -44,7 +45,7 @@ LIBCAMERA_PIPELINES ??= "auto"
 LIBCAMERA_PIPELINES:arm ??= "${ARM_PIPELINES}"
 LIBCAMERA_PIPELINES:aarch64 ??= "${ARM_PIPELINES}"
-EXTRA_OEMESON = " \
+EXTRA_OEMESON = "\
    -Dpipelines=${LIBCAMERA_PIPELINES} \
    -Dv4l2=true \
    -Dcam=enabled \
@@ -82,7 +83,7 @@ do_package_recalculate_ipa_signatures() {
    ${S}/src/ipa/ipa-sign-install.sh ${B}/src/ipa-priv-key.pem "${modules}"
 }
-FILES:${PN} += " ${libexecdir}/libcamera/v4l2-compat.so"
+FILES:${PN} += "${libexecdir}/libcamera/v4l2-compat.so"
 FILES:${PN}-gst = "${libdir}/gstreamer-1.0"
 FILES:${PN}-pycamera = "${PYTHON_SITEPACKAGES_DIR}/libcamera"
@@ -93,7 +94,7 @@ GLIBC_64BIT_TIME_FLAGS = ""
 ########### i.MX overrides ################
-SRC_URI:remove = "git://git.libcamera.org/libcamera/libcamera.git;protocol=https;branch=master;tag=v${PV}"
+SRC_URI:remove = "git://git.libcamera.org/libcamera/libcamera.git;protocol=https;branch=master"
 SRC_URI:prepend = "${LIBCAMERA_SRC};branch=${SRCBRANCH} "
 LIBCAMERA_SRC ?= "git://github.com/nxp-imx/libcamera.git;protocol=https"
 SRCBRANCH = "lf-6.18.2_1.0.0"
@@ -103,7 +104,7 @@ PACKAGECONFIG = "gst pycamera dng"
 ARM_PIPELINES .= ",nxp/neo"
-EXTRA_OEMESON += " \
+EXTRA_OEMESON += "\
    --python.platlibdir=${PYTHON_SITEPACKAGES_DIR} \
 "
diff --git a/recipes-multimedia/libcamera/neo-ipa-uguzzi_0.2.6.bb b/recipes-multimedia/libcamera/neo-ipa-uguzzi_0.2.6.bb
index 88b9a1d0e..72e4d0b5a 100644
--- a/recipes-multimedia/libcamera/neo-ipa-uguzzi_0.2.6.bb
+++ b/recipes-multimedia/libcamera/neo-ipa-uguzzi_0.2.6.bb
@@ -1,12 +1,13 @@
 SUMMARY = "uGuzzi IPA for the libcamera NXP NEO pipeline"
 DESCRIPTION = "\
-An Image Processing Algorithm library for libcamera, for i.MX95 ISP, \
+    An Image Processing Algorithm library for libcamera, for i.MX95 ISP, \
-based on proprietary MM Solutions EAD uGuzzi 3A library"
+    based on proprietary MM Solutions EAD uGuzzi 3A library"
+HOMEPAGE = "https://github.com/nxp-imx/neo-ipa-uguzzi"
 SECTION = "libs"
 LICENSE = "Apache-2.0 & BSD-2-Clause & GPL-2.0-or-later & LGPL-2.1-or-later & MIT & Proprietary"
 # Put EULA on separate line for automated recipe updates
 LIC_FILES_CHKSUM = "file://LICENSES/LA_OPT_NXP_Software_License.txt;md5=bc649096ad3928ec06a8713b8d787eac"
-LIC_FILES_CHKSUM += " \
+LIC_FILES_CHKSUM += "\
    file://COPYING;md5=6462e06298403caf09a22e67a7cc551a \
    file://LICENSES/Apache-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
    file://LICENSES/BSD-2-Clause.txt;md5=63d6ee386b8aaba70b1bf15a79ca50f2 \
@@ -20,7 +21,6 @@ NEO_IPA_UGUZZI_SRC ?= "git://github.com/nxp-imx/neo-ipa-uguzzi;protocol=https"
 SRCBRANCH = "lf-6.18.2_1.0.0"
 SRCREV = "3c3b18e397a81fac2babe14dca01f4ada1ecc8b2"
 inherit meson pkgconfig
 FILES:${PN} += "${libdir}/libcamera ${datadir}/libcamera"
diff --git a/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.3.1.bb b/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.3.1.bb
index cce4e56ad..119131ec0 100644
--- a/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.3.1.bb
+++ b/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.3.1.bb
@@ -1,9 +1,10 @@
+SUMMARY = "i.MX VPU API library (v2)"
 DESCRIPTION = "frontend for the i.MX6 / i.MX8 VPU hardware video engines"
 HOMEPAGE = "https://github.com/Freescale/libimxvpuapi"
+SECTION = "multimedia"
 LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=38fa42a5a6425b26d2919b17b1527324"
-SECTION = "multimedia"
+DEPENDS = "libimxdmabuffer virtual/imxvpu"
-DEPENDS = "virtual/imxvpu libimxdmabuffer"
 # Add imx-vpu-hantro-vc as dependency for being
 # able to encode video using the VC8000E encoder
 DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc"
@@ -11,8 +12,8 @@ DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc"
 PV .= "+git${SRCPV}"
 SRCBRANCH ?= "master"
-SRCREV = "37095a854aa176bb763a25ce98ceb6a787501271"
 SRC_URI = "git://github.com/Freescale/libimxvpuapi.git;branch=${SRCBRANCH};protocol=https"
+SRCREV = "37095a854aa176bb763a25ce98ceb6a787501271"
 inherit waf pkgconfig use-imx-headers python3native
diff --git a/recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb b/recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb
index 55063db18..e00a968a2 100644
--- a/recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb
+++ b/recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb
@@ -1,16 +1,17 @@
 # Copyright 2018 (C) O.S. Systems Software LTDA.
+SUMMARY = "i.MX VPU API library (v1)"
 DESCRIPTION = "frontend for the i.MX6 VPU hardware video engine"
 HOMEPAGE = "https://github.com/Freescale/libimxvpuapi"
+SECTION = "multimedia"
 LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=38fa42a5a6425b26d2919b17b1527324"
-SECTION = "multimedia"
 DEPENDS = "imx-vpu"
 PV = "0.10.3+${SRCPV}"
 SRCBRANCH ?= "v1"
-SRCREV = "3a1ee3a54fe93813868d38c3d32ea065b59e227e"
 SRC_URI = "git://github.com/Freescale/libimxvpuapi.git;branch=${SRCBRANCH};protocol=https"
+SRCREV = "3a1ee3a54fe93813868d38c3d32ea065b59e227e"
 inherit waf pkgconfig python3native
diff --git a/recipes-multimedia/nxp-afe/nxp-afe-voiceseeker_git.bb b/recipes-multimedia/nxp-afe/nxp-afe-voiceseeker_git.bb
index f29011601..f21fdb472 100644
--- a/recipes-multimedia/nxp-afe/nxp-afe-voiceseeker_git.bb
+++ b/recipes-multimedia/nxp-afe/nxp-afe-voiceseeker_git.bb
@@ -1,6 +1,8 @@
 # Copyright 2025 NXP
-DESCRIPTION = "NXP RetuneDSP Voice Seeker Libraries"
+SUMMARY = "NXP RetuneDSP Voice Seeker libraries"
+DESCRIPTION = "NXP RetuneDSP Voice Seeker far-field voice pickup libraries."
+HOMEPAGE = "https://github.com/nxp-imx/imx-voiceui"
 SECTION = "multimedia"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ca53281cc0caa7e320d4945a896fb837"
diff --git a/recipes-multimedia/nxp-afe/nxp-afe_git.bb b/recipes-multimedia/nxp-afe/nxp-afe_git.bb
index 5ac5d374a..4b45d3b45 100644
--- a/recipes-multimedia/nxp-afe/nxp-afe_git.bb
+++ b/recipes-multimedia/nxp-afe/nxp-afe_git.bb
@@ -1,6 +1,9 @@
 # Copyright 2025 NXP
+SUMMARY = "NXP Audio Front End (AFE)"
 DESCRIPTION = "NXP Audio Front End (AFE) for incorporating Voice Assistants"
+HOMEPAGE = "https://github.com/nxp-imx/nxp-afe"
+SECTION = "multimedia"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=7bdef19938f3503cfc4c586461f99012"
@@ -8,11 +11,11 @@ PV = "1.0+git"
 SRCBRANCH = "MM_04.10.03_2512_L6.18.2"
 NXPAFE_SRC ?= "git://github.com/nxp-imx/nxp-afe.git;protocol=https"
-SRC_URI = " ${NXPAFE_SRC};branch=${SRCBRANCH}"
+DEPENDS += "alsa-lib"
-SRCREV = "7d518eb0b18f7c7faadeb3c3397f8b73f0012f3e"
+SRC_URI = "${NXPAFE_SRC};branch=${SRCBRANCH}"
-DEPENDS += "alsa-lib"
+SRCREV = "7d518eb0b18f7c7faadeb3c3397f8b73f0012f3e"
 TARGET_CC_ARCH += "${LDFLAGS}"
diff --git a/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend b/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
index 7f5a7ffbe..cf318b4f7 100644
--- a/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
+++ b/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
@@ -1,17 +1,17 @@
 FILESEXTRAPATHS:prepend:imx-nxp-bsp := "${THISDIR}/${PN}/imx-nxp-bsp:"
 SRC_URI:append:imx-nxp-bsp = " ${SRC_URI_IMX}"
-SRC_URI_IMX             = ""
+SRC_URI_IMX = ""
-SRC_URI_IMX:mx6-nxp-bsp = " \
+SRC_URI_IMX:mx6-nxp-bsp = "\
    file://0001-Fix-pulseaudio-mutex-issue-when-do-pause-in-gstreame.patch \
    file://daemon.conf \
    file://default.pa"
-SRC_URI_IMX:mx7-nxp-bsp = " \
+SRC_URI_IMX:mx7-nxp-bsp = "\
    ${SRC_URI_IMX:mx6-nxp-bsp} \
    file://0100-pulseaudio-remove-the-control-for-speaker-headphone-widge.patch"
-SRC_URI_IMX:mx8-nxp-bsp = " \
+SRC_URI_IMX:mx8-nxp-bsp = "\
    ${SRC_URI_IMX:mx6-nxp-bsp}"
-SRC_URI_IMX:mx9-nxp-bsp = " \
+SRC_URI_IMX:mx9-nxp-bsp = "\
    ${SRC_URI_IMX:mx6-nxp-bsp}"
 CACHED_CONFIGUREVARS:append:mx6-nxp-bsp = " ax_cv_PTHREAD_PRIO_INHERIT=no"
diff --git a/recipes-multimedia/tinycompress/tinycompress_1.2.5.bb b/recipes-multimedia/tinycompress/tinycompress_1.2.5.bb
index 48edf0769..bffe15c87 100644
--- a/recipes-multimedia/tinycompress/tinycompress_1.2.5.bb
+++ b/recipes-multimedia/tinycompress/tinycompress_1.2.5.bb
@@ -1,4 +1,5 @@
 DESCRIPTION = "A library to handle compressed formats like MP3 etc."
+HOMEPAGE = "https://github.com/alsa-project/tinycompress"
 LICENSE = "LGPL-2.1-only | BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=cf9105c1a2d4405cbe04bbe3367373a0"
 DEPENDS = "alsa-lib"
diff --git a/recipes-security/optee-imx/optee-client-fslc.inc b/recipes-security/optee-imx/optee-client-fslc.inc
index ab7c8bc69..61629209d 100644
--- a/recipes-security/optee-imx/optee-client-fslc.inc
+++ b/recipes-security/optee-imx/optee-client-fslc.inc
@@ -10,14 +10,14 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=69663ab153298557a59c67a60a743e5b"
 inherit systemd update-rc.d cmake useradd
-SRC_URI = " \
+SRC_URI = "\
    git://github.com/OP-TEE/optee_client.git;branch=master;protocol=https \
    file://tee-supplicant.sh \
 "
 UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)$"
-EXTRA_OECMAKE = " \
+EXTRA_OECMAKE = "\
    -DBUILD_SHARED_LIBS=ON \
    -DCFG_USE_PKGCONFIG=ON \
 "
@@ -25,9 +25,9 @@ EXTRA_OECMAKE = " \
 # libts uses /dev/tee devices too. Add a common variable to allow configuring the same group.
 TEE_GROUP_NAME ?= "tee"
-EXTRA_OECMAKE += " -DCFG_ENABLE_SYSTEMD=On -DSYSTEMD_UNIT_DIR=${systemd_system_unitdir}/"
+EXTRA_OECMAKE += "-DCFG_ENABLE_SYSTEMD=On -DSYSTEMD_UNIT_DIR=${systemd_system_unitdir}/"
-EXTRA_OECMAKE += " -DCFG_ENABLE_UDEV=On -DUDEV_UDEV_DIR=${nonarch_base_libdir}/udev/rules.d/"
+EXTRA_OECMAKE += "-DCFG_ENABLE_UDEV=On -DUDEV_UDEV_DIR=${nonarch_base_libdir}/udev/rules.d/"
-EXTRA_OECMAKE += " -DCFG_TEE_GROUP=${TEE_GROUP_NAME} -DCFG_TEEPRIV_GROUP=teepriv"
+EXTRA_OECMAKE += "-DCFG_TEE_GROUP=${TEE_GROUP_NAME} -DCFG_TEEPRIV_GROUP=teepriv"
 EXTRA_OECMAKE:append:toolchain-clang = " -DCFG_WERROR=0"
diff --git a/recipes-security/optee-imx/optee-fslc.inc b/recipes-security/optee-imx/optee-fslc.inc
index dadbfa802..906001d24 100644
--- a/recipes-security/optee-imx/optee-fslc.inc
+++ b/recipes-security/optee-imx/optee-fslc.inc
@@ -28,7 +28,7 @@ EXTRA_OEMAKE += "V=1 \
                 COMPILER=${TOOLCHAIN} \
                 OPTEE_CLIENT_EXPORT=${STAGING_DIR_HOST}${prefix} \
                 TEEC_EXPORT=${STAGING_DIR_HOST}${prefix} \
-                "
+                 "
 # python3-cryptography needs the legacy provider, so set OPENSSL_MODULES to the
 # right path until this is relocated automatically.
 export OPENSSL_MODULES = "${STAGING_LIBDIR_NATIVE}/ossl-modules"
diff --git a/recipes-security/optee-imx/optee-os-common-fslc-imx.inc b/recipes-security/optee-imx/optee-os-common-fslc-imx.inc
index 16ed8cea7..ed11d0ca6 100644
--- a/recipes-security/optee-imx/optee-os-common-fslc-imx.inc
+++ b/recipes-security/optee-imx/optee-os-common-fslc-imx.inc
@@ -2,7 +2,7 @@
 # See: https://github.com/nxp-imx/imx-manifest/blob/imx-linux-whinlatter/imx-6.18.2-1.0.0.xml#L39
 require optee-os-fslc.inc
-DEPENDS:append:arm = "u-boot-mkimage-native"
+DEPENDS:append:arm = " u-boot-mkimage-native"
 FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os:"
@@ -18,26 +18,26 @@ inherit features_check
 REQUIRED_MACHINE_FEATURES = "optee"
-OPTEEMACHINE                   = "imx-${@d.getVar('MACHINE')[1:]}"
+OPTEEMACHINE = "imx-${@d.getVar('MACHINE')[1:]}"
-OPTEEMACHINE:imx6qpdlsolox     = "imx-mx6qsabresd"
+OPTEEMACHINE:imx6qpdlsolox = "imx-mx6qsabresd"
-OPTEEMACHINE:mx6ul-nxp-bsp     = "imx-mx6ulevk"
+OPTEEMACHINE:mx6ul-nxp-bsp = "imx-mx6ulevk"
-OPTEEMACHINE:mx6ull-nxp-bsp    = "imx-mx6ullevk"
+OPTEEMACHINE:mx6ull-nxp-bsp = "imx-mx6ullevk"
-OPTEEMACHINE:mx6ulz-nxp-bsp    = "imx-mx6ulzevk"
+OPTEEMACHINE:mx6ulz-nxp-bsp = "imx-mx6ulzevk"
-OPTEEMACHINE:mx8mq-nxp-bsp     = "imx-mx8mqevk"
+OPTEEMACHINE:mx8mq-nxp-bsp = "imx-mx8mqevk"
-OPTEEMACHINE:mx8mm-nxp-bsp     = "imx-mx8mmevk"
+OPTEEMACHINE:mx8mm-nxp-bsp = "imx-mx8mmevk"
-OPTEEMACHINE:mx8mn-nxp-bsp     = "imx-mx8mnevk"
+OPTEEMACHINE:mx8mn-nxp-bsp = "imx-mx8mnevk"
-OPTEEMACHINE:mx8mp-nxp-bsp     = "imx-mx8mpevk"
+OPTEEMACHINE:mx8mp-nxp-bsp = "imx-mx8mpevk"
-OPTEEMACHINE:mx8mpul-nxp-bsp   = "imx-mx8mpevk"
+OPTEEMACHINE:mx8mpul-nxp-bsp = "imx-mx8mpevk"
-OPTEEMACHINE:mx8qm-nxp-bsp     = "imx-mx8qmmek"
+OPTEEMACHINE:mx8qm-nxp-bsp = "imx-mx8qmmek"
-OPTEEMACHINE:mx8qxp-nxp-bsp    = "imx-mx8qxpmek"
+OPTEEMACHINE:mx8qxp-nxp-bsp = "imx-mx8qxpmek"
-OPTEEMACHINE:mx8dx-nxp-bsp     = "imx-mx8dxmek"
+OPTEEMACHINE:mx8dx-nxp-bsp = "imx-mx8dxmek"
-OPTEEMACHINE:mx8dxl-nxp-bsp    = "imx-mx8dxlevk"
+OPTEEMACHINE:mx8dxl-nxp-bsp = "imx-mx8dxlevk"
-OPTEEMACHINE:mx8mnul-nxp-bsp   = "imx-mx8mnevk"
+OPTEEMACHINE:mx8mnul-nxp-bsp = "imx-mx8mnevk"
-OPTEEMACHINE:mx8ulp-nxp-bsp    = "imx-mx8ulpevk"
+OPTEEMACHINE:mx8ulp-nxp-bsp = "imx-mx8ulpevk"
-OPTEEMACHINE:mx91-nxp-bsp      = "imx-mx91evk"
+OPTEEMACHINE:mx91-nxp-bsp = "imx-mx91evk"
-OPTEEMACHINE:mx93-nxp-bsp      = "imx-mx93evk"
+OPTEEMACHINE:mx93-nxp-bsp = "imx-mx93evk"
-OPTEEMACHINE:mx943-nxp-bsp     = "imx-mx943evk"
+OPTEEMACHINE:mx943-nxp-bsp = "imx-mx943evk"
-OPTEEMACHINE:mx95-nxp-bsp      = "imx-mx95evk"
+OPTEEMACHINE:mx95-nxp-bsp = "imx-mx95evk"
 # Strip the leading imx-
 PLATFORM_FLAVOR = "${@d.getVar('OPTEEMACHINE')[4:]}"
diff --git a/recipes-security/optee-imx/optee-os-fslc.inc b/recipes-security/optee-imx/optee-os-fslc.inc
index febdd2c73..b36810c60 100644
--- a/recipes-security/optee-imx/optee-os-fslc.inc
+++ b/recipes-security/optee-imx/optee-os-fslc.inc
@@ -13,7 +13,7 @@ require optee-fslc.inc
 CVE_PRODUCT = "linaro:op-tee op-tee:op-tee_os"
-DEPENDS = "python3-pyelftools-native python3-cryptography-native"
+DEPENDS = "python3-cryptography-native python3-pyelftools-native"
 DEPENDS:append:toolchain-clang = " lld-native compiler-rt"
@@ -21,7 +21,7 @@ SRC_URI = "git://github.com/OP-TEE/optee_os.git;branch=master;protocol=https"
 B = "${WORKDIR}/build"
-EXTRA_OEMAKE += " \
+EXTRA_OEMAKE += "\
    PLATFORM=${OPTEEMACHINE} \
    CFG_${OPTEE_CORE}_core=y \
    CROSS_COMPILE_core=${HOST_PREFIX} \
@@ -30,8 +30,8 @@ EXTRA_OEMAKE += " \
    ta-targets=ta_${OPTEE_ARCH} \
    O=${B} \
 "
-EXTRA_OEMAKE += " HOST_PREFIX=${HOST_PREFIX}"
+EXTRA_OEMAKE += "HOST_PREFIX=${HOST_PREFIX}"
-EXTRA_OEMAKE += " CROSS_COMPILE64=${HOST_PREFIX}"
+EXTRA_OEMAKE += "CROSS_COMPILE64=${HOST_PREFIX}"
 # Enable BTI in optee
 EXTRA_OEMAKE += "${@bb.utils.contains('MACHINE_FEATURES', 'arm-branch-protection', ' CFG_TA_BTI=1 CFG_CORE_PAUTH=y CFG_TA_PAUTH=y', '', d)}"
@@ -74,7 +74,6 @@ PACKAGES += "${PN}-ta"
 FILES:${PN} = "${nonarch_base_libdir}/firmware/"
 FILES:${PN}-ta = "${nonarch_base_libdir}/optee_armtz/*"
 # note: "textrel" is not triggered on all archs
 INSANE_SKIP:${PN} = "textrel"
 INSANE_SKIP:${PN}-dev = "staticdev"
diff --git a/recipes-security/optee-imx/optee-os-tadevkit-fslc-imx.inc b/recipes-security/optee-imx/optee-os-tadevkit-fslc-imx.inc
index 68918414c..0fac7771f 100644
--- a/recipes-security/optee-imx/optee-os-tadevkit-fslc-imx.inc
+++ b/recipes-security/optee-imx/optee-os-tadevkit-fslc-imx.inc
@@ -18,7 +18,7 @@ do_install() {
 }
 do_deploy() {
-        echo "Do not inherit do_deploy from optee-os."
+    echo "Do not inherit do_deploy from optee-os."
 }
 FILES:${PN} = "${includedir}/optee/"
diff --git a/recipes-security/optee-imx/optee-test-fslc-imx.inc b/recipes-security/optee-imx/optee-test-fslc-imx.inc
index b7d3a34e6..23e22bc9f 100644
--- a/recipes-security/optee-imx/optee-test-fslc-imx.inc
+++ b/recipes-security/optee-imx/optee-test-fslc-imx.inc
@@ -17,6 +17,6 @@ OPTEE_TEST_SRC ?= "git://github.com/nxp-imx/imx-optee-test.git;protocol=https"
 EXTRA_OEMAKE:append:libc-musl = " OPTEE_OPENSSL_EXPORT=${STAGING_INCDIR}"
 CFLAGS:append:libc-musl = " -Wno-error=deprecated-declarations"
-CFLAGS += " -Wno-error=unterminated-string-initialization"
+CFLAGS += "-Wno-error=unterminated-string-initialization"
 COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-security/optee-imx/optee-test-fslc.inc b/recipes-security/optee-imx/optee-test-fslc.inc
index a5183b7e1..66683b613 100644
--- a/recipes-security/optee-imx/optee-test-fslc.inc
+++ b/recipes-security/optee-imx/optee-test-fslc.inc
@@ -11,12 +11,12 @@ inherit python3native ptest
 inherit deploy
 require optee-fslc.inc
-DEPENDS = "optee-client optee-os-tadevkit python3-cryptography-native openssl"
+DEPENDS = "openssl optee-client optee-os-tadevkit python3-cryptography-native"
 DEPENDS:append:toolchain-clang = " lld-native"
 SRC_URI = "git://github.com/OP-TEE/optee_test.git;branch=master;protocol=https \
           file://run-ptest \
-          "
+           "
 B = "${WORKDIR}/build"
@@ -25,7 +25,7 @@ EXTRA_OEMAKE += "TA_DEV_KIT_DIR=${TA_DEV_KIT_DIR} \
                 CROSS_COMPILE_HOST=${HOST_PREFIX} \
                 CROSS_COMPILE_TA=${HOST_PREFIX} \
                 O=${B} \
-               "
+                 "
 CFLAGS += "-Wno-error=deprecated-declarations"
@@ -43,9 +43,9 @@ do_install () {
    # install path should match the value set in optee-client/tee-supplicant
    # default TEEC_LOAD_PATH is /lib
-    mkdir -p ${D}${nonarch_base_libdir}/optee_armtz/
+    install -d ${D}${nonarch_base_libdir}/optee_armtz/
    install -D -p -m0444 ${B}/ta/*/*.ta ${D}${nonarch_base_libdir}/optee_armtz/
-    mkdir -p ${D}${libdir}/tee-supplicant/plugins
+    install -d ${D}${libdir}/tee-supplicant/plugins
    install -D -p -m0444 ${B}/supp_plugin/*.plugin ${D}${libdir}/tee-supplicant/plugins/
 }
@@ -58,7 +58,7 @@ addtask deploy before do_build after do_install
 FILES:${PN} += "${nonarch_base_libdir}/optee_armtz/ \
                ${libdir}/tee-supplicant/plugins/ \
-               "
+                "
 # Imports machine specific configs from staging to build
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-security/optee-imx/optee-test_4.8.0.imx.bb b/recipes-security/optee-imx/optee-test_4.8.0.imx.bb
index 2f2b40e09..42d525855 100644
--- a/recipes-security/optee-imx/optee-test_4.8.0.imx.bb
+++ b/recipes-security/optee-imx/optee-test_4.8.0.imx.bb
@@ -8,6 +8,5 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=a8fa504109e4cd7ea575bc49ea4be560 \
                    file://LICENSE-BSD;md5=dca16d6efa93b55d0fd662ae5cd6feeb \
                    file://LICENSE-GPL;md5=10e86b5d2a6cb0e2b9dcfdd26a9ac58d"
 SRCBRANCH = "lf-6.18.2_1.0.0"
 SRCREV = "3383a744a5997fdb3457b3cbe95aea3ce27879b3"
diff --git a/recipes-security/optee-qoriq/optee-os-qoriq-tadevkit_4.8.0.bb b/recipes-security/optee-qoriq/optee-os-qoriq-tadevkit_4.8.0.bb
index 491817ef1..93a049001 100644
--- a/recipes-security/optee-qoriq/optee-os-qoriq-tadevkit_4.8.0.bb
+++ b/recipes-security/optee-qoriq/optee-os-qoriq-tadevkit_4.8.0.bb
@@ -18,7 +18,7 @@ do_install() {
 }
 do_deploy() {
-        echo "Do not inherit do_deploy from optee-os."
+    echo "Do not inherit do_deploy from optee-os."
 }
 FILES:${PN} = "${includedir}/optee/"
diff --git a/recipes-security/optee-qoriq/optee-os-qoriq_4.8.0.bb b/recipes-security/optee-qoriq/optee-os-qoriq_4.8.0.bb
index 3241ab8c4..64c666286 100644
--- a/recipes-security/optee-qoriq/optee-os-qoriq_4.8.0.bb
+++ b/recipes-security/optee-qoriq/optee-os-qoriq_4.8.0.bb
@@ -4,18 +4,18 @@ OPTEE_OS_BRANCH = "lf-6.12.49_2.2.0"
 SRCREV = "b3883a773a9d15ec6439f9229e48f540c37e0d00"
 do_install:append () {
-        install -d ${D}${nonarch_base_libdir}/firmware/
+    install -d ${D}${nonarch_base_libdir}/firmware/
-        install -m 644 ${B}/core/*.bin ${D}${nonarch_base_libdir}/firmware/
+    install -m 644 ${B}/core/*.bin ${D}${nonarch_base_libdir}/firmware/
-        install -m 644 ${B}/core/tee-raw.bin ${D}${nonarch_base_libdir}/firmware/tee_${MACHINE}.bin
+    install -m 644 ${B}/core/tee-raw.bin ${D}${nonarch_base_libdir}/firmware/tee_${MACHINE}.bin
-        # Install embedded TAs
+    # Install embedded TAs
-        install -d ${D}${base_libdir}/optee_armtz/
+    install -d ${D}${base_libdir}/optee_armtz/
-        install -m 444 ${B}/ta/*/*.ta ${D}${base_libdir}/optee_armtz/
+    install -m 444 ${B}/ta/*/*.ta ${D}${base_libdir}/optee_armtz/
 }
 do_deploy:append () {
-        install -d ${DEPLOYDIR}/optee
+    install -d ${DEPLOYDIR}/optee
-        install -m 644 ${D}${nonarch_base_libdir}/firmware/* ${DEPLOYDIR}/optee/
+    install -m 644 ${D}${nonarch_base_libdir}/firmware/* ${DEPLOYDIR}/optee/
 }
 FILES:${PN} = "${nonarch_base_libdir}/optee_armtz/ ${nonarch_base_libdir}/firmware/"
diff --git a/recipes-security/optee-qoriq/optee-os.nxp.inc b/recipes-security/optee-qoriq/optee-os.nxp.inc
index 1a837d54a..270d23c3b 100644
--- a/recipes-security/optee-qoriq/optee-os.nxp.inc
+++ b/recipes-security/optee-qoriq/optee-os.nxp.inc
@@ -17,9 +17,9 @@ REQUIRED_MACHINE_FEATURES = "optee"
 inherit features_check
 OPTEEMACHINE = "ls-${MACHINE}"
-OPTEEMACHINE:ls1088ardb-pb   = "ls-ls1088ardb"
+OPTEEMACHINE:ls1088ardb-pb = "ls-ls1088ardb"
-OPTEEMACHINE:ls1046afrwy     = "ls-ls1046ardb"
+OPTEEMACHINE:ls1046afrwy = "ls-ls1046ardb"
-OPTEEMACHINE:lx2162aqds      = "ls-lx2160aqds"
+OPTEEMACHINE:lx2162aqds = "ls-lx2160aqds"
 OPTEEMACHINE:lx2160ardb-rev2 = "ls-lx2160ardb"
 EXTRA_OEMAKE:append = " \
diff --git a/recipes-security/optee-qoriq/optee-test.nxp.inc b/recipes-security/optee-qoriq/optee-test.nxp.inc
index 75ed4d0c9..acbc2068d 100644
--- a/recipes-security/optee-qoriq/optee-test.nxp.inc
+++ b/recipes-security/optee-qoriq/optee-test.nxp.inc
@@ -2,7 +2,7 @@
 require recipes-security/optee-imx/optee-test-fslc.inc
 DEPENDS:remove = "optee-client optee-os-tadevkit"
-DEPENDS:append = "optee-client-qoriq optee-os-qoriq-tadevkit openssl"
+DEPENDS:append = " optee-client-qoriq optee-os-qoriq-tadevkit openssl"
 SRC_URI:remove = "git://github.com/OP-TEE/optee_test.git;branch=master;protocol=https"
 SRC_URI:remove = "file://run-ptest"
diff --git a/recipes-security/smw/crypto-af-alg_git.bb b/recipes-security/smw/crypto-af-alg_git.bb
index 4101776a5..3ec485b3b 100644
--- a/recipes-security/smw/crypto-af-alg_git.bb
+++ b/recipes-security/smw/crypto-af-alg_git.bb
@@ -2,6 +2,7 @@
 SUMMARY = "NXP i.MX CRYPTO AF_ALG"
 DESCRIPTION = "NXP i.MX crypto af alg tool to perform symmetric operation"
+HOMEPAGE = "https://github.com/nxp-imx/crypto_af_alg"
 SECTION = "base"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=4ef68f113b9400b1140be9b69208a816"
@@ -15,7 +16,7 @@ SRCREV = "2fb11a600af90c80b8bb23368d1d6831c5deb973"
 TARGET_CC_ARCH += "${LDFLAGS}"
 do_install () {
-        oe_runmake DESTDIR=${D} install
+    oe_runmake DESTDIR=${D} install
 }
 COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-security/smw/itest_git.bb b/recipes-security/smw/itest_git.bb
index 7885edc30..442f5fb89 100644
--- a/recipes-security/smw/itest_git.bb
+++ b/recipes-security/smw/itest_git.bb
@@ -1,6 +1,7 @@
 # Copyright 2026 NXP
 SUMMARY = "NXP i.MX Itest"
 DESCRIPTION = "NXP i.MX Itest"
+HOMEPAGE = "https://github.com/nxp-imx/itest"
 SECTION = "base"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=8636bd68fc00cc6a3809b7b58b45f982"
@@ -14,19 +15,19 @@ inherit cmake
 PACKAGECONFIG:mx8dxl-nxp-bsp ??= "ele-seco"
 PACKAGECONFIG:mx8ulp-nxp-bsp ??= "ele"
-PACKAGECONFIG:mx91-nxp-bsp   ??= "ele"
+PACKAGECONFIG:mx91-nxp-bsp ??= "ele"
-PACKAGECONFIG:mx93-nxp-bsp   ??= "ele"
+PACKAGECONFIG:mx93-nxp-bsp ??= "ele"
-PACKAGECONFIG:mx943-nxp-bsp  ??= "ele ele-seco prime"
+PACKAGECONFIG:mx943-nxp-bsp ??= "ele ele-seco prime"
-PACKAGECONFIG:mx95-nxp-bsp   ??= "ele ele-seco"
+PACKAGECONFIG:mx95-nxp-bsp ??= "ele ele-seco"
-PACKAGECONFIG:mx952-nxp-bsp  ??= "ele ele-seco prime"
+PACKAGECONFIG:mx952-nxp-bsp ??= "ele ele-seco prime"
-PACKAGECONFIG[ele]      = "-DELE=1,,imx-secure-enclave"
+PACKAGECONFIG[ele] = "-DELE=1,,imx-secure-enclave"
 PACKAGECONFIG[ele-seco] = "-DV2X=1,,imx-secure-enclave-seco"
-PACKAGECONFIG[prime]    = "-DPRIME=1,,imx-secure-enclave-prime"
+PACKAGECONFIG[prime] = "-DPRIME=1,,imx-secure-enclave-prime"
-EXTRA_OECMAKE = " \
+EXTRA_OECMAKE = "\
-    -DOPENSSL_PATH="${STAGING_DIR_HOST}/usr" \
+    -DOPENSSL_PATH="${STAGING_DIR_HOST}/usr"\
-    -DELE_LIB_PATH="${STAGING_DIR_HOST}/usr" \
+    -DELE_LIB_PATH="${STAGING_DIR_HOST}/usr"\
    -DLIB_PATH="${STAGING_DIR_HOST}${libdir}""
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
diff --git a/recipes-security/smw/keyctl-caam_git.bb b/recipes-security/smw/keyctl-caam_git.bb
index 13202326b..cfa1b80c4 100644
--- a/recipes-security/smw/keyctl-caam_git.bb
+++ b/recipes-security/smw/keyctl-caam_git.bb
@@ -2,6 +2,7 @@
 SUMMARY = "NXP i.MX CAAM Keyctl"
 DESCRIPTION = "NXP i.MX keyctl tool to manage CAAM Keys"
+HOMEPAGE = "https://github.com/nxp-imx/keyctl_caam"
 SECTION = "base"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=8636bd68fc00cc6a3809b7b58b45f982"
@@ -11,14 +12,14 @@ SRC_URI = "git://github.com/nxp-imx/keyctl_caam.git;protocol=https;branch=${SRCB
 SRCREV = "71cb18f17d766145217a5517748e37e250b055bf"
-DEPENDS = " openssl"
+DEPENDS = "openssl"
 TARGET_CC_ARCH += "${LDFLAGS}"
-EXTRA_OEMAKE = " OPENSSL_PATH=${STAGING_INCDIR}"
+EXTRA_OEMAKE = "OPENSSL_PATH=${STAGING_INCDIR}"
 do_install () {
-        oe_runmake DESTDIR=${D} install
+    oe_runmake DESTDIR=${D} install
 }
 COMPATIBLE_MACHINE = "(imx-generic-bsp|qoriq)"
diff --git a/recipes-security/smw/smw_5.3.bb b/recipes-security/smw/smw_5.3.bb
index 46155978e..37452720a 100644
--- a/recipes-security/smw/smw_5.3.bb
+++ b/recipes-security/smw/smw_5.3.bb
@@ -2,6 +2,7 @@
 require recipes-security/optee-imx/optee-fslc.inc
 SUMMARY = "NXP i.MX Security Middleware Library"
+HOMEPAGE = "https://github.com/nxp-imx/imx-smw"
 DESCRIPTION = "NXP i.MX Security Middleware Library"
 SECTION = "base"
 LICENSE = "BSD-3-Clause"
@@ -9,11 +10,11 @@ LICENSE = "Apache-2.0 & BSD-3-Clause & Zlib"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ff20c8e51b28869d9cdec70a818d163f \
                    file://${PSA_ARCH_TESTS_SRC_PATH}/LICENSE.md;md5=2a944942e1496af1886903d274dedb13"
-DEPENDS = " \
+DEPENDS = "\
-    python3-cryptography-native \
    json-c \
    optee-client \
    optee-os-tadevkit \
+    python3-cryptography-native \
    sqlite3 \
 "
@@ -35,15 +36,15 @@ inherit cmake features_check python3native
 REQUIRED_MACHINE_FEATURES = "optee"
 PACKAGECONFIG ??= "${PACKAGECONFIG_DRIVERS} ${PACKAGECONFIG_FEATURES}"
-PACKAGECONFIG_DRIVERS                = ""
+PACKAGECONFIG_DRIVERS = ""
-PACKAGECONFIG_DRIVERS:mx8x-nxp-bsp   = "ele-seco"
+PACKAGECONFIG_DRIVERS:mx8x-nxp-bsp = "ele-seco"
 PACKAGECONFIG_DRIVERS:mx8ulp-nxp-bsp = "ele"
-PACKAGECONFIG_DRIVERS:mx91-nxp-bsp   = "ele"
+PACKAGECONFIG_DRIVERS:mx91-nxp-bsp = "ele"
-PACKAGECONFIG_DRIVERS:mx93-nxp-bsp   = "ele"
+PACKAGECONFIG_DRIVERS:mx93-nxp-bsp = "ele"
-PACKAGECONFIG_DRIVERS:mx943-nxp-bsp  = "ele"
+PACKAGECONFIG_DRIVERS:mx943-nxp-bsp = "ele"
-PACKAGECONFIG_DRIVERS:mx95-nxp-bsp   = "ele"
+PACKAGECONFIG_DRIVERS:mx95-nxp-bsp = "ele"
-PACKAGECONFIG_FEATURES              = ""
+PACKAGECONFIG_FEATURES = ""
 PACKAGECONFIG_FEATURES:mx91-nxp-bsp = "tls"
 PACKAGECONFIG_FEATURES:mx93-nxp-bsp = "tls"
 PACKAGECONFIG_FEATURES:mx943-nxp-bsp = "tls"
@@ -61,11 +62,11 @@ LD[unexport] = "1"
 # setting the linker options
 TARGET_LDFLAGS:remove = "${DEBUG_PREFIX_MAP}"
-EXTRA_OECMAKE = " \
+EXTRA_OECMAKE = "\
    -DYOCTO_BUILD=ON \
    -DTA_DEV_KIT_ROOT=${TA_DEV_KIT_DIR} \
    -DTEEC_ROOT=${STAGING_DIR_HOST} \
-    -DJSONC_ROOT="${COMPONENTS_DIR}/${TARGET_ARCH}/json-c/usr" \
+    -DJSONC_ROOT="${COMPONENTS_DIR}/${TARGET_ARCH}/json-c/usr"\
    -DPSA_ARCH_TESTS_SRC_PATH=${PSA_ARCH_TESTS_SRC_PATH} \
    -DTEE_TA_DESTDIR=${nonarch_base_libdir} \
 "