From 5eaa4d2d425dfbd1332a7a646eddbda450a7d3de Mon Sep 17 00:00:00 2001
From: Arturo Buzarra <arturo.buzarra@digi.com>
Date: Mon, 26 Apr 2021 16:41:15 +0200
Subject: [PATCH] gatesgarth migration: imx-boot: Sync with BSP release
 rel_imx_5.10.9_1.0.0

https://jira.digi.com/browse/DEL-7508

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
---
 meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bb     | 6 +-----
 meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_git.inc | 4 ++--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
index b1e8ee7d7..42c323c28 100644
--- a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
+++ b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
@@ -109,11 +109,7 @@ compile_mx8m() {
     cp ${DEPLOY_DIR_IMAGE}/signed_hdmi_imx8m.bin             ${BOOT_STAGING}
     cp ${DEPLOY_DIR_IMAGE}/u-boot-spl.bin-${MACHINE}-${UBOOT_CONFIG} \
                                                              ${BOOT_STAGING}/u-boot-spl.bin
-    if [ "${MACHINE}" = "imx8mmevk-qcawifi" ]; then
-        cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${UBOOT_DTB_NAME}   ${BOOT_STAGING}/imx8mm-evk.dtb
-    else
-        cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${UBOOT_DTB_NAME}   ${BOOT_STAGING}
-    fi
+    cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${UBOOT_DTB_NAME}   ${BOOT_STAGING}
     cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${UBOOT_CONFIG} \
                                                              ${BOOT_STAGING}/u-boot-nodtb.bin
     bbnote "\
diff --git a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_git.inc b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
index 24d67b1e6..80e864eb7 100644
--- a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
+++ b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
@@ -2,10 +2,10 @@
 
 DEPENDS = "zlib openssl"
 
-SRCBRANCH = "imx_5.4.70_2.3.0"
+SRCBRANCH = "lf-5.10.y_1.0.0"
 IMX_MKIMAGE_SRC ?= "git://source.codeaurora.org/external/imx/imx-mkimage.git;protocol=https"
 SRC_URI = "${IMX_MKIMAGE_SRC};branch=${SRCBRANCH}"
-SRCREV = "8947fea369ab3932259630232cfb9f87b8f9dda1"
+SRCREV = "66fa5777341fd116a5616bd85491621f2e1c74bf"
 S = "${WORKDIR}/git"
 
 BOOT_TOOLS = "imx-boot-tools"