3 files changed, 87 insertions, 55 deletions

diff --git a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
index 120f0594e..59fe5854f 100644
--- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
+++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
@@ -1,25 +1,38 @@
-# Copyright (C) 2017-2024 NXP
+# Copyright (C) 2017-2024,2026 NXP
 
 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"
 
-inherit use-imx-security-controller-firmware uboot-config
+DEPENDS += "xxd-native"
+DEPENDS:append:mx8m-generic-bsp = " u-boot-mkimage-native dtc-native u-boot-mkeficapsule-native"
+DEPENDS:append:mx93-generic-bsp = " u-boot-mkimage-native dtc-native u-boot-mkeficapsule-native"
+DEPENDS:append:mx95-generic-bsp = " u-boot-mkeficapsule-native"
 
-DEPENDS += " \
-    u-boot \
+# This package aggregates output deployed by other packages,
+# so set the appropriate dependencies
+DEPENDS += "\
+    virtual/bootloader \
     ${IMX_EXTRA_FIRMWARE} \
     imx-atf \
+    ${@bb.utils.contains('UBOOT_CONFIG', 'crrm', '${CRRM_DEPLOY_DEPENDS}', '', d)} \
     ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'optee-os', '', d)} \
 "
-# xxd is a dependency of fspi_packer.sh
-DEPENDS += "xxd-native"
-DEPENDS:append:mx8m-generic-bsp = " u-boot-mkimage-native dtc-native"
-DEPENDS:append:mx93-generic-bsp = " u-boot-mkimage-native dtc-native"
 
+do_compile[deptask] = "do_deploy"
+do_compile[depends] += "${@bb.utils.contains('UBOOT_CONFIG', 'crrm', '${CRRM_INITRAMFS}:do_build', '', d)}"
+
+CRRM_DEPLOY_DEPENDS ?= "\
+    virtual/kernel \
+    ${CRRM_INITRAMFS}"
+CRRM_INITRAMFS ??= "imx-image-crrm-initramfs"
+
+inherit use-imx-security-controller-firmware uboot-config
 inherit deploy uuu_bootloader_tag
 
 UUU_BOOTLOADER = "imx-boot"
@@ -27,28 +40,19 @@ UUU_BOOTLOADER = "imx-boot"
 # Add CFLAGS with native INCDIR & LIBDIR for imx-mkimage build
 CFLAGS = "-O2 -Wall -std=c99 -I ${STAGING_INCDIR_NATIVE} -L ${STAGING_LIBDIR_NATIVE}"
 
-# This package aggregates output deployed by other packages,
-# so set the appropriate dependencies
-do_compile[depends] += " \
-    virtual/bootloader:do_deploy \
-    ${@' '.join('%s:do_deploy' % r for r in '${IMX_EXTRA_FIRMWARE}'.split() )} \
-    imx-atf:do_deploy \
-    ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'optee-os:do_deploy', '', d)} \
-"
-
 SC_FIRMWARE_NAME ?= "scfw_tcm.bin"
 
-OEI_ENABLE = "${@bb.utils.contains('DEPENDS', 'virtual/imx-oei', 'YES', 'NO', d)}"
 OEI_NAME ?= "oei-${OEI_CORE}-*.bin"
 
 ATF_MACHINE_NAME ?= "bl31-${ATF_PLATFORM}.bin"
+ATF_MACHINE_NAME:append = "${@bb.utils.contains('UBOOT_CONFIG', 'crrm', '-crrm', '', d)}"
 ATF_MACHINE_NAME:append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', '-optee', '', d)}"
 
 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)}"
@@ -58,43 +62,57 @@ 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:mx8m-generic-bsp  = "${S}/iMX8M"
+BOOT_STAGING = "${S}/${IMX_BOOT_SOC_TARGET}"
+BOOT_STAGING:mx8m-generic-bsp = "${S}/iMX8M"
 BOOT_STAGING:mx8dx-generic-bsp = "${S}/iMX8QX"
-BOOT_STAGING:mx91-generic-bsp  = "${S}/iMX91"
-BOOT_STAGING:mx93-generic-bsp  = "${S}/iMX93"
+BOOT_STAGING:mx91-generic-bsp = "${S}/iMX91"
+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:mx8-generic-bsp    = "mx8"
-SOC_FAMILY:mx8m-generic-bsp   = "mx8m"
-SOC_FAMILY:mx8x-generic-bsp   = "mx8x"
+SOC_FAMILY = "INVALID"
+SOC_FAMILY:mx8-generic-bsp = "mx8"
+SOC_FAMILY:mx8m-generic-bsp = "mx8m"
+SOC_FAMILY:mx8x-generic-bsp = "mx8x"
 SOC_FAMILY:mx8ulp-generic-bsp = "mx8ulp"
-SOC_FAMILY:mx91-generic-bsp   = "mx91"
-SOC_FAMILY:mx93-generic-bsp   = "mx93"
-SOC_FAMILY:mx943-generic-bsp  = "mx943"
-SOC_FAMILY:mx95-generic-bsp   = "mx95"
+SOC_FAMILY:mx91-generic-bsp = "mx91"
+SOC_FAMILY:mx93-generic-bsp = "mx93"
+SOC_FAMILY:mx943-generic-bsp = "mx943"
+SOC_FAMILY:mx95-generic-bsp = "mx95"
 
 REV_OPTION ?= "REV=${IMX_SOC_REV_UPPER}"
 
 MKIMAGE_EXTRA_ARGS ?= ""
-MKIMAGE_EXTRA_ARGS:mx943-nxp-bsp ?= " \
-    OEI=${OEI_ENABLE} \
+MKIMAGE_EXTRA_ARGS:mx943-nxp-bsp ?= "\
+    OEI=YES \
     LPDDR_TYPE=${DDR_TYPE} \
     MSEL=${MSEL_TYPE} \
 "
-MKIMAGE_EXTRA_ARGS:mx95-nxp-bsp ?= " \
-    OEI=${OEI_ENABLE} \
+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-verdin ?= " \
+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:mx95-nxp-bsp} \
     QSPI_HEADER=./scripts/fspi_header_133"
+MKIMAGE_EXTRA_ARGS:imx95-a1-19x19-verdin ?= "\
+    ${MKIMAGE_EXTRA_ARGS:imx95-19x19-verdin} \
+"
 
 UBOOT_DTB_BINARY ?= "u-boot.dtb"
 
+CRRM_FILES = "\
+    ${KERNEL_IMAGETYPE}.gz \
+    ${KERNEL_IMAGETYPE}_crrm.gz \
+    ${KERNEL_DEVICETREE_BASENAME}.dtb \
+    ${KERNEL_DEVICETREE_BASENAME}-crrm.dtb \
+    ${CRRM_INITRAMFS}-${MACHINE}.cpio.zst.u-boot"
+
 compile_mx8m() {
     bbnote 8MQ/8MM/8MN/8MP boot binary build
     for ddr_firmware in ${DDR_FIRMWARE_NAME}; do
@@ -188,6 +206,7 @@ compile_mx943() {
     bbnote i.MX 943 boot binary build
     compile_mx93
 
+    cp ${DEPLOY_DIR_IMAGE}/${OEI_NAME} ${BOOT_STAGING}
     cp ${DEPLOY_DIR_IMAGE}/${SYSTEM_MANAGER_FIRMWARE_NAME}.bin \
        ${BOOT_STAGING}/${SYSTEM_MANAGER_FIRMWARE_BASENAME}.bin
 }
@@ -196,6 +215,7 @@ compile_mx95() {
     bbnote i.MX 95 boot binary build
     compile_mx93
 
+    cp ${DEPLOY_DIR_IMAGE}/${OEI_NAME} ${BOOT_STAGING}
     cp ${DEPLOY_DIR_IMAGE}/${SYSTEM_MANAGER_FIRMWARE_NAME}.bin \
        ${BOOT_STAGING}/${SYSTEM_MANAGER_FIRMWARE_BASENAME}.bin
 }
@@ -210,9 +230,13 @@ do_compile() {
             cp ${DEPLOY_DIR_IMAGE}/tee.bin ${BOOT_STAGING}/tee.bin-stmm
         fi
     fi
-    # Copy OEI firmware to SoC target folder to mkimage
-    if [ "${OEI_ENABLE}" = "YES" ]; then
-        cp ${DEPLOY_DIR_IMAGE}/${OEI_NAME} ${BOOT_STAGING}
+    # Copy CRRM binaries to SoC target folder to mkimage
+    if [ ${@bb.utils.filter('UBOOT_CONFIG', 'crrm', d)} ]; then
+        for f in ${CRRM_FILES}; do
+            cp ${DEPLOY_DIR_IMAGE}/$f ${BOOT_STAGING}/$f
+        done
+        ln -sf ${CRRM_INITRAMFS}-${MACHINE}.cpio.zst.u-boot \
+            ${BOOT_STAGING}/initramfs.cpio.zst.u-boot
     fi
 
     for type in ${UBOOT_CONFIG}; do
@@ -250,11 +274,11 @@ do_compile() {
                         ;;
                     *stmm_capsule)
                         # target for flash_evk_stmm_capsule or
-                        # flash_singleboot_stmm_capsule
+                        # flash_singleboot_stmm_capsule or flash_lpboot_sm_all_stmm_capsule
                         cp ${RECIPE_SYSROOT_NATIVE}/${bindir}/mkeficapsule ${BOOT_STAGING}
-                        bbnote "building ${IMX_BOOT_SOC_TARGET} - TEE=tee.bin-stmm ${target}"
+                        bbnote "building ${IMX_BOOT_SOC_TARGET} - TEE=tee.bin-stmm ${MKIMAGE_EXTRA_ARGS} ${target}"
                         cp ${DEPLOY_DIR_IMAGE}/CRT.* ${BOOT_STAGING}
-                        make SOC=${IMX_BOOT_SOC_TARGET} TEE=tee.bin-stmm dtbs=${UBOOT_DTB_NAME} ${REV_OPTION} ${target}
+                        make SOC=${IMX_BOOT_SOC_TARGET} TEE=tee.bin-stmm ${MKIMAGE_EXTRA_ARGS} dtbs=${UBOOT_DTB_NAME} ${REV_OPTION} ${target}
                         ;;
                     *)
                         bbnote "building ${IMX_BOOT_SOC_TARGET} - ${REV_OPTION} ${MKIMAGE_EXTRA_ARGS} ${target}"
@@ -365,12 +389,14 @@ deploy_mx93() {
 
 deploy_mx943() {
     deploy_mx93
+    install -m 0644 ${BOOT_STAGING}/${OEI_NAME} ${DEPLOYDIR}/${BOOT_TOOLS}
     install -m 0644 ${BOOT_STAGING}/${SYSTEM_MANAGER_FIRMWARE_BASENAME}.bin \
                 ${DEPLOYDIR}/${BOOT_TOOLS}/${SYSTEM_MANAGER_FIRMWARE_NAME}.bin
 }
 
 deploy_mx95() {
     deploy_mx93
+    install -m 0644 ${BOOT_STAGING}/${OEI_NAME} ${DEPLOYDIR}/${BOOT_TOOLS}
     install -m 0644 ${BOOT_STAGING}/${SYSTEM_MANAGER_FIRMWARE_BASENAME}.bin \
                 ${DEPLOYDIR}/${BOOT_TOOLS}/${SYSTEM_MANAGER_FIRMWARE_NAME}.bin
 }
@@ -383,9 +409,12 @@ do_deploy() {
        install -m 0644 ${DEPLOY_DIR_IMAGE}/tee.bin ${DEPLOYDIR}/${BOOT_TOOLS}
     fi
 
-    # copy oei to deploy path
-    if [ "${OEI_ENABLE}" = "YES" ]; then
-        install -m 0644 ${BOOT_STAGING}/${OEI_NAME} ${DEPLOYDIR}/${BOOT_TOOLS}
+    # copy crrm to deploy path
+    if [ ${@bb.utils.filter('UBOOT_CONFIG', 'crrm', d)} ]; then
+        for f in ${CRRM_FILES}; do
+            cp ${DEPLOY_DIR_IMAGE}/$f                        ${DEPLOYDIR}/${BOOT_TOOLS}/$f
+        done
+        ln -s ${CRRM_INITRAMFS}-${MACHINE}.cpio.zst.u-boot   ${DEPLOYDIR}/${BOOT_TOOLS}/initramfs.cpio.zst.u-boot
     fi
 
     # copy makefile (soc.mak) for reference
diff --git a/recipes-bsp/imx-mkimage/imx-mkimage_git.bb b/recipes-bsp/imx-mkimage/imx-mkimage_git.bb
index f95f2a2ba..65f65002c 100644
--- a/recipes-bsp/imx-mkimage/imx-mkimage_git.bb
+++ b/recipes-bsp/imx-mkimage/imx-mkimage_git.bb
@@ -1,12 +1,14 @@
 # Copyright (C) 2016 Freescale Semiconductor
-# Copyright (C) 2017-2022 NXP
+# Copyright 2017-2022,2026 NXP
 
 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 a14d98241..b8d5d58cc 100644
--- a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
+++ b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
@@ -1,12 +1,13 @@
-# Copyright 2017-2025 NXP
+# Copyright 2017-2026 NXP
 
-DEPENDS = "zlib-native openssl-native"
+DEPENDS = "openssl-native zlib-native"
 
-SRC_URI = "git://github.com/nxp-imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH} \
+SRC_URI = "${IMX_MKIMAGE_SRC};branch=${SRCBRANCH} \
            file://0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch \
 "
-SRCBRANCH = "lf-6.12.20_2.0.0"
-SRCREV = "4c2e5b25232f5aa003976ddca9d1d2fb9667beb1"
+IMX_MKIMAGE_SRC ?= "git://github.com/nxp-imx/imx-mkimage.git;protocol=https"
+SRCBRANCH = "lf-6.18.2_1.0.0"
+SRCREV = "c0debd7c0b4a125bd3ca66bc68f1915882b2bb62"
 
 BOOT_TOOLS = "imx-boot-tools"
 SYSROOT_DIRS += "/boot"