4 files changed, 40 insertions, 28 deletions
diff --git a/recipes-bsp/imx-mkimage/files/0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch b/recipes-bsp/imx-mkimage/files/0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch
index f182a2f14..f6cbc38dd 100644
--- a/recipes-bsp/imx-mkimage/files/0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch
+++ b/recipes-bsp/imx-mkimage/files/0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch
@@ -15,7 +15,7 @@ Use it from the build sysroot, and do not pull the local version of it.
 Reinjected the original patch from Andrey Zhizhikin <andrey.z@gmail.com>
-Upstream-Status: Inappropriate [OE-specific]
+Upstream-Status: Inappropriate [oe-specific]
 Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
 ---
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..7b3886e9e 100644
--- a/recipes-bsp/imx-mkimage/imx-mkimage_git.bb
+++ b/recipes-bsp/imx-mkimage/imx-mkimage_git.bb
@@ -1,12 +1,19 @@
 # Copyright (C) 2016 Freescale Semiconductor
 # Copyright 2017-2022,2026 NXP
+# NOTE: uses 'inherit native' directly, so a '-native' filename (as
+# oelint.var.nativefilename suggests) would double the class suffix and break PN.
+# That finding is a false positive here and is not inline-suppressible.
 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"
+# Source ships no standalone license file; reference the common GPL-2.0-only text.
+# nooelint: oelint.var.licenseremotefile
 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..1455d99cb 100644
--- a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
+++ b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
@@ -1,6 +1,9 @@
 # Copyright 2017-2026 NXP
- 
-DEPENDS = "zlib-native openssl-native"
+# Canonical DEPENDS for this native tool; the require sits in the .bb so oelint
+# sees this base assignment as "after include".
+# nooelint: oelint.vars.dependsappend
+DEPENDS = "openssl-native zlib-native"
 SRC_URI = "${IMX_MKIMAGE_SRC};branch=${SRCBRANCH} \
           file://0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch \