From 02223e2df5af81c09b350d612cf24f946fef3423 Mon Sep 17 00:00:00 2001
From: Gabriel Valcazar <gabriel.valcazar@digi.com>
Date: Wed, 25 Jul 2018 13:15:54 +0200
Subject: [PATCH] imx-mkimage: update recipe to use the 8qxp_beta2 branch

In order for Yocto to append all the necessary firmware binaries to the U-Boot
image, this recipe needs to be up to date.

Also, remove the older hardcoded SRCREV in our .bbappend file. The file that
gets patched hasn't been modified since beta1, so our patch apllies cleanly to
beta2.

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

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
 .../recipes-bsp/imx-mkimage/imx-mkimage_%.bbappend        | 3 ---
 meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_git.bb  | 8 ++------
 meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_git.inc | 8 ++++++++
 3 files changed, 10 insertions(+), 9 deletions(-)
 create mode 100644 meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_git.inc

diff --git a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_%.bbappend b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_%.bbappend
index 5a9ceafa1..c8ba2530d 100644
--- a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_%.bbappend
+++ b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_%.bbappend
@@ -1,8 +1,5 @@
 # Copyright (C) 2018 Digi International, Inc.
 
-# Tag rel_imx_4.9.51_8qxp_beta
-SRCBRANCH = "imx_4.9.51_imx8_beta2"
-SRCREV = "4352f717fe643c1aaed3feb55931d92d3b83027a"
 SRC_URI_append = " \
     file://0001-cc8x-configure-DDRC-for-Micron-MT53B256M32D1.patch \
 "
diff --git a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_git.bb b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_git.bb
index fe379bc2c..a9c8a2478 100644
--- a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_git.bb
+++ b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_git.bb
@@ -6,13 +6,9 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 SECTION = "BSP"
 
-inherit native deploy
-DEPENDS = "zlib-native"
+require imx-mkimage_git.inc
 
-IMX_MKIMAGE_SRC ?= "git://source.codeaurora.org/external/imx/imx-mkimage.git;protocol=https"
-SRCBRANCH ?= "imx_4.9.51_imx8_beta1"
-SRC_URI = "${IMX_MKIMAGE_SRC};branch=${SRCBRANCH}"
-SRCREV = "da676d6783943fa94238f4ab21e71ec25ac31b24"
+inherit native deploy
 
 S = "${WORKDIR}/git"
 
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
new file mode 100644
index 000000000..82519f97c
--- /dev/null
+++ b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
@@ -0,0 +1,8 @@
+# Copyright 2017-2018 NXP
+
+IMX_MKIMAGE_SRC ?= "git://source.codeaurora.org/external/imx/imx-mkimage.git;protocol=https"
+SRCBRANCH = "imx_4.9.88_imx8qxp_beta2"
+SRC_URI = "${IMX_MKIMAGE_SRC};branch=${SRCBRANCH}"
+SRCREV = "5c18f544c460747daed2844714c49685ed6ce897"
+
+DEPENDS = "zlib-native openssl-native"