From 125debb9c12d670ed8236bcae8f396b31cd5253c Mon Sep 17 00:00:00 2001
From: Hector Bujanda <hector.bujanda@digi.com>
Date: Wed, 28 Oct 2020 01:24:50 +0100
Subject: [PATCH] recipes-bsp: imx-mkimage: Update recipes to new BSP release
 imx_5.4.47_2.2.0

Includes:
imx-boot_1.0.bb: Update M4 binary name for i.MX 8QM [YOCIMX-4866]

    8QM M4 demos unified the binary name.
    Change name make it more easy for understanding.

imx-boot: Update the build option for iMX 8DXL Phantom C0 new boards [YOCIMX-4663]

Signed-off-by: Hector Bujanda <Hector.Bujanda@digi.com>
---
 meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bb     | 5 +++--
 meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_git.inc | 4 ++--
 2 files changed, 5 insertions(+), 4 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 80c443211..ebf2e6a53 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
@@ -95,6 +95,7 @@ SOC_FAMILY_mx8x = "mx8x"
 
 REV_OPTION ?= ""
 REV_OPTION_mx8qxpc0 = "REV=C0"
+REV_OPTION_mx8phantomdxl = "REV=C0"
 
 compile_mx8m() {
     bbnote 8MQ/8MM boot binary build
@@ -126,9 +127,9 @@ compile_mx8() {
         cp ${DEPLOY_DIR_IMAGE}/u-boot-spl.bin-${MACHINE}-${UBOOT_CONFIG} \
                                                              ${BOOT_STAGING}/u-boot-spl.bin
     fi
-    cp ${DEPLOY_DIR_IMAGE}/imx8qm_m4_0_TCM_power_mode_switch_m40.bin \
+    cp ${DEPLOY_DIR_IMAGE}/imx8qm_m4_TCM_power_mode_switch_m40.bin \
                                                              ${BOOT_STAGING}/m4_image.bin
-    cp ${DEPLOY_DIR_IMAGE}/imx8qm_m4_1_TCM_power_mode_switch_m41.bin \
+    cp ${DEPLOY_DIR_IMAGE}/imx8qm_m4_TCM_power_mode_switch_m41.bin \
                                                              ${BOOT_STAGING}/m4_1_image.bin
     cp ${DEPLOY_DIR_IMAGE}/${SECO_FIRMWARE_NAME}             ${BOOT_STAGING}
 }
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 8e21029dc..2e78eff48 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.24_2.1.0"
+SRCBRANCH = "imx_5.4.47_2.2.0"
 IMX_MKIMAGE_SRC ?= "git://source.codeaurora.org/external/imx/imx-mkimage.git;protocol=https"
 SRC_URI = "${IMX_MKIMAGE_SRC};branch=${SRCBRANCH}"
-SRCREV = "6745ccdcf15384891639b7ced3aa6ce938682365"
+SRCREV = "8da5cd231881df44b5fa21a36820536d86e413db"
 S = "${WORKDIR}/git"
 
 BOOT_TOOLS = "imx-boot-tools"