From ae195525a02f3e552195ebd469ebb3b2c0974b76 Mon Sep 17 00:00:00 2001
From: Arturo Buzarra <arturo.buzarra@digi.com>
Date: Wed, 27 May 2020 14:17:57 +0200
Subject: [PATCH] imx-m7-demos: add recipe for M7 binary demos

This recipe takes several binaries demo for the Cortex M7 CPU,
and are provided in the deploy directory.

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
---
 .../imx-mkimage/imx-boot_1.0.bbappend         | 21 +++++++++++
 .../m7-demos/imx-m7-demos_2.7.0.bb            | 37 +++++++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 meta-digi-arm/recipes-cpu/m7-demos/imx-m7-demos_2.7.0.bb

diff --git a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend
index 547e7ef77..742d1e047 100644
--- a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend
+++ b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend
@@ -6,6 +6,16 @@ IMX_EXTRA_FIRMWARE_ccimx8x = "digi-sc-firmware imx-seco"
 DEPENDS_append_ccimx8x = " coreutils-native"
 DEPENDS_append_mx8 += "${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-native', '', d)}"
 
+IMX_M7_DEMOS        = ""
+IMX_M7_DEMOS_mx8mn  = "imx-m7-demos:do_deploy"
+
+M7_DEFAULT_IMAGE ?= "m7_image.bin"
+M7_DEFAULT_IMAGE_mx8mn = "imx8mn_m7_TCM_hello_world.bin"
+
+do_compile[depends] += " \
+    ${IMX_M7_DEMOS} \
+"
+
 # This package aggregates dependencies with other packages,
 # so also define the license dependencies.
 do_populate_lic[depends] += " \
@@ -13,6 +23,7 @@ do_populate_lic[depends] += " \
 	${@' '.join('%s:do_populate_lic' % r for r in '${IMX_EXTRA_FIRMWARE}'.split() )} \
 	imx-atf:do_populate_lic \
 	${@bb.utils.contains('IMX_M4_DEMOS', 'imx-m4-demos:do_deploy', 'imx-m4-demos:do_populate_lic', '', d)} \
+	${@bb.utils.contains('IMX_M7_DEMOS', 'imx-m7-demos:do_deploy', 'imx-m7-demos:do_populate_lic', '', d)} \
 	firmware-imx:do_populate_lic \
 "
 
@@ -36,6 +47,10 @@ compile_mx8x() {
 
 compile_mx8m() {
 	bbnote 8MQ/8MM/8MN boot binary build
+	if [ -e ${DEPLOY_DIR_IMAGE}/${M7_DEFAULT_IMAGE} ] ; then
+		cp ${DEPLOY_DIR_IMAGE}/${M7_DEFAULT_IMAGE}           ${BOOT_STAGING}/m7_image.bin
+	fi
+
 	for ddr_firmware in ${DDR_FIRMWARE_NAME}; do
 		bbnote "Copy ddr_firmware: ${ddr_firmware} from ${DEPLOY_DIR_IMAGE} -> ${BOOT_STAGING} "
 		cp ${DEPLOY_DIR_IMAGE}/${ddr_firmware}               ${BOOT_STAGING}
@@ -132,6 +147,12 @@ do_install () {
 	fi
 }
 
+deploy_mx8m_append() {
+	if [ -e ${BOOT_STAGING}/m7_image.bin ] ; then
+		cp ${BOOT_STAGING}/m7_image.bin                      ${DEPLOYDIR}/${BOOT_TOOLS}
+	fi
+}
+
 do_deploy () {
 	deploy_${SOC_FAMILY}
 	# copy tee.bin to deploy path
diff --git a/meta-digi-arm/recipes-cpu/m7-demos/imx-m7-demos_2.7.0.bb b/meta-digi-arm/recipes-cpu/m7-demos/imx-m7-demos_2.7.0.bb
new file mode 100644
index 000000000..a3dbc7e36
--- /dev/null
+++ b/meta-digi-arm/recipes-cpu/m7-demos/imx-m7-demos_2.7.0.bb
@@ -0,0 +1,37 @@
+# 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_deploy () {
+   # Install the demo binaries
+   cp ${D}/* ${DEPLOYDIR}/
+   #Set 0644 permission for Demo binaries
+   chmod 0644 ${DEPLOYDIR}/*
+}
+addtask deploy after do_install
+
+PACKAGE_ARCH = "${MACHINE_SOCARCH}"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=fd4b227530cd88a82af6a5982cfb724d"
+
+SRC_URI[imx8mn.md5sum] = "4dd5b924a6486efba82474da9e0dbe1d"
+SRC_URI[imx8mn.sha256sum] = "9785721f2863ad6fa14cfcb63a813789bbcd206ff2f38c27e35235c9ae154e9f"
+
+SRC_URI[imx8mp.md5sum] = "106361256fa92a894147e8050054b2fc"
+SRC_URI[imx8mp.sha256sum] = "789c5c402d6d564df4ff8f01e3d7ce1bc091c45567b3832ab91d14fae98b2a3e"
+
+COMPATIBLE_MACHINE = "(mx8mn|mx8mp)"