From 61a5129a4d7143e28e5ead74c7c9e51b75baafdd Mon Sep 17 00:00:00 2001 From: Adrian Fiergolski Date: Mon, 16 Dec 2019 12:54:43 +0100 Subject: Fix CONFIG_PMUFW_INIT_FILE extension. The solution with the relative path doesn't work if devtool is involved: getVar returns value of S variable before it gets overwritten by devtool recipe which cause compilation failure. The solution is to use absolute path to the pmu firmware. Signed-off-by: Adrian Fiergolski --- meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc') diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc index cf8b9b7c..97c449bd 100644 --- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc +++ b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc @@ -64,9 +64,7 @@ python () { d.setVar("SPL_BINARY", "") if providesbin and d.getVar("SOC_FAMILY") in ["zynqmp"]: - # determine the path relative to the source tree - relpath = os.path.relpath(d.expand("${PMU_FIRMWARE_DEPLOY_DIR}/${PMU_FIRMWARE_IMAGE_NAME}.bin"), d.getVar("S")) # setup PMU Firmware path via MAKEFLAGS - d.appendVar("EXTRA_OEMAKE", " CONFIG_PMUFW_INIT_FILE=\"{0}\"".format(relpath)) + d.appendVar("EXTRA_OEMAKE", " CONFIG_PMUFW_INIT_FILE=\"{0}\"".format("${PMU_FIRMWARE_DEPLOY_DIR}/${PMU_FIRMWARE_IMAGE_NAME}.bin")) } -- cgit v1.2.3-54-g00ecf