fpgamanager_custom: Fix logic for deploying shell json file

fpgamanager_custom bbclass allowed only accel.json file as user input
from firmware recipes, if user want to use flat or DFx static design
using shell.json, then shell.json is not deployed in
rootfs/${nonarch_base_libdir}/firmware/xilinx/${PN} directory.

Fix the logic to deploy shell.json (flat or DFx Static) or
accel.json (DFx RP) for flat, DFx Static and DFx RP use cases.

Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
(cherry picked from commit 6d3f12d1feee8b90f3dc72a05266fb3614788ced)
Signed-off-by: Mark Hatle <mark.hatle@amd.com>

1 files changed, 8 insertions, 4 deletions

diff --git a/meta-xilinx-core/classes/fpgamanager_custom.bbclass b/meta-xilinx-core/classes/fpgamanager_custom.bbclass
index 466c615b..179169af 100644
--- a/meta-xilinx-core/classes/fpgamanager_custom.bbclass
+++ b/meta-xilinx-core/classes/fpgamanager_custom.bbclass
@@ -1,3 +1,7 @@
+# This bbclass is inherited by flat, DFx Static and DFx RP firmware recipes.
+# fpgamanager_custom.bbclass expects user to generate pl dtsi for flat, DFx Static
+# and DFx RP xsa outside of yocto.
+
 inherit devicetree
 
 DEPENDS = "dtc-native bootgen-native"
@@ -61,8 +65,8 @@ python() {
             raise bb.parse.SkipRecipe("Need one '.dtsi' or one '.dtbo' file added to SRC_URI ")
 
         # Optional input
-        if 'accel.json' in d.getVar("SRC_URI"):
-            d.setVar("JSON_PATH",os.path.dirname([a for a in d.getVar('SRC_URI').split() if 'accel.json' in a][0].lstrip('file://')))
+        if '.json' in d.getVar("SRC_URI"):
+            d.setVar("JSON_PATH",os.path.dirname([a for a in d.getVar('SRC_URI').split() if '.json' in a][0].lstrip('file://')))
 
         if '.xclbin' in d.getVar("SRC_URI"):
             d.setVar("XCL_PATH",os.path.dirname([a for a in d.getVar('SRC_URI').split() if '.xclbin' in a][0].lstrip('file://')))
@@ -151,8 +155,8 @@ do_install() {
         install -Dm 0644 ${S}/${XCL_PATH}/*.xclbin ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/${PN}.xclbin
     fi
 
-    if [ -f ${WORKDIR}/${JSON_PATH}/accel.json ]; then
-        install -Dm 0644 ${S}/${JSON_PATH}/accel.json ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/accel.json
+    if [ -f ${S}/${JSON_PATH}/shell.json ] || [ -f ${S}/${JSON_PATH}/accel.json ]; then
+        install -Dm 0644 ${S}/${JSON_PATH}/*.json ${D}/${nonarch_base_libdir}/firmware/xilinx/${PN}/
     fi
 }