From 9ddf5784a6d39dbd9cd080941f16f351d5c7c53f Mon Sep 17 00:00:00 2001
From: Mark Hatle <mark.hatle@amd.com>
Date: Fri, 7 Apr 2023 16:27:14 -0700
Subject: meta-xilinx-contrib: Update zybo-linux-bd integrations

Disable standard bitstream-extraction, the zybo-linux-bd recipe handles
this task.

Zybo-linux-bd is used to provide the reference files, but needs to provide
the files in the matching locations to other components.

Signed-off-by: Mark Hatle <mark.hatle@amd.com>
---
 .../recipes-bsp/reference-design/zybo-linux-bd.bb   | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'meta-xilinx-contrib/recipes-bsp/reference-design')

diff --git a/meta-xilinx-contrib/recipes-bsp/reference-design/zybo-linux-bd.bb b/meta-xilinx-contrib/recipes-bsp/reference-design/zybo-linux-bd.bb
index 4439f7f9..b54274e4 100644
--- a/meta-xilinx-contrib/recipes-bsp/reference-design/zybo-linux-bd.bb
+++ b/meta-xilinx-contrib/recipes-bsp/reference-design/zybo-linux-bd.bb
@@ -29,38 +29,43 @@ PROVIDES = "virtual/bitstream virtual/xilinx-platform-init"
 FILES:${PN}-platform-init += "${PLATFORM_INIT_DIR}/*"
 
 FILES:${PN}-bitstream += " \
-		download.bit \
+		/boot/bitstream \
 		"
 
 PACKAGES = "${PN}-platform-init ${PN}-bitstream"
 
-BITSTREAM ?= "bitstream-${PV}-${PR}.bit"
+inherit image-artifact-names
+
+BITSTREAM_NAME ?= "download"
+BITSTREAM_BASE_NAME ?= "${BITSTREAM_NAME}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit xilinx-platform-init
 inherit deploy
 
-SYSROOT_DIRS += "${PLATFORM_INIT_DIR}"
+SYSROOT_DIRS += "${PLATFORM_INIT_DIR} /boot/bitstream"
 
 do_install() {
 	fn=$(unzip -l ${S}/${HDF} | awk '{print $NF}' | grep ".bit$")
 	unzip -o ${S}/${HDF} ${fn} -d ${D}
-	[ "${fn}" == "download.bit" ] || mv ${D}/${fn} ${D}/download.bit
+        install -d ${D}/boot/bitstream
+	mv ${D}/*.bit ${D}/boot/bitstream/${BITSTREAM_BASE_NAME}.bit
+	ln -s ${BITSTREAM_BASE_NAME}.bit ${D}/boot/bitstream/${BITSTREAM_NAME}-${MACHINE}.bit
 
 	install -d ${D}${PLATFORM_INIT_DIR}
 	for fn in ${PLATFORM_INIT_FILES}; do
 		unzip -o ${S}/${HDF} ${fn} -d ${D}${PLATFORM_INIT_DIR}
 	done
+
+
 }
 
 do_deploy () {
 	if [ -e ${D}/download.bit ]; then
 		install -d ${DEPLOYDIR}
-		install -m 0644 ${D}/download.bit ${DEPLOYDIR}/${BITSTREAM}
-		ln -sf ${BITSTREAM} ${DEPLOYDIR}/download.bit
-		# for u-boot 2016.3 with spl load bitstream patch
-		ln -sf ${BITSTREAM} ${DEPLOYDIR}/bitstream
+		install -m 0644 ${D}/download.bit ${DEPLOYDIR}/${BITSTREAM_BASE_NAME}.bit
+		ln -sf ${BITSTREAM_BASE_NAME}.bit ${DEPLOYDIR}/${BITSTREAM_NAME}-${MACHINE}.bit
 	fi
 }
 addtask deploy before do_build after do_install
-- 
cgit v1.2.3-54-g00ecf