meta-xilinx-core: xilinx-bootbin: Instead of always calling UNPACKDIR use S

Signed-off-by: Mark Hatle <mark.hatle@amd.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/meta-xilinx-core/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb b/meta-xilinx-core/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb
index 86225181..2cf4606d 100644
--- a/meta-xilinx-core/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb
+++ b/meta-xilinx-core/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb
@@ -55,6 +55,8 @@ BOOTSCR_DEP:versal-net = 'u-boot-xlnx-scr:do_deploy'
 
 BIF_BITSTREAM_ATTR ?= "${@bb.utils.contains('MACHINE_FEATURES', 'fpga-overlay', '', 'bitstream', d)}"
 
+S = "${UNPACKDIR}"
+
 do_patch[noexec] = "1"
 
 do_compile[depends] .= " ${BOOTSCR_DEP}"
@@ -178,10 +180,10 @@ do_configure[vardeps] += "BIF_PARTITION_ATTR BIF_PARTITION_IMAGE BIF_COMMON_ATTR
 do_configure[vardeps] += "BIF_FSBL_ATTR BIF_BITSTREAM_ATTR BIF_ATF_ATTR BIF_DEVICETREE_ATTR BIF_SSBL_ATTR"
 
 do_compile() {
-    cd ${UNPACKDIR}
+    cd ${S}
     rm -f ${B}/BOOT.bin
     if [ "${BIF_FILE_PATH}" != "${B}/bootgen.bif" ];then
-        BIF_FILE_PATH="${UNPACKDIR}${BIF_FILE_PATH}"
+        BIF_FILE_PATH="${@os.path.join(d.getVar('S'), d.getVar('BIF_FILE_PATH'))}"
     fi
     bootgen -image ${BIF_FILE_PATH} -arch ${BOOTGEN_ARCH} ${BOOTGEN_EXTRA_ARGS} -w -o ${B}/BOOT.bin
     if [ ! -e ${B}/BOOT.bin ]; then