From 0f06f56f68af3b456397d609672f05f12585d5db Mon Sep 17 00:00:00 2001
From: Jamin Lin <jamin_lin@aspeedtech.com>
Date: Mon, 2 Sep 2024 14:47:33 +0800
Subject: [PATCH] zephyr-kernel: support to deploy users customize image

In the previous design, it only deployed zephyr.elf,
zephyr.bin and zephyr.efi.
If users want to deploy their customize images, they should update do_install task.
Add to check "ZEPHYR_MAKE_OUTPUT" to deploy users customize images and zephyr images.

Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
---
 .../zephyr-kernel/zephyr-image.inc            | 19 +++++++------------
 .../zephyr-kernel/zephyr-kernel-common.inc    |  8 +++++---
 .../zephyr-kernel/zephyr-openamp-rsc-table.bb |  8 +++++---
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-image.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-image.inc
index d6ee21f..e929bff 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-image.inc
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-image.inc
@@ -7,23 +7,18 @@ OECMAKE_SOURCEPATH = "${ZEPHYR_SRC_DIR}"
 do_install() {
     install -d ${D}/firmware
 
-    install -D ${B}/zephyr/${ZEPHYR_MAKE_OUTPUT} ${D}/firmware/${PN}.elf
-
-    if [ -f ${B}/zephyr/${ZEPHYR_MAKE_BIN_OUTPUT} ]
-    then
-      install -D ${B}/zephyr/${ZEPHYR_MAKE_BIN_OUTPUT} ${D}/firmware/${PN}.bin
-    fi
-
-    if [ -f ${B}/zephyr/${ZEPHYR_MAKE_EFI_OUTPUT} ]
-    then
-      install -D ${B}/zephyr/${ZEPHYR_MAKE_EFI_OUTPUT} ${D}/firmware/${PN}.efi
-    fi
+    for output in ${ZEPHYR_MAKE_OUTPUT}; do
+        if [ -f ${B}/zephyr/${output} ];
+        then
+          install -D ${B}/zephyr/${output} ${D}/firmware/
+        fi
+    done
 }
 FILES:${PN} = "/firmware"
 INSANE_SKIP += "ldflags buildpaths"
 SYSROOT_DIRS += "/firmware"
 
 do_deploy() {
-    cp ${D}/firmware/${PN}.* ${DEPLOYDIR}/
+    cp ${D}/firmware/* ${DEPLOYDIR}/
 }
 addtask deploy after do_install
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc
index ba70a29..8a1638d 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc
@@ -10,9 +10,11 @@ IMAGE_NO_MANIFEST = "1"
 ZEPHYR_TOOLCHAIN_VARIANT ?= "cross-compile"
 require zephyr-toolchain-${ZEPHYR_TOOLCHAIN_VARIANT}.inc
 
-ZEPHYR_MAKE_OUTPUT = "zephyr.elf"
-ZEPHYR_MAKE_BIN_OUTPUT = "zephyr.bin"
-ZEPHYR_MAKE_EFI_OUTPUT = "zephyr.efi"
+ZEPHYR_MAKE_OUTPUT ?= "\
+    zephyr.elf \
+    zephyr.bin \
+    zephyr.efi \
+    "
 
 EXTRA_OECMAKE = "\
     -DZEPHYR_BASE=${ZEPHYR_BASE} \
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openamp-rsc-table.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openamp-rsc-table.bb
index 5e51c23..8a95b14 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openamp-rsc-table.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openamp-rsc-table.bb
@@ -1,9 +1,11 @@
 include zephyr-sample.inc
 
 
-ZEPHYR_MAKE_OUTPUT = "zephyr_openamp_rsc_table.elf"
-ZEPHYR_MAKE_BIN_OUTPUT = "zephyr_openamp_rsc_table.bin"
-ZEPHYR_MAKE_EFI_OUTPUT = "zephyr_openamp_rsc_table.efi"
+ZEPHYR_MAKE_OUTPUT ?= " \
+    zephyr_openamp_rsc_table.elf \
+    zephyr_openamp_rsc_table.bin \
+    zephyr_openamp_rsc_table.efi \
+    "
 
 ZEPHYR_SRC_DIR = "${ZEPHYR_BASE}/samples/subsys/ipc/openamp_rsc_table"