From d3511b5be3126ddd2604775be8fede071e255f8c Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Fri, 7 Feb 2025 16:30:15 -0700 Subject: pmu-rom-native: Move to using PMU_ROM variable In order to coordinate the deployed filename and machine qemu setting, use the common variable PMU_ROM. Note, the variable needs to be defined in a global location as native recipes are not run with machine.conf loaded. Signed-off-by: Mark Hatle --- meta-xilinx-core/conf/layer.conf | 3 +++ meta-xilinx-core/conf/machine/include/soc-zynqmp.inc | 4 ---- meta-xilinx-core/recipes-bsp/pmu-firmware/pmu-rom-native.bb | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index 105b1c84..329bb29d 100644 --- a/meta-xilinx-core/conf/layer.conf +++ b/meta-xilinx-core/conf/layer.conf @@ -112,6 +112,9 @@ AI_ENGINE_DRIVER_VERSION[v2024.1] = "3.5" AI_ENGINE_DRIVER_VERSION[v2024.2] = "3.6" PREFERRED_VERSION_ai-engine-driver ?= "${@d.getVarFlag('AI_ENGINE_DRIVER_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" +# Define the pmu-rom filename, needed for coordination between native and machine recipes +PMU_ROM ?= "pmu-rom.elf" + # Add support to eSDK for gen-machine-conf if it exists PLNX_SCRIPTS_PATH = "${LAYERDIR}/gen-machine-conf/gen-machine-scripts" BB_HASHEXCLUDE_COMMON:append = " PLNX_SCRIPTS_PATH" diff --git a/meta-xilinx-core/conf/machine/include/soc-zynqmp.inc b/meta-xilinx-core/conf/machine/include/soc-zynqmp.inc index 74029c4a..88a95d9f 100644 --- a/meta-xilinx-core/conf/machine/include/soc-zynqmp.inc +++ b/meta-xilinx-core/conf/machine/include/soc-zynqmp.inc @@ -20,10 +20,6 @@ UBOOT_SUFFIX ?= "bin" XSERVER_EXT:zynqmp ?= "xf86-video-armsoc" -# Default PMU ROM -PMU_ROM ?= "${DEPLOY_DIR_IMAGE}/pmu-rom.elf" - - # Default expects the user to provide a specific pmu-firwmare in the deploy # directory, named "pmu-firmware-${MACHINE}.elf" PMU_DEPENDS ??= "" diff --git a/meta-xilinx-core/recipes-bsp/pmu-firmware/pmu-rom-native.bb b/meta-xilinx-core/recipes-bsp/pmu-firmware/pmu-rom-native.bb index 44ad9368..ef20397d 100644 --- a/meta-xilinx-core/recipes-bsp/pmu-firmware/pmu-rom-native.bb +++ b/meta-xilinx-core/recipes-bsp/pmu-firmware/pmu-rom-native.bb @@ -21,7 +21,7 @@ do_compile[noexec] = "1" do_install[noexec] = "1" do_deploy () { - install -D ${S}/pmu-rom.elf ${DEPLOYDIR}/pmu-rom.elf + install -D ${S}/pmu-rom.elf ${DEPLOYDIR}/${PMU_ROM} } addtask deploy before do_build after do_install -- cgit v1.2.3-54-g00ecf