aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@xilinx.com>2021-03-20 12:19:43 -0700
committerMark Hatle <mark.hatle@xilinx.com>2021-03-20 14:57:39 -0700
commit770eb410e21ddbbec943a1a813258d47646efef6 (patch)
treed1320b72a57a96739066dce44f2919db8f3cb3ee
parent828cf0111d474fedf7e27f4cb3bdeca847490682 (diff)
downloadmeta-xilinx-770eb410e21ddbbec943a1a813258d47646efef6.tar.gz
meta-xilinx-770eb410e21ddbbec943a1a813258d47646efef6.tar.bz2
meta-xilinx-770eb410e21ddbbec943a1a813258d47646efef6.zip
plmfw/psmfw: Fix missing do_deploy addtask, and local check
If the fw is pulling from the same config, we don't want to re-deploy the firmware (it will fail.) Otherwise copy it from the other config into our config, as other tools may look for it. Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
-rw-r--r--meta-xilinx-bsp/recipes-bsp/embeddedsw/plmfw.bb5
-rw-r--r--meta-xilinx-bsp/recipes-bsp/embeddedsw/psmfw.bb6
2 files changed, 9 insertions, 2 deletions
diff --git a/meta-xilinx-bsp/recipes-bsp/embeddedsw/plmfw.bb b/meta-xilinx-bsp/recipes-bsp/embeddedsw/plmfw.bb
index b4135a83..e890b875 100644
--- a/meta-xilinx-bsp/recipes-bsp/embeddedsw/plmfw.bb
+++ b/meta-xilinx-bsp/recipes-bsp/embeddedsw/plmfw.bb
@@ -44,14 +44,17 @@ do_install() {
install -Dm 0644 ${PLM_FILE}${BINARY_EXT} ${D}/boot/${BINARY_NAME}-${BINARY_ID}${BINARY_EXT}
}
+# If the item is already in OUR deploy_image_dir, nothing to deploy!
+SHOULD_DEPLOY = "${@'false' if (d.getVar('PLM_FILE')).startswith(d.getVar('DEPLOY_DIR_IMAGE')) else 'true'}"
do_deploy() {
# If the item is already in OUR deploy_image_dir, nothing to deploy!
- if [ "x${@'' if d.getVar('PLM_FILE').startswith(d.getVar('DEPLOY_IMAGE_DIR')) else 'copy'}" != "x" ]; then
+ if ${SHOULD_DEPLOY}; then
install -Dm 0644 ${PLM_FILE}.elf ${DEPLOYDIR}/${PLM_IMAGE_NAME}.elf
install -Dm 0644 ${PLM_FILE}.bin ${DEPLOYDIR}/${PLM_IMAGE_NAME}.bin
fi
}
+addtask deploy before do_build after do_install
ALTERNATIVE_${PN} = "plmfw"
ALTERNATIVE_TARGET[plmfw] = "/boot/${BINARY_NAME}-${BINARY_ID}${BINARY_EXT}"
diff --git a/meta-xilinx-bsp/recipes-bsp/embeddedsw/psmfw.bb b/meta-xilinx-bsp/recipes-bsp/embeddedsw/psmfw.bb
index 24044f77..0b2b86cf 100644
--- a/meta-xilinx-bsp/recipes-bsp/embeddedsw/psmfw.bb
+++ b/meta-xilinx-bsp/recipes-bsp/embeddedsw/psmfw.bb
@@ -44,14 +44,18 @@ do_install() {
install -Dm 0644 ${PSM_FILE}${BINARY_EXT} ${D}/boot/${BINARY_NAME}-${BINARY_ID}${BINARY_EXT}
}
+# If the item is already in OUR deploy_image_dir, nothing to deploy!
+SHOULD_DEPLOY = "${@'false' if (d.getVar('PSM_FILE')).startswith(d.getVar('DEPLOY_DIR_IMAGE')) else 'true'}"
do_deploy() {
# If the item is already in OUR deploy_image_dir, nothing to deploy!
- if [ "x${@'' if d.getVar('PSM_FILE').startswith(d.getVar('DEPLOY_IMAGE_DIR')) else 'copy'}" != "x" ]; then
+ if ${SHOULD_DEPLOY}; then
install -Dm 0644 ${PSM_FILE}.elf ${DEPLOYDIR}/${PSM_FIRMWARE_IMAGE_NAME}.elf
install -Dm 0644 ${PSM_FILE}.bin ${DEPLOYDIR}/${PSM_FIRMWARE_IMAGE_NAME}.bin
fi
}
+addtask deploy before do_build after do_install
+
ALTERNATIVE_${PN} = "psmfw"
ALTERNATIVE_TARGET[psmfw] = "/boot/${BINARY_NAME}-${BINARY_ID}${BINARY_EXT}"
ALTERNATIVE_LINK_NAME[psmfw] = "/boot/${BINARY_NAME}${BINARY_EXT}"