3 files changed, 0 insertions, 11 deletions

diff --git a/conf/machine/imx8mmevk.conf b/conf/machine/imx8mmevk.conf
index 82001101..44b3249f 100644
--- a/conf/machine/imx8mmevk.conf
+++ b/conf/machine/imx8mmevk.conf
@@ -19,7 +19,6 @@ KERNEL_DEVICETREE += "freescale/fsl-imx8mm-evk-m4.dtb "
 KERNEL_DEVICETREE += "freescale/fsl-imx8mm-evk-rm67191.dtb "
 KERNEL_DEVICETREE += "freescale/fsl-imx8mm-evk-root.dtb"
 
-IMAGE_BOOTFILES_DEPENDS += "imx-m4-demos:do_deploy"
 IMAGE_BOOTFILES += "imx8mm_m4_TCM_hello_world.bin \
                     imx8mm_m4_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
                     imx8mm_m4_TCM_rpmsg_lite_str_echo_rtos.bin \
diff --git a/conf/machine/imx8mqevk.conf b/conf/machine/imx8mqevk.conf
index f3280b9c..96f12203 100644
--- a/conf/machine/imx8mqevk.conf
+++ b/conf/machine/imx8mqevk.conf
@@ -21,7 +21,6 @@ KERNEL_DEVICETREE += "freescale/fsl-imx8mq-evk-lcdif-adv7535.dtb"
 KERNEL_DEVICETREE += "freescale/fsl-imx8mq-evk-m4.dtb freescale/fsl-imx8mq-evk-mipi-csi2.dtb"
 KERNEL_DEVICETREE += "freescale/fsl-imx8mq-evk-pcie1-m2.dtb freescale/fsl-imx8mq-evk-pdm.dtb"
 
-IMAGE_BOOTFILES_DEPENDS += "imx-m4-demos:do_deploy"
 IMAGE_BOOTFILES += "imx8mq_m4_TCM_hello_world.bin imx8mq_m4_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin imx8mq_m4_TCM_rpmsg_lite_str_echo_rtos.bin"
 
 UBOOT_CONFIG ??= "sd"
diff --git a/recipes-bsp/imx-mkimage/imx-boot_0.2.bb b/recipes-bsp/imx-mkimage/imx-boot_0.2.bb
index b232ed52..7bd50312 100644
--- a/recipes-bsp/imx-mkimage/imx-boot_0.2.bb
+++ b/recipes-bsp/imx-mkimage/imx-boot_0.2.bb
@@ -25,21 +25,12 @@ inherit deploy
 # Add CFLAGS with native INCDIR & LIBDIR for imx-mkimage build
 CFLAGS = "-O2 -Wall -std=c99 -static -I ${STAGING_INCDIR_NATIVE} -L ${STAGING_LIBDIR_NATIVE}"
 
-# For i.MX 8, this package aggregates the imx-m4-demos
-# output. Note that this aggregation replaces the aggregation
-# that would otherwise be done in the image build as controlled
-# by IMAGE_BOOTFILES_DEPENDS and IMAGE_BOOTFILES in image_types_fsl.bbclass
-IMX_M4_DEMOS        = ""
-IMX_M4_DEMOS_mx8qm  = "imx-m4-demos:do_deploy"
-IMX_M4_DEMOS_mx8qxp = "imx-m4-demos:do_deploy"
-
 # 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 \
-    ${IMX_M4_DEMOS} \
 "
 
 SC_FIRMWARE_NAME ?= "scfw_tcm.bin"