From 438206f3fa7498daf23a2c5e86e7129d7b5643c5 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Tue, 16 Mar 2021 12:46:14 -0700 Subject: embeddedsw: Make it easy to change the output name of the elf binary Issue: ER-6946 Different workflows may require a slightly different name. Signed-off-by: Mark Hatle --- meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc | 6 ++++-- meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc | 6 ++++-- meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) (limited to 'meta-xilinx-standalone/recipes-bsp') diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc index 7f36b256..7ce9d446 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc @@ -53,7 +53,7 @@ do_compile() { # Again, recipe-systoot include is necessary oe_runmake CC_FLAGS="-MMD -MP -Wl,--build-id=none -I${STAGING_DIR_TARGET}/usr/include" - ${MB_OBJCOPY} -O binary ${B}/plm.elf ${B}/plm.bin + ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/plm.bin } do_install() { @@ -69,8 +69,10 @@ inherit image-artifact-names PLM_BASE_NAME ?= "${PLM_IMAGE_NAME}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" +ESW_COMPONENT ??= "plm.elf" + do_deploy() { - install -Dm 0644 ${B}/plm.elf ${DEPLOYDIR}/${PLM_BASE_NAME}.elf + install -Dm 0644 ${B}/${ESW_COMPONENT} ${DEPLOYDIR}/${PLM_BASE_NAME}.elf ln -sf ${PLM_BASE_NAME}.elf ${DEPLOYDIR}/${PLM_IMAGE_NAME}.elf install -m 0644 ${B}/plm.bin ${DEPLOYDIR}/${PLM_BASE_NAME}.bin ln -sf ${PLM_BASE_NAME}.bin ${DEPLOYDIR}/${PLM_IMAGE_NAME}.bin diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc index d8e4fa89..ced2d3c3 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc @@ -52,7 +52,7 @@ do_compile() { # Again, recipe-systoot include is necessary oe_runmake CC_FLAGS="-MMD -MP -Wl,--build-id=none -I${STAGING_DIR_TARGET}/usr/include" - ${MB_OBJCOPY} -O binary ${B}/executable.elf ${B}/executable.bin + ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/executable.bin } do_install() { @@ -68,8 +68,10 @@ inherit image-artifact-names PMU_FIRMWARE_BASE_NAME ?= "${PMU_FIRMWARE_IMAGE_NAME}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" +ESW_COMPONENT ??= "executable.elf" + do_deploy() { - install -Dm 0644 ${B}/executable.elf ${DEPLOYDIR}/${PMU_FIRMWARE_BASE_NAME}.elf + install -Dm 0644 ${B}/${ESW_COMPONENT} ${DEPLOYDIR}/${PMU_FIRMWARE_BASE_NAME}.elf ln -sf ${PMU_FIRMWARE_BASE_NAME}.elf ${DEPLOYDIR}/${PMU_FIRMWARE_IMAGE_NAME}.elf install -m 0644 ${B}/executable.bin ${DEPLOYDIR}/${PMU_FIRMWARE_BASE_NAME}.bin ln -sf ${PMU_FIRMWARE_BASE_NAME}.bin ${DEPLOYDIR}/${PMU_FIRMWARE_IMAGE_NAME}.bin diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc index 276e3804..ab39a5f8 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc @@ -53,7 +53,7 @@ do_compile() { # Again, recipe-systoot include is necessary oe_runmake CC_FLAGS="-MMD -MP -Wl,--build-id=none -I${STAGING_DIR_TARGET}/usr/include" - ${MB_OBJCOPY} -O binary ${B}/psmfw.elf ${B}/psmfw.bin + ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/psmfw.bin } do_install() { @@ -69,8 +69,10 @@ inherit image-artifact-names PSM_FIRMWARE_BASE_NAME ?= "${PSM_FIRMWARE_IMAGE_NAME}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" +ESW_COMPONENT ??= "psmfw.elf" + do_deploy() { - install -Dm 0644 ${B}/psmfw.elf ${DEPLOYDIR}/${PSM_FIRMWARE_BASE_NAME}.elf + install -Dm 0644 ${B}/${ESW_COMPONENT} ${DEPLOYDIR}/${PSM_FIRMWARE_BASE_NAME}.elf ln -sf ${PSM_FIRMWARE_BASE_NAME}.elf ${DEPLOYDIR}/${PSM_FIRMWARE_IMAGE_NAME}.elf install -m 0644 ${B}/psmfw.bin ${DEPLOYDIR}/${PSM_FIRMWARE_BASE_NAME}.bin ln -sf ${PSM_FIRMWARE_BASE_NAME}.bin ${DEPLOYDIR}/${PSM_FIRMWARE_IMAGE_NAME}.bin -- cgit v1.2.3-54-g00ecf