diff options
| author | Adrian Fiergolski <adrian.fiergolski@fastree3d.com> | 2019-12-16 12:54:43 +0100 |
|---|---|---|
| committer | Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com> | 2020-08-11 23:47:26 -0700 |
| commit | 61a5129a4d7143e28e5ead74c7c9e51b75baafdd (patch) | |
| tree | 50c0f14c745b7e788cee9b135a7eaae43d3b6cdc | |
| parent | bd4b6b8bb53cfce3a2d3729b7d465a3b81e51969 (diff) | |
| download | meta-xilinx-61a5129a4d7143e28e5ead74c7c9e51b75baafdd.tar.gz | |
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 <adrian.fiergolski@fastree3d.com>
| -rw-r--r-- | meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc | 4 |
1 files changed, 1 insertions, 3 deletions
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 () { | |||
| 64 | d.setVar("SPL_BINARY", "") | 64 | d.setVar("SPL_BINARY", "") |
| 65 | 65 | ||
| 66 | if providesbin and d.getVar("SOC_FAMILY") in ["zynqmp"]: | 66 | if providesbin and d.getVar("SOC_FAMILY") in ["zynqmp"]: |
| 67 | # determine the path relative to the source tree | ||
| 68 | relpath = os.path.relpath(d.expand("${PMU_FIRMWARE_DEPLOY_DIR}/${PMU_FIRMWARE_IMAGE_NAME}.bin"), d.getVar("S")) | ||
| 69 | # setup PMU Firmware path via MAKEFLAGS | 67 | # setup PMU Firmware path via MAKEFLAGS |
| 70 | d.appendVar("EXTRA_OEMAKE", " CONFIG_PMUFW_INIT_FILE=\"{0}\"".format(relpath)) | 68 | d.appendVar("EXTRA_OEMAKE", " CONFIG_PMUFW_INIT_FILE=\"{0}\"".format("${PMU_FIRMWARE_DEPLOY_DIR}/${PMU_FIRMWARE_IMAGE_NAME}.bin")) |
| 71 | } | 69 | } |
| 72 | 70 | ||
