From a0b70c3ca94eca682208ee97fcbcaded67c87c16 Mon Sep 17 00:00:00 2001
From: Gabriel Valcazar <gabriel.valcazar@digi.com>
Date: Mon, 13 Jan 2020 14:14:55 +0100
Subject: [PATCH] imx-seco: sync with meta-fsl-bsp-release branch
 sumo-4.14.98-2.3.0

Update to v2.5.4 and add new recipe imx-seco-libs. For the time being, use the
B0 firmware for all i.MX8QXP platforms and leave C0 support in a comment.

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

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
 .../recipes-bsp/imx-seco/imx-seco-libs_git.bb | 24 +++++++++++++++++++
 .../{imx-seco_2.3.1.bb => imx-seco_2.5.4.bb}  | 14 ++++++-----
 2 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100644 meta-digi-arm/recipes-bsp/imx-seco/imx-seco-libs_git.bb
 rename meta-digi-arm/recipes-bsp/imx-seco/{imx-seco_2.3.1.bb => imx-seco_2.5.4.bb} (51%)

diff --git a/meta-digi-arm/recipes-bsp/imx-seco/imx-seco-libs_git.bb b/meta-digi-arm/recipes-bsp/imx-seco/imx-seco-libs_git.bb
new file mode 100644
index 000000000..1a9d4417e
--- /dev/null
+++ b/meta-digi-arm/recipes-bsp/imx-seco/imx-seco-libs_git.bb
@@ -0,0 +1,24 @@
+# Copyright 2019 NXP
+
+SUMMARY = "NXP i.MX SECO library"
+DESCRIPTION = "NXP IMX SECO library"
+SECTION = "base"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://LA_OPT_NXP_Software_License.htm;md5=6a8fcab25f3d3f5c2898456114b91f44"
+
+DEPENDS = "zlib"
+
+SRCBRANCH = "master"
+SECO_LIB_SRC ?= "git://github.com/NXP/imx-seco-libs.git;protocol=https"
+SRC_URI = "${SECO_LIB_SRC};branch=${SRCBRANCH}"
+SRCREV = "1afb4e66ba26cc723bd5bf96eb2e79a6c81daa70"
+
+S = "${WORKDIR}/git"
+
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+do_install () {
+	oe_runmake DESTDIR=${D} install
+}
+
+COMPATIBLE_MACHINE = "(mx8qm|mx8qxp)"
diff --git a/meta-digi-arm/recipes-bsp/imx-seco/imx-seco_2.3.1.bb b/meta-digi-arm/recipes-bsp/imx-seco/imx-seco_2.5.4.bb
similarity index 51%
rename from meta-digi-arm/recipes-bsp/imx-seco/imx-seco_2.3.1.bb
rename to meta-digi-arm/recipes-bsp/imx-seco/imx-seco_2.5.4.bb
index bedaa7d2b..9b3b2684a 100644
--- a/meta-digi-arm/recipes-bsp/imx-seco/imx-seco_2.3.1.bb
+++ b/meta-digi-arm/recipes-bsp/imx-seco/imx-seco_2.5.4.bb
@@ -4,22 +4,24 @@ SUMMARY = "NXP i.MX SECO firmware"
 DESCRIPTION = "NXP IMX SECO firmware"
 SECTION = "base"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=fb0303e4ee8b0e71c094171e2272bd44"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fd4b227530cd88a82af6a5982cfb724d"
 
 inherit fsl-eula-unpack deploy
 
 SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true "
 
-SRC_URI[md5sum] = "cf8d6bbf93f0aa6e1049f1098a0f7e0f"
-SRC_URI[sha256sum] = "b429ac58b2ea1771b3fdf7ae87bf1d37ccaf596bde01a5ecccae27b2145f6824"
+SRC_URI[md5sum] = "52f71d8965e99cd162a91a326e2e5dd8"
+SRC_URI[sha256sum] = "552076de1dfcf880bf1ccf208ad646dee0f32454bf4f620f71b8699c95ccb96e"
 
 do_compile[noexec] = "1"
 
 do_install[noexec] = "1"
 
-SECO_FIRMWARE_NAME ?= "mx8qm-ahab-container.img"
-SECO_FIRMWARE_NAME_mx8qm  = "mx8qm-ahab-container.img"
-SECO_FIRMWARE_NAME_mx8qxp = "mx8qx-ahab-container.img"
+SECO_FIRMWARE_NAME ?= "mx8qmb0-ahab-container.img"
+SECO_FIRMWARE_NAME_mx8qm  = "mx8qmb0-ahab-container.img"
+SECO_FIRMWARE_NAME_mx8qxp = "mx8qxb0-ahab-container.img"
+# i.MX8QXP C0 support
+#SECO_FIRMWARE_NAME_mx8qxp = "mx8qxc0-ahab-container.img"
 
 addtask deploy after do_install
 do_deploy () {