bitstream_1.0.bb: Install and deploy bit file

1. Add recipe version to bitstream recipe.
2. Install and deploy bit file for non xsct builds, This is required for
   packaging bitstream to boot.bin when MACHINE_FEATURES=fpga-overlay
   is not set.

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

1 files changed, 14 insertions, 3 deletions

diff --git a/meta-xilinx-core/recipes-bsp/bitstream/bitstream.bb b/meta-xilinx-core/recipes-bsp/bitstream/bitstream_1.0.bb
index f61761f4..cf7ca100 100644
--- a/meta-xilinx-core/recipes-bsp/bitstream/bitstream.bb
+++ b/meta-xilinx-core/recipes-bsp/bitstream/bitstream_1.0.bb
@@ -24,13 +24,20 @@ BITSTREAM_PATH ?= ""
 
 inherit deploy
 
+BITSTREAM_NAME ?= "download"
+BITSTREAM_NAME:microblaze ?= "system"
+
+BITSTREAM_BASE_NAME ?= "${BITSTREAM_NAME}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
+
+SYSROOT_DIRS += "/boot/bitstream"
+
 do_install() {
     if [ ! -e ${BITSTREAM_PATH} ]; then
         echo "Unable to find BITSTREAM_PATH (${BITSTREAM_PATH})"
         exit 1
     fi
-
-    install -Dm 0644 ${BITSTREAM_PATH} ${D}/boot/.
+    install -d ${D}/boot/bitstream/
+    install -Dm 0644 ${BITSTREAM_PATH} ${D}/boot/bitstream/${BITSTREAM_BASE_NAME}.bit
 }
 
 # If the item is already in OUR deploy_image_dir, nothing to deploy!
@@ -38,10 +45,14 @@ SHOULD_DEPLOY = "${@'false' if (d.getVar('BITSTREAM_PATH')).startswith(d.getVar(
 do_deploy() {
     # If the item is already in OUR deploy_image_dir, nothing to deploy!
     if ${SHOULD_DEPLOY}; then
-        install -Dm 0644 ${BITSTREAM_PATH} ${DEPLOYDIR}/.
+        install -Dm 0644 ${BITSTREAM_PATH} ${DEPLOYDIR}/${BITSTREAM_BASE_NAME}.bit
     fi
 }
 
+addtask deploy before do_build after do_install
+
+FILES:${PN} += "/boot/bitstream/*.bit"
+
 def check_bitstream_vars(d):
    # If BITSTREAM_PATH is not defined, we error and instruct the user
    # Don't cache this, as the items on disk can change!