extract-cdo: Adjusted to use an intermediate default

Adjusted to use an intermediate default BOOTGEN_ARCH, so that no
override is required.

Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/meta-xilinx-core/recipes-bsp/cdo/extract-cdo_1.0.bb b/meta-xilinx-core/recipes-bsp/cdo/extract-cdo_1.0.bb
index fb0ac66b..6e734e36 100644
--- a/meta-xilinx-core/recipes-bsp/cdo/extract-cdo_1.0.bb
+++ b/meta-xilinx-core/recipes-bsp/cdo/extract-cdo_1.0.bb
@@ -19,14 +19,17 @@ PACKAGE_ARCH ?= "${MACHINE_ARCH}"
 B = "${WORKDIR}/build"
 
 BOOTGEN_CMD ?= "bootgen"
-BOOTGEN_ARGS ?= "-arch versal"
+BOOTGEN_ARCH_DEFAULT = "undefined"
+BOOTGEN_ARCH_DEFAULT:versal = "versal"
+BOOTGEN_ARCH_DEFAULT:versal-net = "versalnet"
+BOOTGEN_ARCH ?= "${BOOTGEN_ARCH_DEFAULT}"
 BOOTGEN_OUTFILE ?= "${DEPLOY_DIR_IMAGE}/boot.bin"
 
 # bootgen extracts the pmc_cdo file from the boot.bin.  By default this
 # happens in the same directory as the boot.bin.  We need to move it to
 # this directory, as do_compile should never write into a deploy dir
 do_compile() {
-    ${BOOTGEN_CMD} ${BOOTGEN_ARGS} -dump_dir ${B} -dump ${BOOTGEN_OUTFILE} pmc_cdo
+    ${BOOTGEN_CMD} -arch ${BOOTGEN_ARCH} -dump_dir ${B} -dump ${BOOTGEN_OUTFILE} pmc_cdo
 }
 
 do_install[noexec] = '1'