From 98999fbf79f53b4f65c878549d183ac4fb7a6c9e Mon Sep 17 00:00:00 2001
From: Mike Engel <Mike.Engel@digi.com>
Date: Fri, 3 Jul 2020 12:07:21 +0200
Subject: [PATCH] imx-m4-demos: Update imx8qx to new package v2.8.0 to EULA
 228c72f

This commit updates the M4 demos to new package version v2.8.0
of the new NXP release imx-5.4.24-2.1.0.

Signed-off-by: Mike Engel <Mike.Engel@digi.com>
---
 .../recipes-cpu/m4-demos/imx-m4-demos-2.inc         | 13 +++++++++++--
 .../recipes-cpu/m4-demos/imx-m4-demos_2.7.0.bb      | 11 -----------
 .../recipes-cpu/m4-demos/imx-m4-demos_2.8.0.bb      | 11 +++++++++++
 3 files changed, 22 insertions(+), 13 deletions(-)
 delete mode 100644 meta-digi-arm/recipes-cpu/m4-demos/imx-m4-demos_2.7.0.bb
 create mode 100644 meta-digi-arm/recipes-cpu/m4-demos/imx-m4-demos_2.8.0.bb

diff --git a/meta-digi-arm/recipes-cpu/m4-demos/imx-m4-demos-2.inc b/meta-digi-arm/recipes-cpu/m4-demos/imx-m4-demos-2.inc
index af6ac93b5..0bc715dc7 100644
--- a/meta-digi-arm/recipes-cpu/m4-demos/imx-m4-demos-2.inc
+++ b/meta-digi-arm/recipes-cpu/m4-demos/imx-m4-demos-2.inc
@@ -13,16 +13,25 @@ SOC_mx8mm   = "imx8mm"
 SOC_mx8mq   = "imx8mq"
 SOC_mx8qm   = "imx8qm"
 SOC_mx8qxp  = "imx8qx"
+SOC_mx8dxl  = "imx8dxl"
 
 IMX_PACKAGE_NAME = "${SOC}-m4-demo-${PV}"
 SRC_URI_append = ";name=${SOC}"
 
 SCR = "SCR-${SOC}-m4-demo.txt"
 
+do_install () {
+    # install elf format binary to /lib/firmware
+    install -d ${D}${base_libdir}/firmware
+    install -m 0644 ${S}/*.elf ${D}${base_libdir}/firmware
+}
+
+DEPLOY_FILE_EXT       ?= "bin"
+DEPLOY_FILE_EXT_mx7ulp = "img"
+
 do_deploy () {
    # Install the demo binaries
-   cp ${D}/* ${DEPLOYDIR}/
-   chmod 0644 ${DEPLOYDIR}/*
+   install -m 0644 ${S}/*.${DEPLOY_FILE_EXT} ${DEPLOYDIR}/
 }
 addtask deploy after do_install
 
diff --git a/meta-digi-arm/recipes-cpu/m4-demos/imx-m4-demos_2.7.0.bb b/meta-digi-arm/recipes-cpu/m4-demos/imx-m4-demos_2.7.0.bb
deleted file mode 100644
index e8ab3697b..000000000
--- a/meta-digi-arm/recipes-cpu/m4-demos/imx-m4-demos_2.7.0.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2017-2019 NXP
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-require imx-m4-demos-2.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=fd4b227530cd88a82af6a5982cfb724d"
-
-SRC_URI[imx8qx.md5sum] = "659c0ccf3a215fae7345d30e85774143"
-SRC_URI[imx8qx.sha256sum] = "74e97eea086b3cabe6d4430570e46586625fba822af97c0c2b5d025e69b3b3cb"
-
-COMPATIBLE_MACHINE = "(mx8qxp)"
diff --git a/meta-digi-arm/recipes-cpu/m4-demos/imx-m4-demos_2.8.0.bb b/meta-digi-arm/recipes-cpu/m4-demos/imx-m4-demos_2.8.0.bb
new file mode 100644
index 000000000..f2fda4c8e
--- /dev/null
+++ b/meta-digi-arm/recipes-cpu/m4-demos/imx-m4-demos_2.8.0.bb
@@ -0,0 +1,11 @@
+# Copyright 2017-2019 NXP
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+require imx-m4-demos-2.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=228c72f2a91452b8a03c4cab30f30ef9"
+
+SRC_URI[imx8qx.md5sum] = "d9cbcb6a5bf4a9e73399dfa82191670e"
+SRC_URI[imx8qx.sha256sum] = "7800cdbebe07f426cdac50b0e295d64215164a767e79ca58bd917445c50e345f"
+
+COMPATIBLE_MACHINE = "(mx8qxp)"