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

Includes:
imx-seco-libs: Switch branch to imx_5.4.47_2.2.0
multilib: imx-seco-libs: Fix LIBDIR
imx-seco.inc:  use c0 for 8dxl phantom with new c0 boards

Signed-off-by: Hector Bujanda <Hector.Bujanda@digi.com>
---
 ...001-Makefile-Fix-LIBDIR-for-multilib.patch | 26 +++++++++++++++++++
 .../recipes-bsp/imx-seco/imx-seco-libs_git.bb |  8 +++---
 .../recipes-bsp/imx-seco/imx-seco.inc         |  2 +-
 .../{imx-seco_3.6.3.bb => imx-seco_3.7.1.bb}  |  6 ++---
 4 files changed, 35 insertions(+), 7 deletions(-)
 create mode 100644 meta-digi-arm/recipes-bsp/imx-seco/0001-Makefile-Fix-LIBDIR-for-multilib.patch
 rename meta-digi-arm/recipes-bsp/imx-seco/{imx-seco_3.6.3.bb => imx-seco_3.7.1.bb} (70%)

diff --git a/meta-digi-arm/recipes-bsp/imx-seco/0001-Makefile-Fix-LIBDIR-for-multilib.patch b/meta-digi-arm/recipes-bsp/imx-seco/0001-Makefile-Fix-LIBDIR-for-multilib.patch
new file mode 100644
index 000000000..d1784e255
--- /dev/null
+++ b/meta-digi-arm/recipes-bsp/imx-seco/0001-Makefile-Fix-LIBDIR-for-multilib.patch
@@ -0,0 +1,26 @@
+From 9e89d173a7fab97c913960344ae01dfa409b6258 Mon Sep 17 00:00:00 2001
+From: Cristinel Panfir <cristinel.panfir@nxp.com>
+Date: Mon, 27 Jul 2020 18:55:30 +0000
+Subject: [PATCH] Makefile: Fix LIBDIR for multilib
+
+Signed-off-by: Cristinel Panfir <cristinel.panfir@nxp.com>
+---
+ Makefile | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index b16cebf..492d700 100644
+--- a/Makefile
++++ b/Makefile
+@@ -4,7 +4,8 @@ all: she_test hsm_test v2x_test she_lib.a seco_nvm_manager.a sm_lib.a
+ CFLAGS = -O1 -Werror -fPIC
+ DESTDIR ?= export
+ BINDIR ?= /usr/bin
+-LIBDIR ?= /usr/lib
++base_libdir ?= /lib
++LIBDIR ?= /usr/$(base_libdir)
+ INCLUDEDIR ?= /usr/include
+ 
+ ifdef COVERAGE
+-- 
+2.7.4
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 0ea18cf5c..eb98afa6a 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
@@ -8,10 +8,12 @@ LIC_FILES_CHKSUM = "file://EULA.txt;md5=228c72f2a91452b8a03c4cab30f30ef9"
 
 DEPENDS = "zlib"
 
-SRCBRANCH = "imx_5.4.24_2.1.0"
+SRCBRANCH = "imx_5.4.47_2.2.0"
 SECO_LIB_SRC ?= "git://github.com/NXP/imx-seco-libs.git;protocol=https"
-SRC_URI = "${SECO_LIB_SRC};branch=${SRCBRANCH}"
-SRCREV = "a4faaa474e49fa0d3668db466739834fe45a6767" 
+SRC_URI = "${SECO_LIB_SRC};branch=${SRCBRANCH} \
+        file://0001-Makefile-Fix-LIBDIR-for-multilib.patch \
+"
+SRCREV = "5932c1e5240eb36c3cddc7bcbdc7abd9bd8b562c" 
 
 S = "${WORKDIR}/git"
 
diff --git a/meta-digi-arm/recipes-bsp/imx-seco/imx-seco.inc b/meta-digi-arm/recipes-bsp/imx-seco/imx-seco.inc
index 4e7f1a665..e40d91ea5 100644
--- a/meta-digi-arm/recipes-bsp/imx-seco/imx-seco.inc
+++ b/meta-digi-arm/recipes-bsp/imx-seco/imx-seco.inc
@@ -2,7 +2,7 @@ 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_mx8phantomdxl = "mx8qxc0-ahab-container.img"
 SECO_FIRMWARE_NAME_mx8dxl        = "mx8dxla0-ahab-container.img"
 
 # For the ccimx8x, we generate images for both the B0 and the C0 revisions of
diff --git a/meta-digi-arm/recipes-bsp/imx-seco/imx-seco_3.6.3.bb b/meta-digi-arm/recipes-bsp/imx-seco/imx-seco_3.7.1.bb
similarity index 70%
rename from meta-digi-arm/recipes-bsp/imx-seco/imx-seco_3.6.3.bb
rename to meta-digi-arm/recipes-bsp/imx-seco/imx-seco_3.7.1.bb
index 51fcd69b2..78bbfc7f1 100644
--- a/meta-digi-arm/recipes-bsp/imx-seco/imx-seco_3.6.3.bb
+++ b/meta-digi-arm/recipes-bsp/imx-seco/imx-seco_3.7.1.bb
@@ -4,15 +4,15 @@ SUMMARY = "NXP i.MX SECO firmware"
 DESCRIPTION = "NXP IMX SECO firmware"
 SECTION = "base"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=228c72f2a91452b8a03c4cab30f30ef9" 
+LIC_FILES_CHKSUM = "file://COPYING;md5=983e4c77621568488dd902b27e0c2143" 
 
 require imx-seco.inc
 inherit fsl-eula-unpack deploy
 
 SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
 
-SRC_URI[md5sum] = "22a47e14e3f2e713b4b1b2b7ff768b11"
-SRC_URI[sha256sum] = "52ba07633e0f8707d8c26724b5cd03ef96444c8de1e0e134acac50acacf3e7dd"
+SRC_URI[md5sum] = "29d563790bf46629a083ba031a7de46d"
+SRC_URI[sha256sum] = "b09f63139df6c4dfef3533570cd60b22eb4c48eed05f314268178e80b8de40fc"
 
 do_compile[noexec] = "1"