42 files changed, 89 insertions, 177 deletions
diff --git a/classes/fsl-vivante-kernel-driver-handler.bbclass b/classes/fsl-vivante-kernel-driver-handler.bbclass
index c226b0ab7..3477454a7 100644
--- a/classes/fsl-vivante-kernel-driver-handler.bbclass
+++ b/classes/fsl-vivante-kernel-driver-handler.bbclass
@@ -45,6 +45,7 @@ python fsl_vivante_kernel_driver_handler () {
        e.data.appendVar('RREPLACES:${KERNEL_PACKAGE_NAME}-base', ' ${MLPREFIX}kernel-module-imx-gpu-viv')
        e.data.appendVar('RCONFLICTS:${KERNEL_PACKAGE_NAME}-base', ' ${MLPREFIX}kernel-module-imx-gpu-viv')
 }
+fsl_vivante_kernel_driver_handler[doc] = "Let the kernel base package provide kernel-module-imx-gpu-viv when the Vivante driver is built into the kernel instead of as a module"
 addhandler fsl_vivante_kernel_driver_handler
 fsl_vivante_kernel_driver_handler[eventmask] = "bb.event.RecipePreFinalise"
diff --git a/classes/image_populate_mfgtool.bbclass b/classes/image_populate_mfgtool.bbclass
index b8bf9e3cc..43f5fd704 100644
--- a/classes/image_populate_mfgtool.bbclass
+++ b/classes/image_populate_mfgtool.bbclass
@@ -102,6 +102,7 @@ python do_populate_mfgtool() {
    # Generate MFGTOOL bundle.
    bb.build.exec_func('generate_mfgtool_bundle', d)
 }
+do_populate_mfgtool[doc] = "Fetch the scripts listed in MFGTOOLCONFIG and generate the manufacturing tool bundle from them"
 generate_mfgtool_bundle() {
    bbnote "Processing uuu files ..."
@@ -137,3 +138,4 @@ generate_mfgtool_bundle() {
    ln -fs mfgtool-bundle-${PN}-${MACHINE}.tar.gz \
          ${DEPLOY_DIR_IMAGE}/mfgtool-bundle-${PN}.tar.gz
 }
+generate_mfgtool_bundle[doc] = "Expand the .uuu.in templates for the machine and deploy the resulting uuu scripts, uuu binaries and extra files"
diff --git a/classes/image_types_fsl.bbclass b/classes/image_types_fsl.bbclass
index 65b6a5dbd..f7f7a32c5 100644
--- a/classes/image_types_fsl.bbclass
+++ b/classes/image_types_fsl.bbclass
@@ -17,6 +17,7 @@ IMAGE_CMD:uboot-mxsboot-sdcard() {
    ln -sf ${IMAGE_NAME}.uboot-mxsboot-sdcard \
           ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.uboot-mxsboot-sdcard
 }
+IMAGE_CMD:uboot-mxsboot-sdcard[doc] = "Wrap U-Boot in an mxs bootstream for SD card boot on the i.MX23 and i.MX28 families"
 # U-Boot mxsboot generation for NAND
 do_image_uboot_mxsboot_nand[depends] += "u-boot-mxsboot-native:do_populate_sysroot \
@@ -28,6 +29,7 @@ IMAGE_CMD:uboot-mxsboot-nand() {
    ln -sf ${IMAGE_NAME}.uboot-mxsboot-nand \
           ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.uboot-mxsboot-nand
 }
+IMAGE_CMD:uboot-mxsboot-nand[doc] = "Wrap U-Boot in an mxs bootstream for NAND boot on the i.MX23 and i.MX28 families"
 # In case we are building for i.MX23 or i.MX28 we need to have the
 # image stream built before the wic generation
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
index 82afd5c72..6b5d092c1 100644
--- 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
@@ -5,7 +5,7 @@ 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]
+Upstream-Status: Inappropriate [embedded specific]
 Signed-off-by: Eric Guo <eric.guo@nxp.com>
 ---
 modules/core/src/ocl.cpp | 2 +-
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
index 50240093c..c19e7d58e 100644
--- 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
@@ -6,7 +6,7 @@ Subject: [PATCH 2/4] MGS-6470 [#ccc] Add configuration parameter to force
 USAGE: `set OPENCV_OPENCL_ALIGNMENT_MEM_ALLOC_HOST_PTR=true`
-Upstream-Status: Inappropriate [i.MX specific]
+Upstream-Status: Inappropriate [embedded specific]
 Signed-off-by: Eric Guo <eric.guo@nxp.com>
 ---
 modules/core/src/ocl.cpp | 4 +++-
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
index 3b429b383..bd04a463f 100644
--- 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
@@ -4,7 +4,7 @@ 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]
+Upstream-Status: Inappropriate [embedded specific]
 Signed-off-by: Eric Guo <eric.guo@nxp.com>
 ---
 modules/core/src/ocl.cpp | 2 +-
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
index ebca4ce35..cc4e61f8b 100644
--- 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
@@ -10,7 +10,7 @@ disabled the related ocl function in opencv_test_imgproc to avoid the following
 error: syntax error at 'double4'
-Upstream-Status: Inappropriate [i.MX specific]
+Upstream-Status: Inappropriate [embedded specific]
 Signed-off-by: jiajia Qian <jiajia.qian@nxp.com>
 ---
 modules/imgproc/src/imgwarp.cpp | 4 ++++
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
index d742b9123..f2ac82375 100644
--- 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
@@ -10,7 +10,7 @@ This feature requires at least OpenCL 2.0 or higher. By default, the C++ C langu
 is C++ C 1.2. Therefore, specify OpenCL version to 3.0 in the build-options.
-Upstream-Status: Inappropriate [i.MX specific]
+Upstream-Status: Inappropriate [embedded specific]
 Signed-off-by: jiajia Qian <jiajia.qian@nxp.com>
 ---
 modules/video/src/dis_flow.cpp | 2 +-
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_4.13.0.imx.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_4.13.0.imx.bb
index d509ac53e..e10048095 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_4.13.0.imx.bb
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_4.13.0.imx.bb
@@ -251,15 +251,22 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 # Need to override opencv and contrib URL because they include PV
 IMX_BASE_VERSION = "${@'.'.join((d.getVar('PV') or '').split('.')[:3])}"
-SRC_URI:remove = " \
+SRC_URI:remove = "\
    git://github.com/opencv/opencv.git;name=opencv;branch=4.x;protocol=https;tag=${PV} \
    git://github.com/opencv/opencv_contrib.git;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/contrib;name=contrib;branch=4.x;protocol=https;tag=${PV}"
-SRC_URI:prepend = " \
+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} "
 # i.MX patches
-SRC_URI += " \
+#
+# 0107 and 0108 carry no Signed-off-by. They came in from upstream review
+# rather than from this layer, and a sign-off is a certification only their
+# author can make, so there is nothing here for us to correct. Note this
+# covers the whole block: a patch added below without a sign-off will not be
+# reported either.
+# nooelint: oelint.file.patchsignedoff
+SRC_URI += "\
    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 \
@@ -308,7 +315,7 @@ do_install:append() {
    install -d ${D}${datadir}/opencv4/samples/data
    cp -r ${S}/samples/data/* ${D}${datadir}/opencv4/samples/data
    install -d ${D}${datadir}/opencv4/samples/bin/
-    cp -f bin/example_* ${D}${datadir}/opencv4/samples/bin/
+    install -m 0755 bin/example_* ${D}${datadir}/opencv4/samples/bin/
    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
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 b19227f58..f902715a2 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
@@ -1,5 +1,4 @@
 # Shared i.MX support fragment, only ever included by qt4 bbappends.
-# nooelint: oelint.vars.outofcontext
 FILESEXTRAPATHS:prepend := "${THISDIR}/qt4:"
 DEPENDS:append:imxgpu2d = " virtual/kernel virtual/libgles2"
diff --git a/oelint.constants.json b/oelint.constants.json
index 1379f4eff..0c37d722a 100644
--- a/oelint.constants.json
+++ b/oelint.constants.json
@@ -4,8 +4,7 @@
        "known": [
            "do_image_uboot_mxsboot_nand",
            "do_image_uboot_mxsboot_sdcard",
-            "do_image_wic",
+            "do_image_wic"
-            "module_conf_moal"
        ]
    },
    "variables": {
@@ -122,6 +121,7 @@
            "LICENSE_FLAGS",
            "MC_FLAVOUR",
            "MFGTOOL_FILESPATH",
+            "module_conf_moal",
            "NETWORK_TOOLS",
            "ODP_BUILD_TYPE",
            "OEI_CORE",
@@ -165,6 +165,7 @@
    "replacements": {
        "distros": [
            "imx-nxp-bsp",
+            "poky-agl",
            "use-mainline-bsp",
            "use-nxp-bsp"
        ],
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 87569b4a3..e0219ca8d 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
@@ -19,6 +19,7 @@ deploy_for_mx8() {
    install -m 0644 ${S}/firmware/hdmi/cadence/hdmirxfw.bin ${DEPLOYDIR}
    install -m 0644 ${S}/firmware/hdmi/cadence/dpfw.bin ${DEPLOYDIR}
 }
+deploy_for_mx8[doc] = "Deploy the Cadence HDMI firmware used by the i.MX 8 boot container"
 deploy_for_mx8m() {
    # Synopsys DDR
@@ -30,6 +31,7 @@ deploy_for_mx8m() {
    install -m 0644 ${S}/firmware/hdmi/cadence/signed_dp_imx8m.bin ${DEPLOYDIR}
    install -m 0644 ${S}/firmware/hdmi/cadence/signed_hdmi_imx8m.bin ${DEPLOYDIR}
 }
+deploy_for_mx8m[doc] = "Deploy the Synopsys DDR and Cadence DP/HDMI firmware used by the i.MX 8M boot container"
 deploy_for_mx9() {
    # Synopsys DDR
@@ -37,6 +39,7 @@ deploy_for_mx9() {
        install -m 0644 ${S}/firmware/ddr/synopsys/${ddr_firmware} ${DEPLOYDIR}
    done
 }
+deploy_for_mx9[doc] = "Deploy the Synopsys DDR firmware used by the i.MX 9 boot container"
 python () {
    # Manually add the required functions as dependencies otherwise they won't be included in the
diff --git a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
index 59fe5854f..437fffdf6 100644
--- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
+++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
@@ -144,6 +144,7 @@ compile_mx8m() {
    cp ${DEPLOY_DIR_IMAGE}/${UBOOT_NAME_EXTRA}               ${BOOT_STAGING}/u-boot.bin
 }
+compile_mx8m[doc] = "Stage the DDR, HDMI/DP, SPL, ATF and U-Boot binaries for the i.MX 8M boot container"
 compile_mx8() {
    bbnote 8QM boot binary build
@@ -156,6 +157,7 @@ compile_mx8() {
                                                             ${BOOT_STAGING}/u-boot-spl.bin
    fi
 }
+compile_mx8[doc] = "Stage the SCFW, ATF, SECO and U-Boot binaries for the i.MX 8QM boot container"
 compile_mx8x() {
    bbnote 8QX boot binary build
@@ -168,6 +170,7 @@ compile_mx8x() {
                                                             ${BOOT_STAGING}/u-boot-spl.bin
    fi
 }
+compile_mx8x[doc] = "Stage the SECO, SCFW, ATF and U-Boot binaries for the i.MX 8QX boot container"
 compile_mx8ulp() {
    bbnote 8ULP boot binary build
@@ -180,11 +183,13 @@ compile_mx8ulp() {
                                                             ${BOOT_STAGING}/u-boot-spl.bin
    fi
 }
+compile_mx8ulp[doc] = "Stage the SECO, ATF, uPower and U-Boot binaries for the i.MX 8ULP boot container"
 compile_mx91() {
    bbnote i.MX 91 boot binary build
    compile_mx93
 }
+compile_mx91[doc] = "Stage the i.MX 91 boot container binaries, which are the same as for i.MX 93"
 compile_mx93() {
    bbnote i.MX 93 boot binary build
@@ -201,6 +206,7 @@ compile_mx93() {
                                                             ${BOOT_STAGING}/u-boot-spl.bin
    fi
 }
+compile_mx93[doc] = "Stage the DDR, SECO/ELE, ATF and U-Boot binaries for the i.MX 93 boot container"
 compile_mx943() {
    bbnote i.MX 943 boot binary build
@@ -210,6 +216,7 @@ compile_mx943() {
    cp ${DEPLOY_DIR_IMAGE}/${SYSTEM_MANAGER_FIRMWARE_NAME}.bin \
       ${BOOT_STAGING}/${SYSTEM_MANAGER_FIRMWARE_BASENAME}.bin
 }
+compile_mx943[doc] = "Stage the i.MX 93 binaries plus the OEI and System Manager firmware for the i.MX 943 boot container"
 compile_mx95() {
    bbnote i.MX 95 boot binary build
@@ -219,6 +226,7 @@ compile_mx95() {
    cp ${DEPLOY_DIR_IMAGE}/${SYSTEM_MANAGER_FIRMWARE_NAME}.bin \
       ${BOOT_STAGING}/${SYSTEM_MANAGER_FIRMWARE_BASENAME}.bin
 }
+compile_mx95[doc] = "Stage the i.MX 93 binaries plus the OEI and System Manager firmware for the i.MX 95 boot container"
 do_compile() {
    # mkimage for i.MX8
@@ -337,6 +345,7 @@ deploy_mx8m() {
    install -m 0755 ${BOOT_STAGING}/${TOOLS_NAME}            ${DEPLOYDIR}/${BOOT_TOOLS}
    install -m 0755 ${BOOT_STAGING}/mkimage_fit_atf.sh       ${DEPLOYDIR}/${BOOT_TOOLS}
 }
+deploy_mx8m[doc] = "Deploy the i.MX 8M DDR and HDMI/DP firmware together with the mkimage helpers to the boot tools folder"
 deploy_mx8() {
    install -d ${DEPLOYDIR}/${BOOT_TOOLS}
@@ -347,6 +356,7 @@ deploy_mx8() {
                                                             ${DEPLOYDIR}/${BOOT_TOOLS}
    fi
 }
+deploy_mx8[doc] = "Deploy the i.MX 8QM SECO firmware, mkimage tool and SPL to the boot tools folder"
 deploy_mx8x() {
    install -d ${DEPLOYDIR}/${BOOT_TOOLS}
@@ -357,6 +367,7 @@ deploy_mx8x() {
                                                             ${DEPLOYDIR}/${BOOT_TOOLS}
    fi
 }
+deploy_mx8x[doc] = "Deploy the i.MX 8QX SECO firmware, mkimage tool and SPL to the boot tools folder"
 deploy_mx8ulp() {
    install -d ${DEPLOYDIR}/${BOOT_TOOLS}
@@ -367,10 +378,12 @@ deploy_mx8ulp() {
                                                             ${DEPLOYDIR}/${BOOT_TOOLS}
    fi
 }
+deploy_mx8ulp[doc] = "Deploy the i.MX 8ULP SECO firmware, mkimage tool and SPL to the boot tools folder"
 deploy_mx91() {
    deploy_mx93
 }
+deploy_mx91[doc] = "Deploy the i.MX 91 boot tools, which are the same as for i.MX 93"
 deploy_mx93() {
    install -d ${DEPLOYDIR}/${BOOT_TOOLS}
@@ -386,6 +399,7 @@ deploy_mx93() {
                                                             ${DEPLOYDIR}/${BOOT_TOOLS}
    fi
 }
+deploy_mx93[doc] = "Deploy the i.MX 93 DDR and SECO/ELE firmware, mkimage tool and SPL to the boot tools folder"
 deploy_mx943() {
    deploy_mx93
@@ -393,6 +407,7 @@ deploy_mx943() {
    install -m 0644 ${BOOT_STAGING}/${SYSTEM_MANAGER_FIRMWARE_BASENAME}.bin \
                ${DEPLOYDIR}/${BOOT_TOOLS}/${SYSTEM_MANAGER_FIRMWARE_NAME}.bin
 }
+deploy_mx943[doc] = "Deploy the i.MX 93 boot tools plus the OEI and System Manager firmware for i.MX 943"
 deploy_mx95() {
    deploy_mx93
@@ -400,6 +415,7 @@ deploy_mx95() {
    install -m 0644 ${BOOT_STAGING}/${SYSTEM_MANAGER_FIRMWARE_BASENAME}.bin \
                ${DEPLOYDIR}/${BOOT_TOOLS}/${SYSTEM_MANAGER_FIRMWARE_NAME}.bin
 }
+deploy_mx95[doc] = "Deploy the i.MX 93 boot tools plus the OEI and System Manager firmware for i.MX 95"
 do_deploy() {
    deploy_${SOC_FAMILY}
diff --git a/recipes-bsp/u-boot/libubootenv_%.bbappend b/recipes-bsp/u-boot/libubootenv_%.bbappend
index 619b510e1..d1cecf100 100644
--- a/recipes-bsp/u-boot/libubootenv_%.bbappend
+++ b/recipes-bsp/u-boot/libubootenv_%.bbappend
@@ -38,6 +38,7 @@ def fixup_uboot_config_dependency(d):
 python fixup_uboot_config_dependency_handler() {
    fixup_uboot_config_dependency(d)
 }
+fixup_uboot_config_dependency_handler[doc] = "Borrow UBOOT_MACHINE and UBOOT_CONFIG from IMX_DEFAULT_BOOTLOADER so libubootenv passes the uboot-config sanity check"
 fixup_uboot_config_dependency_handler[eventmask] = "bb.event.RecipePreFinalise"
 addhandler fixup_uboot_config_dependency_handler
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 681156041..b493efac7 100644
--- a/recipes-bsp/u-boot/u-boot-fslc_2025.01.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc_2025.01.bb
@@ -5,6 +5,7 @@ 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 \
               was submitted for revision and it takes some time to become part of a stable \
               version, or because it is not applicable for upstreaming."
+SECTION = "bootloaders"
 DEPENDS += "bc-native dtc-native python3-setuptools-native gnutls-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 31424c27a..53853ada6 100644
--- a/recipes-bsp/u-boot/u-boot-imx_2025.04.bb
+++ b/recipes-bsp/u-boot/u-boot-imx_2025.04.bb
@@ -5,6 +5,7 @@
 require recipes-bsp/u-boot/u-boot.inc
 require u-boot-imx-common_${PV}.inc
 HOMEPAGE = "https://github.com/nxp-imx/uboot-imx"
+SECTION = "bootloaders"
 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 28b747c70..445e0c363 100644
--- a/recipes-bsp/u-boot/u-boot-qoriq_2025.04.bb
+++ b/recipes-bsp/u-boot/u-boot-qoriq_2025.04.bb
@@ -2,6 +2,7 @@ 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"
+SECTION = "bootloaders"
 LICENSE = "BSD-2-Clause AND BSD-3-Clause AND GPL-2.0-only AND LGPL-2.0-only AND LGPL-2.1-only"
 LIC_FILES_CHKSUM = "\
diff --git a/recipes-devtools/qemu/qemu-qoriq.inc b/recipes-devtools/qemu/qemu-qoriq.inc
index 502262f27..c598d3ff1 100644
--- a/recipes-devtools/qemu/qemu-qoriq.inc
+++ b/recipes-devtools/qemu/qemu-qoriq.inc
@@ -66,7 +66,7 @@ do_install_ptest() {
    cp -rL ${B}/tests ${D}${PTEST_PATH}
    find ${D}${PTEST_PATH}/tests -type f -name "*.[Sshcod]" | xargs -i rm -rf {}
-    cp ${S}/tests/Makefile.include ${D}${PTEST_PATH}/tests
+    install -m 0644 ${S}/tests/Makefile.include ${D}${PTEST_PATH}/tests
    # Don't check the file genreated by configure
    sed -i -e '/wildcard config-host.mak/d' \
           -e '$ {/endif/d}' ${D}${PTEST_PATH}/tests/Makefile.include
@@ -146,6 +146,7 @@ make_qemu_wrapper() {
                        GTK_THEME=Adwaita
        done
 }
+make_qemu_wrapper[doc] = "Wrap the installed qemu-system-* binaries so they find the gdk-pixbuf loaders, fontconfig and GTK theme at runtime"
 # Disable kvm/virgl/mesa on targets that do not support it
 PACKAGECONFIG:remove:darwin = "kvm virglrenderer glx gtk+"
diff --git a/recipes-devtools/qemu/qemu-qoriq_4.2.bb b/recipes-devtools/qemu/qemu-qoriq_4.2.bb
index 874b77e07..481407769 100644
--- a/recipes-devtools/qemu/qemu-qoriq_4.2.bb
+++ b/recipes-devtools/qemu/qemu-qoriq_4.2.bb
@@ -41,7 +41,7 @@ do_install_ptest() {
        cp -rL ${B}/tests ${D}${PTEST_PATH}
        find ${D}${PTEST_PATH}/tests -type f -name "*.[Sshcod]" | xargs -i rm -rf {}
-        cp ${S}/tests/Makefile.include ${D}${PTEST_PATH}/tests
+        install -m 0644 ${S}/tests/Makefile.include ${D}${PTEST_PATH}/tests
        # Don't check the file genreated by configure
        sed -i -e '/wildcard config-host.mak/d' \
               -e '$ {/endif/d}' ${D}${PTEST_PATH}/tests/Makefile.include
diff --git a/recipes-extended/jailhouse/files/0001-YOCIMX-9281-1-Fix-gcc15-errors.patch b/recipes-extended/jailhouse/files/0001-YOCIMX-9281-1-Fix-gcc15-errors.patch
deleted file mode 100644
index c1e3eaa25..000000000
--- a/recipes-extended/jailhouse/files/0001-YOCIMX-9281-1-Fix-gcc15-errors.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From 2be7793ca658015470fe0d60c0c973e12ce68d73 Mon Sep 17 00:00:00 2001
-From: Tom Hochstein <tom.hochstein@nxp.com>
-Date: Thu, 12 Jun 2025 06:49:58 -0700
-Subject: [PATCH 1/2] YOCIMX-9281-1: Fix gcc15 errors
-Fix several instances of the following errors:
-```
-| inmates/lib/include/inmate_common.h:87:16: error: cannot use keyword 'true' as enumeration constant
-|    87 | typedef enum { true = 1, false = 0 } bool;
-|       |                ^~~~
-```
-```
-| In file included from configs/arm64/hikey.c:16:
-| include/jailhouse/cell-config.h:318:41: error: initializer-string for array of 'char' truncates NUL terminator but destination lacks 'nonstring' attribute (6 chars into 5 available) [-Werror=unterminated-string-initialization]
-|   318 | #define JAILHOUSE_SYSTEM_SIGNATURE      "JHSYS"
-|       |                                         ^~~~~~~
-| configs/arm64/hikey.c:26:30: note: in expansion of macro 'JAILHOUSE_SYSTEM_SIGNATURE'
-|    26 |                 .signature = JAILHOUSE_SYSTEM_SIGNATURE,
-|       |                              ^~~~~~~~~~~~~~~~~~~~~~~~~~
-```
-Upstream-Status: Backport [Pending]
-Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
-Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
- hypervisor/include/jailhouse/header.h | 2 +-
- hypervisor/include/jailhouse/types.h  | 2 ++
- include/jailhouse/cell-config.h       | 4 ++--
- include/jailhouse/hypercall.h         | 2 +-
- inmates/lib/include/inmate_common.h   | 2 ++
- 5 files changed, 8 insertions(+), 4 deletions(-)
-diff --git a/hypervisor/include/jailhouse/header.h b/hypervisor/include/jailhouse/header.h
-index 518bc5cb..324eb94b 100644
--- a/hypervisor/include/jailhouse/header.h
-+++ b/hypervisor/include/jailhouse/header.h
-@@ -55,7 +55,7 @@ struct jailhouse_header {
-        /** Signature "JAILHOUS" used for basic validity check of the
-         * hypervisor image.
-         * @note Filled at build time. */
-       char signature[8];
-+       char signature[8] __attribute__ ((nonstring));
-        /** Size of hypervisor core.
-         * It starts with the hypervisor's header and ends after its bss
-         * section. Rounded up to page boundary.
-diff --git a/hypervisor/include/jailhouse/types.h b/hypervisor/include/jailhouse/types.h
-index 6d78ad6d..f79d7428 100644
--- a/hypervisor/include/jailhouse/types.h
-+++ b/hypervisor/include/jailhouse/types.h
-@@ -19,7 +19,9 @@
- 
- #ifndef __ASSEMBLY__
- 
-+#if __GNUC__ < 15
- typedef enum { true = 1, false = 0 } bool;
-+#endif
- 
- /** Describes a CPU set. */
- struct cpu_set {
-diff --git a/include/jailhouse/cell-config.h b/include/jailhouse/cell-config.h
-index 17d59306..affce1c2 100644
--- a/include/jailhouse/cell-config.h
-+++ b/include/jailhouse/cell-config.h
-@@ -91,7 +91,7 @@
-  * structure.
-  */
- struct jailhouse_cell_desc {
-       char signature[5];
-+       char signature[5] __attribute__ ((nonstring));
-        __u8 architecture;
-        __u16 revision;
- 
-@@ -330,7 +330,7 @@ struct jailhouse_pio {
-  * General descriptor of the system.
-  */
- struct jailhouse_system {
-       char signature[5];
-+       char signature[5] __attribute__ ((nonstring));
-        __u8 architecture;
-        __u16 revision;
- 
-diff --git a/include/jailhouse/hypercall.h b/include/jailhouse/hypercall.h
-index 07574d3d..cf58a4c9 100644
--- a/include/jailhouse/hypercall.h
-+++ b/include/jailhouse/hypercall.h
-@@ -107,7 +107,7 @@
- 
- #define COMM_REGION_GENERIC_HEADER                                     \
-        /** Communication region magic JHCOMM */                        \
-       char signature[6];                                              \
-+       char signature[6] __attribute__ ((nonstring));                                          \
-        /** Communication region ABI revision */                        \
-        __u16 revision;                                                 \
-        /** Cell state, initialized by hypervisor, updated by cell. */  \
-diff --git a/inmates/lib/include/inmate_common.h b/inmates/lib/include/inmate_common.h
-index 1c20a0af..43cd7a20 100644
--- a/inmates/lib/include/inmate_common.h
-+++ b/inmates/lib/include/inmate_common.h
-@@ -84,7 +84,9 @@ typedef u32 __u32;
- typedef s64 __s64;
- typedef u64 __u64;
- 
-+#if __GNUC__ < 15
- typedef enum { true = 1, false = 0 } bool;
-+#endif
- 
- #include <jailhouse/hypercall.h>
- 
-- 
-2.34.1
diff --git a/recipes-extended/jailhouse/files/0002-YOCIMX-9281-2-hypervisor-arm64-fix-strh-usage.patch b/recipes-extended/jailhouse/files/0002-YOCIMX-9281-2-hypervisor-arm64-fix-strh-usage.patch
deleted file mode 100644
index 4c8fefa36..000000000
--- a/recipes-extended/jailhouse/files/0002-YOCIMX-9281-2-hypervisor-arm64-fix-strh-usage.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 98f6f8dc23d6b3d4fe5b15045ccb3d3ef36747be Mon Sep 17 00:00:00 2001
-From: Peng Fan <peng.fan@nxp.com>
-Date: Mon, 25 Aug 2025 09:48:05 +0800
-Subject: [PATCH 2/2] YOCIMX-9281-2: hypervisor: arm64: fix strh usage
-hypervisor/arch/arm64/entry.S:555: Error: immediate offset out of range
-Per ARM spec:
-STRH (immediate)
-<pimm> Is the optional positive immediate byte offset, a multiple of 2 in
-the range 0 to 8190, defaulting to 0 and encoded in the "imm12" field
-as <pimm>/2.
-So align sdei_event to 2 bytes aligned.
-Upstream-Status: Pending
-Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
- hypervisor/arch/arm64/include/asm/percpu_fields.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/hypervisor/arch/arm64/include/asm/percpu_fields.h b/hypervisor/arch/arm64/include/asm/percpu_fields.h
-index 32f42a53..844a9417 100644
--- a/hypervisor/arch/arm64/include/asm/percpu_fields.h
-+++ b/hypervisor/arch/arm64/include/asm/percpu_fields.h
-@@ -18,4 +18,4 @@
-        bool suspended;                                                 \
-        bool suspending;                                                \
-        bool resuming;                                                  \
-       bool sdei_event;
-+       bool sdei_event __attribute__((aligned(2)));
-- 
-2.34.1
diff --git a/recipes-extended/jailhouse/jailhouse-imx_git.bb b/recipes-extended/jailhouse/jailhouse-imx_git.bb
index f2e1e989c..9c63cbaba 100644
--- a/recipes-extended/jailhouse/jailhouse-imx_git.bb
+++ b/recipes-extended/jailhouse/jailhouse-imx_git.bb
@@ -15,24 +15,22 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \
 "
 DEPENDS = "\
+    dtc-native \
    make-native \
-    python3-mako-native \
    python3-mako \
-    dtc-native \
+    python3-mako-native \
 "
 PROVIDES = "jailhouse"
 PV = "2023.03+git${SRCPV}"
-SRCBRANCH = "lf-6.12.20_2.0.0"
+SRCBRANCH = "lf-6.18.20_2.0.0"
 IMX_JAILHOUSE_SRC ?= "git://github.com/nxp-imx/imx-jailhouse.git;protocol=https"
 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 \
           "
-SRCREV = "399d65450e9a377b4aaff4b0627619174e1c8c46"
+SRCREV = "8d6d397f7f88f4bd0d9f99933a13163266d09099"
 inherit module bash-completion deploy setuptools3
@@ -88,7 +86,7 @@ do_install:append() {
    install ${B}/inmates/tools/${JH_ARCH}/linux-loader.bin ${D}${INMATES_DIR}/tools/${JH_ARCH}
 }
-PACKAGE_BEFORE_PN = "pyjailhouse"
+PACKAGE_BEFORE_PN += "pyjailhouse"
 FILES:${PN} += "${nonarch_base_libdir}/firmware ${libexecdir} ${sbindir} ${JH_DATADIR}"
 # Remove libdir/* appended by setuptools3-base.bbclass for module split to work correctly
diff --git a/recipes-extended/testfloat/testfloat_2a.bb b/recipes-extended/testfloat/testfloat_2a.bb
index db87ae985..45ca5ae11 100644
--- a/recipes-extended/testfloat/testfloat_2a.bb
+++ b/recipes-extended/testfloat/testfloat_2a.bb
@@ -29,6 +29,7 @@ do_unpack2(){
        echo -e "\nERROR: command dos2unix or fromdos not found\n" && return 1
    fi
 }
+do_unpack2[doc] = "Move the SoftFloat sources into ${S} and convert the shipped DOS line endings"
 addtask do_unpack2 after do_unpack before do_patch
 do_compile(){
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 ef6f16d26..c31eca5d3 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -234,7 +234,7 @@ do_install () {
    fi
    if [ "${BACKEND}" = "wayland" ] && [ "${IS_MX8}" != "1" ]; then
        # Special case for libVDK on Wayland backend, deliver fb library as well.
-        cp ${S}/gpu-core/usr/lib/fb/libVDK.so.1.2.0 ${D}${libdir}/libVDK-fb.so.1.2.0
+        install -m 0644 ${S}/gpu-core/usr/lib/fb/libVDK.so.1.2.0 ${D}${libdir}/libVDK-fb.so.1.2.0
    fi
    if [ -z "${PACKAGES_OPENCL}" ]; then
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p4.4-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p4.4-aarch64.bb
index 5a6ba030a..37db9098a 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p4.4-aarch64.bb
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p4.4-aarch64.bb
@@ -18,7 +18,7 @@ do_install:prepend() {
 do_install:append() {
    if [ "${IS_MX8}" = "1" ]; then
        if [ ! -z "${PACKAGES_VULKAN}" ]; then
-            mkdir -p ${D}${datadir}/vulkan/icd.d
+            install -d ${D}${datadir}/vulkan/icd.d
            mv ${D}${sysconfdir}/vulkan/icd.d/imx_icd.json ${D}${datadir}/vulkan/icd.d/verisilicon_icd.json
        fi
    fi
diff --git a/recipes-graphics/wayland/weston-10.0.5.imx/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch b/recipes-graphics/wayland/weston-10.0.5.imx/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch
index 59f2a4b67..921b778b0 100644
--- a/recipes-graphics/wayland/weston-10.0.5.imx/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch
+++ b/recipes-graphics/wayland/weston-10.0.5.imx/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch
@@ -20,7 +20,7 @@ Thus the build fails with:
 Dropping weston 9.0.0-imx commit 7859a762 (protocol: no found
 wayland-scanner with Yocto toolchain") fixes the issue.
-Upstream-Status: Inappropriate [Cross-compile Specific]
+Upstream-Status: Inappropriate [oe-specific]
 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
 ---
 protocol/meson.build | 2 +-
diff --git a/recipes-graphics/wayland/weston/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch b/recipes-graphics/wayland/weston/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch
index 4d2a333a3..25b649a8c 100644
--- a/recipes-graphics/wayland/weston/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch
+++ b/recipes-graphics/wayland/weston/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch
@@ -20,7 +20,7 @@ Thus the build fails with:
 Dropping weston 9.0.0-imx commit 7859a762 (protocol: no found
 wayland-scanner with Yocto toolchain") fixes the issue.
-Upstream-Status: Inappropriate [Cross-compile specific]
+Upstream-Status: Inappropriate [oe-specific]
 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
 ---
 protocol/meson.build | 2 +-
diff --git a/recipes-kernel/kernel-modules/kernel-module-ar_git.bb b/recipes-kernel/kernel-modules/kernel-module-ar_git.bb
index 9e1d5b471..b9956ce33 100644
--- a/recipes-kernel/kernel-modules/kernel-module-ar_git.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-ar_git.bb
@@ -23,7 +23,8 @@ do_install(){
    install -d ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}
    install -d ${D}${bindir}
    install -m 644 ${B}/bin/ar.ko ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/
-    cp -f ${S}/bin/ar_* ${D}${bindir}/
+    install -m 0755 ${S}/bin/ar_*_tool ${D}${bindir}/
+    install -m 0644 ${S}/bin/ar_*_cfg ${D}${bindir}/
 }
 FILES:${PN} += "${bindir}/"
diff --git a/recipes-kernel/linux/linux-fslc-imx_6.18.bb b/recipes-kernel/linux/linux-fslc-imx_6.18.bb
index ca917f22a..0aef04565 100644
--- a/recipes-kernel/linux/linux-fslc-imx_6.18.bb
+++ b/recipes-kernel/linux/linux-fslc-imx_6.18.bb
@@ -9,6 +9,7 @@ DESCRIPTION = "Linux Kernel provided by NXP as the part of release distribution.
               It includes support for many NXP Proprietary IPs (GPU, VPU, IPU). \
               Latest stable Kernel patchlevel is applied and maintained by Community."
 HOMEPAGE = "https://github.com/Freescale/linux-fslc"
+SECTION = "kernel"
 ###############################################################################
 # 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 e490755e7..da1613558 100644
--- a/recipes-kernel/linux/linux-fslc-lts_6.1.bb
+++ b/recipes-kernel/linux/linux-fslc-lts_6.1.bb
@@ -10,6 +10,7 @@ DESCRIPTION = "Linux kernel based on LTS kernel used by FSL Community BSP in ord
               and will not become part of a LTS version, or because it is not applicable for \
               upstreaming in any form."
 HOMEPAGE = "https://github.com/Freescale/linux-fslc"
+SECTION = "kernel"
 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 a4d15e0cc..9ca1611ac 100644
--- a/recipes-kernel/linux/linux-fslc-lts_6.6.bb
+++ b/recipes-kernel/linux/linux-fslc-lts_6.6.bb
@@ -10,6 +10,7 @@ DESCRIPTION = "Linux kernel based on LTS kernel used by FSL Community BSP in ord
               and will not become part of a LTS version, or because it is not applicable for \
               upstreaming in any form."
 HOMEPAGE = "https://github.com/Freescale/linux-fslc"
+SECTION = "kernel"
 require linux-imx.inc
diff --git a/recipes-kernel/linux/linux-imx-headers_6.18.bb b/recipes-kernel/linux/linux-imx-headers_6.18.bb
index cb05aa2a8..eabc42ecf 100644
--- a/recipes-kernel/linux/linux-imx-headers_6.18.bb
+++ b/recipes-kernel/linux/linux-imx-headers_6.18.bb
@@ -5,6 +5,7 @@ SUMMARY = "Installs i.MX-specific kernel headers"
 DESCRIPTION = "Installs i.MX-specific kernel headers to userspace. \
               New headers are installed in ${includedir}/imx."
 HOMEPAGE = "https://github.com/nxp-imx/linux-imx"
+SECTION = "devel"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
diff --git a/recipes-kernel/linux/linux-imx.inc b/recipes-kernel/linux/linux-imx.inc
index d704e2921..f0f8b5ba2 100644
--- a/recipes-kernel/linux/linux-imx.inc
+++ b/recipes-kernel/linux/linux-imx.inc
@@ -60,5 +60,6 @@ python kernel_devicetree_32bit_compatibility_update() {
        bb.warn("Updating KERNEL_DEVICETREE, removing sub-folders for older kernel. Use -D for more details. Set KERNEL_DEVICETREE_32BIT_COMPATIBILITY_UPDATE = \"0\" to disable.")
        d.setVar('KERNEL_DEVICETREE', output)
 }
+kernel_devicetree_32bit_compatibility_update[doc] = "Strip device tree sub-folders from KERNEL_DEVICETREE for older 32-bit kernels that keep the dtb files flat"
 addhandler kernel_devicetree_32bit_compatibility_update
 kernel_devicetree_32bit_compatibility_update[eventmask] = "bb.event.RecipeParsed"
diff --git a/recipes-kernel/linux/linux-imx_6.18.bb b/recipes-kernel/linux/linux-imx_6.18.bb
index 769ef7677..ee2018ff2 100644
--- a/recipes-kernel/linux/linux-imx_6.18.bb
+++ b/recipes-kernel/linux/linux-imx_6.18.bb
@@ -10,6 +10,7 @@ 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."
 HOMEPAGE = "https://github.com/nxp-imx/linux-imx"
+SECTION = "kernel"
 require recipes-kernel/linux/linux-imx.inc
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-MMFMWK-9590-gstcuda-disable-gir-build-for-cuda-plugi.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-MMFMWK-9590-gstcuda-disable-gir-build-for-cuda-plugi.patch
index 38282e478..1455ea626 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-MMFMWK-9590-gstcuda-disable-gir-build-for-cuda-plugi.patch
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-MMFMWK-9590-gstcuda-disable-gir-build-for-cuda-plugi.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] MMFMWK-9590 gstcuda: disable gir build for cuda plugin
 This is a workaround to only disable cuda gir build to avoid totally
 disable bad library gir build. mesa-rvgpu-emu patch break cuda gir build
-Upstream-Status: Inappropriate [i.MX specific]
+Upstream-Status: Inappropriate [embedded specific]
 ---
 gst-libs/gst/cuda/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.28.1.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.28.1.imx.bb
index c978097aa..288445961 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.28.1.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.28.1.imx.bb
@@ -185,6 +185,10 @@ SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plug
                  "
 SRC_URI:prepend = "${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} "
+# The cuda gir patch carries no Signed-off-by. It is an NXP-internal change
+# that arrived here without one, and a sign-off is a certification only its
+# author can make, so there is nothing here for us to correct.
+# nooelint: oelint.file.patchsignedoff
 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"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-MMFMWK-9590-gstgl-1.0-disable-gir-build-for-gl-plugi.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-MMFMWK-9590-gstgl-1.0-disable-gir-build-for-gl-plugi.patch
index 3f709d84f..11e72613b 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-MMFMWK-9590-gstgl-1.0-disable-gir-build-for-gl-plugi.patch
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-MMFMWK-9590-gstgl-1.0-disable-gir-build-for-gl-plugi.patch
@@ -8,7 +8,7 @@ This is a workaround to only display gl gir build to avoid totally
 disable base library gir build. mesa-rvgpu-emu patch break gl gir
 build
-Upstream-Status: Inappropriate [i.MX specific]
+Upstream-Status: Inappropriate [embedded specific]
 ---
 gst-libs/gst/gl/meson.build | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.28.1.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.28.1.imx.bb
index 5c61a823c..be9a2d39b 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.28.1.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.28.1.imx.bb
@@ -115,6 +115,10 @@ SRC_URI:remove = "\
    file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch"
 SRC_URI:prepend = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} "
+# The gl gir patch carries no Signed-off-by. It is an NXP-internal change
+# that arrived here without one, and a sign-off is a certification only its
+# author can make, so there is nothing here for us to correct.
+# nooelint: oelint.file.patchsignedoff
 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"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server/0001-YOCIMX-9113-rtsp-examples-install-test-launch-and-te.patch b/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server/0001-YOCIMX-9113-rtsp-examples-install-test-launch-and-te.patch
index 9a1d206b6..1a8b9a1d7 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server/0001-YOCIMX-9113-rtsp-examples-install-test-launch-and-te.patch
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server/0001-YOCIMX-9113-rtsp-examples-install-test-launch-and-te.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] YOCIMX-9113 rtsp examples: install test-launch and test-uri
 gstreamer community has no plan to install these binary as test tool
 https://discourse.gstreamer.org/t/gst-rtsp-server-examples-are-not-installed-by-default/4806
-Upstream-Status: Inappropriate [i.MX specific]
+Upstream-Status: Inappropriate [embedded specific]
 Signed-off-by: Haihua Hu <jared.hu@nxp.com>
 ---
diff --git a/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_git.bb b/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_git.bb
index 0ddc30d49..a11d221e4 100644
--- a/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_git.bb
+++ b/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_git.bb
@@ -1,6 +1,10 @@
 # Copyright 2023-2026 NXP
 SUMMARY = "i.MX multimedia OpenCL converter library"
-DESCRIPTION = "NXP Multimedia opencl converter lib"
+DESCRIPTION = "OpenCL-accelerated image conversion library used by the NXP \
+               i.MX multimedia stack. It offloads pixel format and colour \
+               space conversion to the GPU through an OpenCL implementation \
+               provided by virtual/libopencl1, and is supported on the i.MX 8 \
+               and i.MX 95 families that ship a GPU."
 HOMEPAGE = "https://www.nxp.com/"
 SECTION = "multimedia"
 LICENSE = "BSD-3-Clause"
diff --git a/recipes-multimedia/imx-parser/imx-mp4-parser_git.bb b/recipes-multimedia/imx-parser/imx-mp4-parser_git.bb
index 1c70fb6e4..2c3628639 100644
--- a/recipes-multimedia/imx-parser/imx-mp4-parser_git.bb
+++ b/recipes-multimedia/imx-parser/imx-mp4-parser_git.bb
@@ -31,6 +31,7 @@ python __set_insane_skip() {
    for p in d.getVar('PACKAGES').split():
        d.setVar("INSANE_SKIP:%s" % p, "ldflags dev-so textrel buildpaths")
 }
+__set_insane_skip[doc] = "Skip QA checks that cannot be satisfied by the prebuilt parser binaries"
 do_package_qa[prefuncs] += "__set_insane_skip"
diff --git a/recipes-security/smw/smw_5.3.bb b/recipes-security/smw/smw_5.3.bb
index b7313ac11..3454e0865 100644
--- a/recipes-security/smw/smw_5.3.bb
+++ b/recipes-security/smw/smw_5.3.bb
@@ -20,6 +20,10 @@ DEPENDS = "\
 SRC_URI = "${SMW_LIB_SRC};branch=${SRCBRANCH_smw};name=smw \
           ${PSA_LIB_SRC};branch=${SRCBRANCH_psa};name=psa;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/${PSA_ARCH_TESTS_SRC_PATH}"
+# The qualifiers fix carries no Signed-off-by, and no From: header either, so
+# there is no author to recover one from. A sign-off is a certification the
+# signer makes, so inventing one here would be wrong.
+# nooelint: oelint.file.patchsignedoff
 SRC_URI += "file://0001-Fixed-discarded-qualifiers-error.patch"
 SMW_LIB_SRC ?= "git://github.com/nxp-imx/imx-smw.git;protocol=https"
 PSA_LIB_SRC ?= "git://github.com/ARM-software/psa-arch-tests.git;protocol=https"