From 07201c83b2b9ff1fff0eb069f6ed9a5b8c0f0034 Mon Sep 17 00:00:00 2001
From: Timo Schuster <timo.schuster@leica-microsystems.com>
Date: Thu, 5 Oct 2023 14:22:19 +0200
Subject: imx-boot: Prevent unnecessary cp of UBOOT_DTB_NAME_EXTRA if
 UBOOT_SIGN_ENABLE is set

---
 recipes-bsp/imx-mkimage/imx-boot_1.0.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'recipes-bsp')

diff --git a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
index 8a27b166..7a623e55 100644
--- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
+++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
@@ -85,11 +85,11 @@ compile_mx8m() {
     cp ${DEPLOY_DIR_IMAGE}/u-boot-spl.bin-${MACHINE}-${UBOOT_CONFIG_EXTRA} \
                                                              ${BOOT_STAGING}/u-boot-spl.bin
 
-    cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${UBOOT_DTB_NAME_EXTRA}   ${BOOT_STAGING}
-
     if [ "x${UBOOT_SIGN_ENABLE}" = "x1" ] ; then
         # Use DTB binary patched with signature node
-        cp ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_BINARY} ${BOOT_STAGING}/${UBOOT_DTB_NAME}
+        cp ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_BINARY} ${BOOT_STAGING}/${UBOOT_DTB_NAME_EXTRA}
+    else
+        cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${UBOOT_DTB_NAME_EXTRA}   ${BOOT_STAGING}
     fi
 
     cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${UBOOT_CONFIG_EXTRA} \
-- 
cgit v1.2.3-54-g00ecf