[meta-xilinx] [PATCH 07/29] zybo-linux-bd: Use deploy class to handle shared state

[Nathan Rossi]

Use the deploy class and DEPLOYDIR to ensure that deploy objects are
populated into the shared state cache. This ensures that the objects are
also correctly populated into the output deploy directory regardless of
whether the do_deploy task is executed.

Signed-off-by: Nathan Rossi <nathan at nathanrossi.com>
---
 recipes-bsp/reference-design/zybo-linux-bd.bb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/recipes-bsp/reference-design/zybo-linux-bd.bb b/recipes-bsp/reference-design/zybo-linux-bd.bb
index a3968ac290..a6df84d8e4 100644
--- a/recipes-bsp/reference-design/zybo-linux-bd.bb
+++ b/recipes-bsp/reference-design/zybo-linux-bd.bb
@@ -44,6 +44,7 @@ BITSTREAM ?= "bitstream-${PV}-${PR}.bit"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit zynq7-platform-paths
+inherit deploy
 
 SYSROOT_DIRS += "${PLATFORM_INIT_DIR}"
 
@@ -60,11 +61,11 @@ do_install() {
 
 do_deploy () {
 	if [ -e ${D}/download.bit ]; then
-		install -d ${DEPLOY_DIR_IMAGE}
-		install -m 0644 ${D}/download.bit ${DEPLOY_DIR_IMAGE}/${BITSTREAM}
-		ln -sf ${BITSTREAM} ${DEPLOY_DIR_IMAGE}/download.bit
+		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} ${DEPLOY_DIR_IMAGE}/bitstream
+		ln -sf ${BITSTREAM} ${DEPLOYDIR}/bitstream
 	fi
 }
 addtask deploy before do_build after do_install
-- 
2.9.3