From 3d6f1b0e3a4904438efaff51f146472c39654907 Mon Sep 17 00:00:00 2001
From: "Weisser, Pascal" <pascal.weisser.ext@karlstorz.com>
Date: Wed, 8 Jan 2025 11:08:09 +0100
Subject: [PATCH] imx-base: Avoid unnecessary device tree blob files.

When using fitImage as kernel image type the fitImage already contains the
device tree blob files. So, it's not necessary to add them to the image
boot files.

Signed-off-by: Weisser, Pascal <pascal.weisser.ext@karlstorz.com>
(cherry picked from commit cec6d45699ec5fc30b755f156067a07879ea404a)
---
 conf/machine/include/imx-base.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index baca3fc42..32da2ea50 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -637,7 +637,7 @@ IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}"
 
 IMAGE_BOOT_FILES ?= " \
     ${KERNEL_IMAGETYPE} \
-    ${@make_dtb_boot_files(d)} \
+    ${@bb.utils.contains('KERNEL_IMAGETYPE', 'fitImage', '', '${@make_dtb_boot_files(d)}', d)} \
     ${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_BOOT_IMAGE}', '', d)} \
 "