From ad9315524b93751c0303622f536bfc3801c9a87e Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 7 Dec 2022 18:55:01 -0800 Subject: fsbl-firmware: Update integration Set COMPATIBLE_HOST more loosely to allow for baremetal builds. Update processing to use OBJCOPY and add additional deploy names. Signed-off-by: Mark Hatle --- .../recipes-bsp/embeddedsw/fsbl-firmware_%.bbappend | 12 ++++++++---- .../recipes-bsp/embeddedsw/fsbl-firmware.inc | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/meta-xilinx-bsp/recipes-bsp/embeddedsw/fsbl-firmware_%.bbappend b/meta-xilinx-bsp/recipes-bsp/embeddedsw/fsbl-firmware_%.bbappend index 509a0dbb..6a23dc47 100644 --- a/meta-xilinx-bsp/recipes-bsp/embeddedsw/fsbl-firmware_%.bbappend +++ b/meta-xilinx-bsp/recipes-bsp/embeddedsw/fsbl-firmware_%.bbappend @@ -1,16 +1,20 @@ # QEMU for the Kria SOM requires a section from the FSBL to be extracted -FSBL_DEFAULT_NAME = "executable.elf" -PMU_CONF_NAME = "pmu-conf.bin" +PMU_CONF_NAME ?= "pmu-conf" +PMU_CONF_BASE_NAME ?= "${PMU_CONF_NAME}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" + +# Required so we can run objcopy in do_compile +DEPENDS:append:zynqmp = " virtual/${TARGET_PREFIX}binutils" do_compile:append:zynqmp () { if [ -z "${SYSTEM_DTFILE}" ]; then - aarch64-none-elf-objcopy --dump-section .sys_cfg_data=../${PMU_CONF_NAME} ${FSBL_DEFAULT_NAME} + ${OBJCOPY} --dump-section .sys_cfg_data=${B}/${PMU_CONF_NAME}.bin ${B}/${ESW_COMPONENT} fi } do_deploy:append:zynqmp () { if [ -z "${SYSTEM_DTFILE}" ]; then - install -Dm 0644 ${B}/${PMU_CONF_NAME} ${DEPLOYDIR}/${PMU_CONF_NAME} + install -Dm 0644 ${B}/${PMU_CONF_NAME}.bin ${DEPLOYDIR}/${PMU_CONF_BASE_NAME}.bin + ln -s ${PMU_CONF_BASE_NAME}.bin ${DEPLOYDIR}/${PMU_CONF_NAME}.bin fi } diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware.inc index 0e855eef..34051bfa 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware.inc +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware.inc @@ -2,7 +2,7 @@ DESCRIPTION = "First Stage Bootloader" inherit xlnx-embeddedsw deploy -COMPATIBLE_HOST = ".*-(elf|eabi)" +COMPATIBLE_HOST = ".*-(elf|.*eabi)" COMPATIBLE_MACHINE = "none" COMPATIBLE_MACHINE:zynq = ".*" COMPATIBLE_MACHINE:zynqmp = ".*" -- cgit v1.2.3-54-g00ecf