diff --git a/meta-digi-arm/recipes-cpu/m4-demos/README b/meta-digi-arm/recipes-cpu/m4-demos/README
new file mode 100644
index 000000000..6d937e618
--- /dev/null
+++ b/meta-digi-arm/recipes-cpu/m4-demos/README
@@ -0,0 +1,9 @@
+The M4 demo app version of each SoCs are followed:
+* 2.8.1 -- 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.8.1 -- 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
new file mode 100644
index 000000000..9d599db65
--- /dev/null
+++ b/meta-digi-arm/recipes-cpu/m4-demos/imx-m4-demos_2.8.0.1.bb
@@ -0,0 +1,23 @@
+# 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.8.0.bb b/meta-digi-arm/recipes-cpu/m4-demos/imx-m4-demos_2.8.0.bb
deleted file mode 100644
index f2fda4c8e..000000000
--- a/meta-digi-arm/recipes-cpu/m4-demos/imx-m4-demos_2.8.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=228c72f2a91452b8a03c4cab30f30ef9"
-
-SRC_URI[imx8qx.md5sum] = "d9cbcb6a5bf4a9e73399dfa82191670e"
-SRC_URI[imx8qx.sha256sum] = "7800cdbebe07f426cdac50b0e295d64215164a767e79ca58bd917445c50e345f"
-
-COMPATIBLE_MACHINE = "(mx8qxp)"
diff --git a/meta-digi-arm/recipes-cpu/m4-demos/imx-m4-demos_2.8.1.bb b/meta-digi-arm/recipes-cpu/m4-demos/imx-m4-demos_2.8.1.bb
new file mode 100644
index 000000000..7440b340d
--- /dev/null
+++ b/meta-digi-arm/recipes-cpu/m4-demos/imx-m4-demos_2.8.1.bb
@@ -0,0 +1,12 @@
+# 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=983e4c77621568488dd902b27e0c2143"
+
+SRC_URI[imx8dxl.md5sum] = "7f09bb52f744f60b6301c70c43081d96"
+SRC_URI[imx8dxl.sha256sum] = "63427d2ff6089b5cec2fc3cfdbaf915f371ca34fa637b856afa6c8d6957e9abf"
+
+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
new file mode 100644
index 000000000..cecf33cf6
--- /dev/null
+++ b/meta-digi-arm/recipes-cpu/m4-demos/imx-m7-demos_2.8.0.1.bb
@@ -0,0 +1,11 @@
+# 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)"
diff --git a/meta-digi-arm/recipes-cpu/m4-demos/imx-m7-demos_2.8.1.bb b/meta-digi-arm/recipes-cpu/m4-demos/imx-m7-demos_2.8.1.bb
new file mode 100644
index 000000000..91c7bc94a
--- /dev/null
+++ b/meta-digi-arm/recipes-cpu/m4-demos/imx-m7-demos_2.8.1.bb
@@ -0,0 +1,11 @@
+# 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=983e4c77621568488dd902b27e0c2143"
+
+SRC_URI[imx8mp.md5sum] = "a4be9423223bffb703d31db799c3b7d9"
+SRC_URI[imx8mp.sha256sum] = "4a324f3da3bb027e4c1f92184ea63b1a0f037fc22e355ac49b8819fd45821b9a"
+
+COMPATIBLE_MACHINE = "(mx8mp)"
diff --git a/meta-digi-arm/recipes-cpu/m4-demos/imx-m4-demos-2.inc b/meta-digi-arm/recipes-cpu/m4-demos/imx-mcore-demos-2.8.inc
similarity index 70%
rename from meta-digi-arm/recipes-cpu/m4-demos/imx-m4-demos-2.inc
rename to meta-digi-arm/recipes-cpu/m4-demos/imx-mcore-demos-2.8.inc
index 0bc715dc7..781001587 100644
--- a/meta-digi-arm/recipes-cpu/m4-demos/imx-m4-demos-2.inc
+++ b/meta-digi-arm/recipes-cpu/m4-demos/imx-mcore-demos-2.8.inc
@@ -1,7 +1,7 @@
-# Copyright 2017-2018 NXP
+# Copyright 2017-2020 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
 
-SUMMARY = "i.MX M4 core Demo images"
+SUMMARY = "i.MX M4/M7 core Demo images"
 SECTION = "app"
 LICENSE = "Proprietary"
 
@@ -9,16 +9,23 @@ inherit deploy fsl-eula2-unpack2
 
 SOC        ?= "INVALID"
 SOC_mx7ulp  = "imx7ulp"
+SOC_mx8dxl  = "imx8dxl"
 SOC_mx8mm   = "imx8mm"
+SOC_mx8mn   = "imx8mn"
+SOC_mx8mp   = "imx8mp"
 SOC_mx8mq   = "imx8mq"
 SOC_mx8qm   = "imx8qm"
 SOC_mx8qxp  = "imx8qx"
-SOC_mx8dxl  = "imx8dxl"
+SOC_mx8phantomdxl = "imx8dxl-phantom"
 
-IMX_PACKAGE_NAME = "${SOC}-m4-demo-${PV}"
+MCORE_TYPE  ?= "m4"
+MCORE_TYPE_mx8mn  = "m7"
+MCORE_TYPE_mx8mp  = "m7"
+
+IMX_PACKAGE_NAME = "${SOC}-${MCORE_TYPE}-demo-${PV}"
 SRC_URI_append = ";name=${SOC}"
 
-SCR = "SCR-${SOC}-m4-demo.txt"
+SCR = "SCR-${SOC}-${MCORE_TYPE}-demo.txt"
 
 do_install () {
     # install elf format binary to /lib/firmware
@@ -33,6 +40,7 @@ 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/m7-demos/imx-m7-demos_2.8.0.bb b/meta-digi-arm/recipes-cpu/m7-demos/imx-m7-demos_2.8.0.bb
deleted file mode 100644
index 4cd2ec2d4..000000000
--- a/meta-digi-arm/recipes-cpu/m7-demos/imx-m7-demos_2.8.0.bb
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2019-2020 NXP
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-SUMMARY = "i.MX M7 core Demo images"
-SECTION = "app"
-LICENSE = "Proprietary"
-
-inherit deploy fsl-eula2-unpack2
-
-SOC        ?= "INVALID"
-SOC_mx8mn   = "imx8mn"
-SOC_mx8mp   = "imx8mp"
-
-IMX_PACKAGE_NAME = "${SOC}-m7-demo-${PV}"
-SRC_URI_append = ";name=${SOC}"
-
-SCR = "SCR-${SOC}-m7-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
-   install -m 0644 ${S}/*.${DEPLOY_FILE_EXT} ${DEPLOYDIR}/
-}
-addtask deploy after do_install
-
-PACKAGE_ARCH = "${MACHINE_SOCARCH}"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=228c72f2a91452b8a03c4cab30f30ef9"
-
-SRC_URI[imx8mn.md5sum] = "21b718fab2c4e77c8a848667698d74d1"
-SRC_URI[imx8mn.sha256sum] = "e877c7462b6ea87c498563842f42352d204eb28a65f35f7dc1fec643f84abb66"
-
-SRC_URI[imx8mp.md5sum] = "3dd44131b41dd902a8ce1b53eb9a0cd6"
-SRC_URI[imx8mp.sha256sum] = "c7ed19d1d164c910af114d58fc53628b6e237262e657e082ac7beb685f0398ec"
-
-COMPATIBLE_MACHINE = "(mx8mn|mx8mp)"