From 6e4c9d10cc0831a75b12b32dacb913e99ee39847 Mon Sep 17 00:00:00 2001
From: Gabriel Valcazar <gabriel.valcazar@digi.com>
Date: Tue, 21 Dec 2021 14:30:12 +0100
Subject: [PATCH] hardknott: mcore-demos: sync with meta-imx
 hardknott-5.10.72-2.2.0 branch

Change the recipes' path to align with meta-imx and update said recipes

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
 meta-digi-arm/recipes-cpu/m4-demos/README     | 10 ------
 .../m4-demos/imx-m4-demos_2.8.0.1.bb          | 23 ------------
 .../m4-demos/imx-m4-demos_2.9.0.bb            | 12 -------
 .../m4-demos/imx-m7-demos_2.8.0.1.bb          | 11 ------
 .../m4-demos/imx-m7-demos_2.9.0.bb            | 11 ------
 .../m4-demos/imx-m7-demos_2.9.1.bb            | 11 ------
 meta-digi-arm/recipes-fsl/mcore-demos/README  | 10 ++++++
 .../mcore-demos/imx-m33-demos_2.11.0.bb       | 11 ++++++
 .../mcore-demos/imx-m4-demos_1.0.1.bb         | 28 +++++++++++++++
 .../mcore-demos/imx-m4-demos_2.10.0.bb        | 17 +++++++++
 .../mcore-demos/imx-m4-demos_2.9.0.bb         | 18 ++++++++++
 .../mcore-demos/imx-m7-demos_2.10.0.bb        | 17 +++++++++
 .../mcore-demos/imx-mcore-demos-2.10.inc      | 36 +++++++++++++++++++
 .../mcore-demos/imx-mcore-demos.inc}          | 13 ++++---
 14 files changed, 145 insertions(+), 83 deletions(-)
 delete mode 100644 meta-digi-arm/recipes-cpu/m4-demos/README
 delete mode 100644 meta-digi-arm/recipes-cpu/m4-demos/imx-m4-demos_2.8.0.1.bb
 delete mode 100644 meta-digi-arm/recipes-cpu/m4-demos/imx-m4-demos_2.9.0.bb
 delete mode 100644 meta-digi-arm/recipes-cpu/m4-demos/imx-m7-demos_2.8.0.1.bb
 delete mode 100644 meta-digi-arm/recipes-cpu/m4-demos/imx-m7-demos_2.9.0.bb
 delete mode 100644 meta-digi-arm/recipes-cpu/m4-demos/imx-m7-demos_2.9.1.bb
 create mode 100644 meta-digi-arm/recipes-fsl/mcore-demos/README
 create mode 100644 meta-digi-arm/recipes-fsl/mcore-demos/imx-m33-demos_2.11.0.bb
 create mode 100644 meta-digi-arm/recipes-fsl/mcore-demos/imx-m4-demos_1.0.1.bb
 create mode 100644 meta-digi-arm/recipes-fsl/mcore-demos/imx-m4-demos_2.10.0.bb
 create mode 100644 meta-digi-arm/recipes-fsl/mcore-demos/imx-m4-demos_2.9.0.bb
 create mode 100644 meta-digi-arm/recipes-fsl/mcore-demos/imx-m7-demos_2.10.0.bb
 create mode 100644 meta-digi-arm/recipes-fsl/mcore-demos/imx-mcore-demos-2.10.inc
 rename meta-digi-arm/{recipes-cpu/m4-demos/imx-mcore-demos-2.8.inc => recipes-fsl/mcore-demos/imx-mcore-demos.inc} (81%)

diff --git a/meta-digi-arm/recipes-cpu/m4-demos/README b/meta-digi-arm/recipes-cpu/m4-demos/README
deleted file mode 100644
index d3696e703..000000000
--- a/meta-digi-arm/recipes-cpu/m4-demos/README
+++ /dev/null
@@ -1,10 +0,0 @@
-The M4 demo app version of each SoCs are followed:
-* 2.9.0 -- i.MX 8DXL
-* 2.8.0.1 -- i.MX 7ULP, 8MM, 8MQ, 8QM, 8QXP
-* 2.6.0 -- i.MX 8DXL-Phantom
-* 1.0.1 -- i.MX 7D
-
-The M7 demo app version of each SoCs are followed:
-* 2.9.1 -- i.MX 8MNLite
-* 2.9.0 -- i.MX 8MP
-* 2.8.0.1 -- i.MX 8MN
diff --git a/meta-digi-arm/recipes-cpu/m4-demos/imx-m4-demos_2.8.0.1.bb b/meta-digi-arm/recipes-cpu/m4-demos/imx-m4-demos_2.8.0.1.bb
deleted file mode 100644
index 9d599db65..000000000
--- a/meta-digi-arm/recipes-cpu/m4-demos/imx-m4-demos_2.8.0.1.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2017-2020 NXP
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-require imx-mcore-demos-2.8.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=1b4db4b25c3a1e422c0c0ed64feb65d2"
-
-SRC_URI[imx7ulp.md5sum] = "e08d9dd060ad7da050b169d81492e163"
-SRC_URI[imx7ulp.sha256sum] = "079b84263b5522711a31acec9d290e8843c002fd5b314e5a9a1fddee9c039aa6"
-
-SRC_URI[imx8mm.md5sum] = "0a132f5bc45958eb722c669f4766d079"
-SRC_URI[imx8mm.sha256sum] = "500a7d775b5d2af3c3f54f425f0cb3d05dcbf255e7dd7bb38c981ce9010ebec1"
-
-SRC_URI[imx8mq.md5sum] = "bc5df9ad5986fd5fee745a80feb72bb1"
-SRC_URI[imx8mq.sha256sum] = "7ed6f251d08e4c6c2fcfe8aef89dc98f3b8cb6e11007c9f3d8073c502e85c054"
-
-SRC_URI[imx8qm.md5sum] = "7bfcad2c582c528aaeb0226598754ab3"
-SRC_URI[imx8qm.sha256sum] = "c669de065923753c818f6b3bad0687d1f49eb94ababd076096556815c030a7f3"
-
-SRC_URI[imx8qx.md5sum] = "501dc76bb0a889d4d3aec8ab428eda89"
-SRC_URI[imx8qx.sha256sum] = "3521608924aad04f5fd06444e385b3e8c2e2a63344c7a0956f7d53314c56f187"
-
-COMPATIBLE_MACHINE = "(mx7ulp|mx8mm|mx8mq|mx8qm|mx8qxp)"
diff --git a/meta-digi-arm/recipes-cpu/m4-demos/imx-m4-demos_2.9.0.bb b/meta-digi-arm/recipes-cpu/m4-demos/imx-m4-demos_2.9.0.bb
deleted file mode 100644
index 3b70ebf69..000000000
--- a/meta-digi-arm/recipes-cpu/m4-demos/imx-m4-demos_2.9.0.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2017-2020 NXP
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-require imx-mcore-demos-2.8.inc
-
-LIC_FILES_CHKSUM_mx8qxp = "file://COPYING;md5=228c72f2a91452b8a03c4cab30f30ef9"
-LIC_FILES_CHKSUM = "file://COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a"
-
-SRC_URI[imx8dxl.md5sum] = "8850c04a8af91e2bd822cecd5ec56e12"
-SRC_URI[imx8dxl.sha256sum] = "66ddba970712ed394de4034b362334a12caa5865a6afc1dfb5a897bb55b4fcf1"
-
-COMPATIBLE_MACHINE = "(mx8dxl)"
diff --git a/meta-digi-arm/recipes-cpu/m4-demos/imx-m7-demos_2.8.0.1.bb b/meta-digi-arm/recipes-cpu/m4-demos/imx-m7-demos_2.8.0.1.bb
deleted file mode 100644
index ca0fd90f7..000000000
--- a/meta-digi-arm/recipes-cpu/m4-demos/imx-m7-demos_2.8.0.1.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 NXP
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-require imx-mcore-demos-2.8.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=1b4db4b25c3a1e422c0c0ed64feb65d2"
-
-SRC_URI[imx8mn.md5sum] = "3beaedc3fde76585551890df2659e61b"
-SRC_URI[imx8mn.sha256sum] = "13ce4a19d51e19cfdee9203a943a57637d001840fe546cacb5a5c741e66bbb43"
-
-COMPATIBLE_MACHINE = "(mx8mn|mx8mnlite)"
diff --git a/meta-digi-arm/recipes-cpu/m4-demos/imx-m7-demos_2.9.0.bb b/meta-digi-arm/recipes-cpu/m4-demos/imx-m7-demos_2.9.0.bb
deleted file mode 100644
index 41f409e0f..000000000
--- a/meta-digi-arm/recipes-cpu/m4-demos/imx-m7-demos_2.9.0.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 NXP
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-require imx-mcore-demos-2.8.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a" 
-
-SRC_URI[imx8mp.md5sum] = "402ee570070c3c10fb5dec9599a88d72"
-SRC_URI[imx8mp.sha256sum] = "343ecc380ab549d7d345947d360ef949f90f929e93e4bf504bd4a884756ccf72"
-
-COMPATIBLE_MACHINE = "(mx8mp)"
diff --git a/meta-digi-arm/recipes-cpu/m4-demos/imx-m7-demos_2.9.1.bb b/meta-digi-arm/recipes-cpu/m4-demos/imx-m7-demos_2.9.1.bb
deleted file mode 100644
index 2065fde20..000000000
--- a/meta-digi-arm/recipes-cpu/m4-demos/imx-m7-demos_2.9.1.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019-2020 NXP
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-require imx-mcore-demos-2.8.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a" 
-
-SRC_URI[imx8mnddr3l.md5sum] = "2bbc7aeae27fac1c3327c09139634ace"
-SRC_URI[imx8mnddr3l.sha256sum] = "9c87e1f3409fb80f5646b04ce34eb0a1ba690dcb8ee628ea17e82396e6efa1a7"
-
-COMPATIBLE_MACHINE = "(mx8mnlite)"
diff --git a/meta-digi-arm/recipes-fsl/mcore-demos/README b/meta-digi-arm/recipes-fsl/mcore-demos/README
new file mode 100644
index 000000000..71f8fb9e7
--- /dev/null
+++ b/meta-digi-arm/recipes-fsl/mcore-demos/README
@@ -0,0 +1,10 @@
+The M4 demo app version of each SoCs are followed:
+* 2.10.0 -- i.MX 7ULP, 8MM, 8MQ
+* 2.9.0 -- i.MX 8DXL, 8QM, 8QXP
+* 1.0.1 -- i.MX 7D
+
+The M7 demo app version of each SoCs are followed:
+* 2.10.0 -- i.MX 8MNLite, 8MN, 8MP
+
+The M33 demo app version of each SoCs are followed:
+* 2.11.0 -- i.MX 8ULP
diff --git a/meta-digi-arm/recipes-fsl/mcore-demos/imx-m33-demos_2.11.0.bb b/meta-digi-arm/recipes-fsl/mcore-demos/imx-m33-demos_2.11.0.bb
new file mode 100644
index 000000000..0e24f188b
--- /dev/null
+++ b/meta-digi-arm/recipes-fsl/mcore-demos/imx-m33-demos_2.11.0.bb
@@ -0,0 +1,11 @@
+# Copyright 2021 NXP
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+require imx-mcore-demos.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=03bcadc8dc0a788f66ca9e2b89f56c6f"
+
+SRC_URI[imx8ulp.md5sum] = "de0499fd2de02922c524d4b106d3bc30"
+SRC_URI[imx8ulp.sha256sum] = "17e239b96dfbb0d05e3f61c93a57bfd8a98bc021bb802a365da34d99040c6cb0"
+
+COMPATIBLE_MACHINE = "(mx8ulp)"
diff --git a/meta-digi-arm/recipes-fsl/mcore-demos/imx-m4-demos_1.0.1.bb b/meta-digi-arm/recipes-fsl/mcore-demos/imx-m4-demos_1.0.1.bb
new file mode 100644
index 000000000..f1bcd818c
--- /dev/null
+++ b/meta-digi-arm/recipes-fsl/mcore-demos/imx-m4-demos_1.0.1.bb
@@ -0,0 +1,28 @@
+SUMMARY = "i.MX M4 core Demo images"
+SECTION = "app"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8cf95184c220e247b9917e7244124c5a"
+
+inherit deploy fsl-eula-unpack
+
+M4_SOC ?= "INVALID"
+M4_SOC_mx7d = "imx7d-sabresd"
+
+SRC_URI = "${FSL_MIRROR}/${M4_SOC}-m4-freertos-${PV}.bin;fsl-eula=true"
+S = "${WORKDIR}/${M4_SOC}-m4-freertos-${PV}"
+
+SRC_URI[md5sum] = "b05b780ff3916f4953ab58ac95233c38"
+SRC_URI[sha256sum] = "cc00d3b936d49b2794a2a99e10129437e70caba3fd26b8379b8c50dd22f73254"
+
+do_deploy () {
+   # Install the demo binaries
+   install -d ${DEPLOYDIR}
+   cp ${S}/*.bin ${DEPLOYDIR}/
+   ls ${DEPLOYDIR}/
+}
+
+addtask deploy before do_build after do_compile
+
+PACKAGE_ARCH = "${MACHINE_SOCARCH}"
+COMPATIBLE_MACHINE = "(mx7d)"
+
diff --git a/meta-digi-arm/recipes-fsl/mcore-demos/imx-m4-demos_2.10.0.bb b/meta-digi-arm/recipes-fsl/mcore-demos/imx-m4-demos_2.10.0.bb
new file mode 100644
index 000000000..eb70e5ad4
--- /dev/null
+++ b/meta-digi-arm/recipes-fsl/mcore-demos/imx-m4-demos_2.10.0.bb
@@ -0,0 +1,17 @@
+# Copyright 2017-2021 NXP
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+require imx-mcore-demos.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa"
+
+SRC_URI[imx7ulp.md5sum] = "f3d312d2a12d76cc353e23ee08ba1c1c"
+SRC_URI[imx7ulp.sha256sum] = "43f2de5db02bcb406160886e04d083e7a9253f688fe7b3be75bc9c9e13d425cc"
+
+SRC_URI[imx8mm.md5sum] = "3ece10e2ca255e6964b405f17c9f6342"
+SRC_URI[imx8mm.sha256sum] = "c14f6d2f41d2a16eb9f948c6182ef3fbb9dfccdd5399b78e2fe3fa8ae9006dde"
+
+SRC_URI[imx8mq.md5sum] = "b5034e35dca3c2b6c1b4d38b16cddaa7"
+SRC_URI[imx8mq.sha256sum] = "ec44b737630c088dd23c1f855ce8478bae531d75a9c7021eb25e9268a8b9a425"
+
+COMPATIBLE_MACHINE = "(mx7ulp|mx8mm|mx8mq)"
diff --git a/meta-digi-arm/recipes-fsl/mcore-demos/imx-m4-demos_2.9.0.bb b/meta-digi-arm/recipes-fsl/mcore-demos/imx-m4-demos_2.9.0.bb
new file mode 100644
index 000000000..3b8259450
--- /dev/null
+++ b/meta-digi-arm/recipes-fsl/mcore-demos/imx-m4-demos_2.9.0.bb
@@ -0,0 +1,18 @@
+# Copyright 2017-2021 NXP
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+require imx-mcore-demos.inc
+
+LIC_FILES_CHKSUM_mx8dxl = "file://COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a632fefd1c359980434f9389833cab3a" 
+
+SRC_URI[imx8dxl.md5sum] = "8850c04a8af91e2bd822cecd5ec56e12"
+SRC_URI[imx8dxl.sha256sum] = "66ddba970712ed394de4034b362334a12caa5865a6afc1dfb5a897bb55b4fcf1"
+
+SRC_URI[imx8qm.md5sum] = "5912ca94847ee56a7e8b866b211b67d9"
+SRC_URI[imx8qm.sha256sum] = "c695e72b0c7f609132f5990469cf950c03e137de887bd7e24d059c51a7b499be"
+
+SRC_URI[imx8qx.md5sum] = "5bc15014f59b2b11c71299fac608be5d"
+SRC_URI[imx8qx.sha256sum] = "bbb268a30a58a86e38966122191c8aa69f427c6c1d56b0ce81e518f4d652782a"
+
+COMPATIBLE_MACHINE = "(mx7ulp|mx8dxl|mx8mq|mx8qm|mx8qxp)"
diff --git a/meta-digi-arm/recipes-fsl/mcore-demos/imx-m7-demos_2.10.0.bb b/meta-digi-arm/recipes-fsl/mcore-demos/imx-m7-demos_2.10.0.bb
new file mode 100644
index 000000000..642a48d97
--- /dev/null
+++ b/meta-digi-arm/recipes-fsl/mcore-demos/imx-m7-demos_2.10.0.bb
@@ -0,0 +1,17 @@
+# Copyright 2019-2021 NXP
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+require imx-mcore-demos.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa"
+
+SRC_URI[imx8mnddr3l.md5sum] = "f7d651d04ffc4b8fa26b19b1289f5d65"
+SRC_URI[imx8mnddr3l.sha256sum] = "9377eceaddb973f1cb51ae75d8dd47c7a0bc4d82f915bf25a81cddd5d633e805"
+
+SRC_URI[imx8mn.md5sum] = "11ee5b3f9494ba99c440b249eb99617a"
+SRC_URI[imx8mn.sha256sum] = "aa4a57ed2ddbf6e27a14269be38f5ab3803889d71e8dcca76f8586a77802b010"
+
+SRC_URI[imx8mp.md5sum] = "5167520c8493e8e2d54d1d60e22ff5d4"
+SRC_URI[imx8mp.sha256sum] = "cdb9478d1b7fb74f21d15bee56a8f6d48fe3e4f97dd17a5e4499c72040988ed2"
+
+COMPATIBLE_MACHINE = "(mx8mnul|mx8mn|mx8mp|mx8mpul)"
diff --git a/meta-digi-arm/recipes-fsl/mcore-demos/imx-mcore-demos-2.10.inc b/meta-digi-arm/recipes-fsl/mcore-demos/imx-mcore-demos-2.10.inc
new file mode 100644
index 000000000..235aa8372
--- /dev/null
+++ b/meta-digi-arm/recipes-fsl/mcore-demos/imx-mcore-demos-2.10.inc
@@ -0,0 +1,36 @@
+# Copyright 2021 NXP
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+SUMMARY = "i.MX M33 core Demo images"
+SECTION = "app"
+LICENSE = "Proprietary"
+
+inherit deploy fsl-eula2-unpack2
+
+SOC        ?= "INVALID"
+SOC_mx8ulp  = "imx8ulp"
+
+MCORE_TYPE  ?= "m33"
+MCORE_TYPE_mx8ulp  = "m33"
+
+IMX_PACKAGE_NAME = "${SOC}-${MCORE_TYPE}-demo-${PV}"
+SRC_URI_append = ";name=${SOC}"
+
+SCR = "SCR-${SOC}-${MCORE_TYPE}-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"
+
+do_deploy () {
+   # Install the demo binaries
+   install -m 0644 ${S}/*.${DEPLOY_FILE_EXT} ${DEPLOYDIR}/
+}
+
+addtask deploy after do_install
+
+PACKAGE_ARCH = "${MACHINE_SOCARCH}"
diff --git a/meta-digi-arm/recipes-cpu/m4-demos/imx-mcore-demos-2.8.inc b/meta-digi-arm/recipes-fsl/mcore-demos/imx-mcore-demos.inc
similarity index 81%
rename from meta-digi-arm/recipes-cpu/m4-demos/imx-mcore-demos-2.8.inc
rename to meta-digi-arm/recipes-fsl/mcore-demos/imx-mcore-demos.inc
index 2880fc3f5..de770a9d2 100644
--- a/meta-digi-arm/recipes-cpu/m4-demos/imx-mcore-demos-2.8.inc
+++ b/meta-digi-arm/recipes-fsl/mcore-demos/imx-mcore-demos.inc
@@ -1,7 +1,7 @@
-# Copyright 2017-2020 NXP
+# Copyright 2017-2021 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
 
-SUMMARY = "i.MX M4/M7 core Demo images"
+SUMMARY = "i.MX M4/M7/M33 core Demo images"
 SECTION = "app"
 LICENSE = "Proprietary"
 
@@ -12,17 +12,20 @@ SOC_mx7ulp  = "imx7ulp"
 SOC_mx8dxl  = "imx8dxl"
 SOC_mx8mm   = "imx8mm"
 SOC_mx8mn   = "imx8mn"
-SOC_mx8mnlite = "imx8mnddr3l"
+SOC_mx8mnul = "imx8mnddr3l"
 SOC_mx8mp   = "imx8mp"
+SOC_mx8mpul = "imx8mp"
 SOC_mx8mq   = "imx8mq"
 SOC_mx8qm   = "imx8qm"
 SOC_mx8qxp  = "imx8qx"
-SOC_mx8phantomdxl = "imx8dxl-phantom"
+SOC_mx8ulp  = "imx8ulp"
 
 MCORE_TYPE  ?= "m4"
 MCORE_TYPE_mx8mn  = "m7"
-MCORE_TYPE_mx8mnlite  = "m7"
+MCORE_TYPE_mx8mnul = "m7"
 MCORE_TYPE_mx8mp  = "m7"
+MCORE_TYPE_mx8mpul  = "m7"
+MCORE_TYPE_mx8ulp  = "m33"
 
 IMX_PACKAGE_NAME = "${SOC}-${MCORE_TYPE}-demo-${PV}"
 SRC_URI_append = ";name=${SOC}"