From d96004a0439dd465e14a916d654d6acaa177bb25 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 6 May 2026 16:29:11 +0200 Subject: [PATCH] imx-boot: stop bundling ccimx95 Cortex-M7 demo firmware Drop the imx-m7-demos dependency and build only the A55 boot target, since Cortex-M firmware is board-specific and should not be selected as a default SoC artifact. This follows the same cleanup done upstream in meta-freescale commit 598f047ef112a0c88f699714cd10dc87c8460c5a. https://onedigi.atlassian.net/browse/DEL-9882 Signed-off-by: Javier Viguera (cherry picked from commit 81cf596834382f87701d701277e13c97316de978) --- meta-digi-arm/conf/machine/ccimx95-dvk.conf | 2 +- .../imx-mkimage/imx-boot_1.0.bbappend | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/meta-digi-arm/conf/machine/ccimx95-dvk.conf b/meta-digi-arm/conf/machine/ccimx95-dvk.conf index bf615c96f..6be54589e 100644 --- a/meta-digi-arm/conf/machine/ccimx95-dvk.conf +++ b/meta-digi-arm/conf/machine/ccimx95-dvk.conf @@ -44,7 +44,7 @@ UBOOT_INSTALL_SD_INDEX = "1" # imx-boot configurations ATF_PLATFORM = "imx95" IMX_BOOT_SOC_TARGET = "iMX95" -IMXBOOT_TARGETS = "flash_all flash_a55" +IMXBOOT_TARGETS = "flash_a55" SYSTEM_MANAGER_CONFIG ?= "ccimx95dvk" SYSTEM_MANAGER_FIRMWARE_BASENAME ?= "m33_image" SYSTEM_MANAGER_FIRMWARE_NAME ?= "${SYSTEM_MANAGER_FIRMWARE_BASENAME}-${SYSTEM_MANAGER_CONFIG}" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend index b132a77ce..6a4506e2a 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend @@ -15,18 +15,6 @@ SRC_URI:append:dey = " \ file://0008-imx95-soc.mak-capture-commands-output-into-a-log-fil.patch \ " -IMX_CORTEXM_DEMOS = "" -IMX_CORTEXM_DEMOS:ccimx95 = "imx-m7-demos:do_deploy" - -CORTEXM_DEFAULT_IMAGE = "" -CORTEXM_DEFAULT_IMAGE:ccimx95 = "imx95-19x19-evk_m7_TCM_power_mode_switch.bin" - -do_compile[depends] += "${IMX_CORTEXM_DEMOS}" - -compile_mx95:append:ccimx95() { - cp ${DEPLOY_DIR_IMAGE}/mcore-demos/${CORTEXM_DEFAULT_IMAGE} ${BOOT_STAGING}/m7_image.bin -} - # Revert compile_mx8m() to how it was in kirkstone branch of meta-freescale, # otherwise, a dead symlink is created in place of the dtb compile_mx8m() { @@ -126,10 +114,6 @@ generate_symlinks() { ln -sf imx-boot-${MACHINE}.bin-${IMAGE_IMXBOOT_TARGET} ${DEPLOYDIR}/imx-boot } -deploy_mx95:append:ccimx95() { - install -m 0644 ${DEPLOY_DIR_IMAGE}/mcore-demos/${CORTEXM_DEFAULT_IMAGE} ${DEPLOYDIR}/${BOOT_TOOLS} -} - do_deploy:append:ccimx8m() { generate_symlinks for target in ${IMXBOOT_TARGETS}; do