From d9f7ed8a2d587074e2a105c391cc89d715552d57 Mon Sep 17 00:00:00 2001
From: Arturo Buzarra <arturo.buzarra@digi.com>
Date: Tue, 7 Apr 2020 13:17:06 +0200
Subject: [PATCH] zeus migration: imx-seco: update recipe to v2.6.1

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

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
---
 .../recipes-bsp/imx-seco/imx-seco-libs_git.bb |  9 +++---
 .../recipes-bsp/imx-seco/imx-seco.inc         |  6 ++++
 .../recipes-bsp/imx-seco/imx-seco_2.5.4.bb    | 32 -------------------
 .../recipes-bsp/imx-seco/imx-seco_2.6.1.bb    | 28 ++++++++++++++++
 4 files changed, 39 insertions(+), 36 deletions(-)
 create mode 100644 meta-digi-arm/recipes-bsp/imx-seco/imx-seco.inc
 delete mode 100644 meta-digi-arm/recipes-bsp/imx-seco/imx-seco_2.5.4.bb
 create mode 100644 meta-digi-arm/recipes-bsp/imx-seco/imx-seco_2.6.1.bb

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
index 1a9d4417e..c7d122930 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 2019 NXP
+# Copyright 2019-20 NXP
 
 SUMMARY = "NXP i.MX SECO library"
 DESCRIPTION = "NXP IMX SECO library"
@@ -8,10 +8,10 @@ LIC_FILES_CHKSUM = "file://LA_OPT_NXP_Software_License.htm;md5=6a8fcab25f3d3f5c2
 
 DEPENDS = "zlib"
 
-SRCBRANCH = "master"
+SRCBRANCH = "imx_5.4.3_2.0.0"
 SECO_LIB_SRC ?= "git://github.com/NXP/imx-seco-libs.git;protocol=https"
 SRC_URI = "${SECO_LIB_SRC};branch=${SRCBRANCH}"
-SRCREV = "1afb4e66ba26cc723bd5bf96eb2e79a6c81daa70"
+SRCREV = "0fe2ad0d0f0ef88387aaf72e7a23c9b598340c3b"
 
 S = "${WORKDIR}/git"
 
@@ -21,4 +21,5 @@ do_install () {
 	oe_runmake DESTDIR=${D} install
 }
 
-COMPATIBLE_MACHINE = "(mx8qm|mx8qxp)"
+COMPATIBLE_MACHINE = "(mx8)"
+COMPATIBLE_MACHINE_mx8m = "(^$)"
diff --git a/meta-digi-arm/recipes-bsp/imx-seco/imx-seco.inc b/meta-digi-arm/recipes-bsp/imx-seco/imx-seco.inc
new file mode 100644
index 000000000..ab6b19724
--- /dev/null
+++ b/meta-digi-arm/recipes-bsp/imx-seco/imx-seco.inc
@@ -0,0 +1,6 @@
+SECO_FIRMWARE_NAME              ?= "UNSUPPORTED"
+SECO_FIRMWARE_NAME_mx8qm         = "mx8qmb0-ahab-container.img"
+SECO_FIRMWARE_NAME_mx8qxp        = "mx8qxb0-ahab-container.img"
+SECO_FIRMWARE_NAME_mx8qxpc0      = "mx8qxc0-ahab-container.img"
+SECO_FIRMWARE_NAME_mx8phantomdxl = "mx8qxb0-ahab-container.img"
+SECO_FIRMWARE_NAME_mx8dxl        = "mx8dxla0-ahab-container.img"
diff --git a/meta-digi-arm/recipes-bsp/imx-seco/imx-seco_2.5.4.bb b/meta-digi-arm/recipes-bsp/imx-seco/imx-seco_2.5.4.bb
deleted file mode 100644
index 9b3b2684a..000000000
--- a/meta-digi-arm/recipes-bsp/imx-seco/imx-seco_2.5.4.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2019 NXP
-
-SUMMARY = "NXP i.MX SECO firmware"
-DESCRIPTION = "NXP IMX SECO firmware"
-SECTION = "base"
-LICENSE = "Proprietary"
-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] = "52f71d8965e99cd162a91a326e2e5dd8"
-SRC_URI[sha256sum] = "552076de1dfcf880bf1ccf208ad646dee0f32454bf4f620f71b8699c95ccb96e"
-
-do_compile[noexec] = "1"
-
-do_install[noexec] = "1"
-
-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 () {
-    # Deploy i.MX8 SECO firmware files
-    install -m 0644 ${S}/firmware/seco/${SECO_FIRMWARE_NAME} ${DEPLOYDIR}
-}
-
-COMPATIBLE_MACHINE = "(mx8qm|mx8qxp)"
diff --git a/meta-digi-arm/recipes-bsp/imx-seco/imx-seco_2.6.1.bb b/meta-digi-arm/recipes-bsp/imx-seco/imx-seco_2.6.1.bb
new file mode 100644
index 000000000..d4de13cb2
--- /dev/null
+++ b/meta-digi-arm/recipes-bsp/imx-seco/imx-seco_2.6.1.bb
@@ -0,0 +1,28 @@
+# Copyright 2019-2020 NXP
+
+SUMMARY = "NXP i.MX SECO firmware"
+DESCRIPTION = "NXP IMX SECO firmware"
+SECTION = "base"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://COPYING;md5=228c72f2a91452b8a03c4cab30f30ef9" 
+
+require imx-seco.inc
+inherit fsl-eula-unpack deploy
+
+SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
+
+SRC_URI[md5sum] = "bd0aecaa6d6e031003de648387db029d"
+SRC_URI[sha256sum] = "7eb4e4695a00ed259177b7ccc4c3b8643c6479502e9365e9d83df906c52fb8d6"
+
+do_compile[noexec] = "1"
+
+do_install[noexec] = "1"
+
+addtask deploy after do_install
+do_deploy () {
+    # Deploy i.MX8 SECO firmware files
+    install -m 0644 ${S}/firmware/seco/${SECO_FIRMWARE_NAME} ${DEPLOYDIR}
+}
+
+COMPATIBLE_MACHINE = "(mx8)"
+COMPATIBLE_MACHINE_mx8m = "(^$)"