diff options
author | Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com> | 2024-01-11 14:46:54 -0700 |
---|---|---|
committer | Mark Hatle <mark.hatle@amd.com> | 2024-01-14 12:26:23 -0700 |
commit | f3236528e124ff16b8300a749b1313392e16bb2c (patch) | |
tree | afc21b3fce2f5e33f88c26656ec39e04bfc502e9 /meta-xilinx-core/recipes-bsp/device-tree | |
parent | fd91636f7ef30defbd9ae72d86bf61cefeb50bb2 (diff) | |
download | meta-xilinx-f3236528e124ff16b8300a749b1313392e16bb2c.tar.gz |
device-tree: Fix string trailing character strip issue
Multiconfig freertos device-tree do configure task fails with below
errors:
ERROR: mc:cortexa53-0-zynqmp-freertos:device-tree-1.0-r0 do_configure: Unable to find cortexa53-0-zynqmp-freerto.dts, to use EXTRA_OVERLAYS you must set a valid CONFIG_DTFILE or use system-top.dts
ERROR: mc:cortexa53-0-zynqmp-freertos:device-tree-1.0-r0 do_configure: ExecutionError('/scratch/sandeep/yocto/2024.1/yp-dev/build-sdt/tmp-cortexa53-0-zynqmp-freertos/work/xlnx_zynqmp_zcu102_rev1_0-xilinx-elf/device-tree/1.0-r0/temp/run.do_configure.3127586', 1, None, None)
ERROR: Logfile of failure stored in: /scratch/sandeep/yocto/2024.1/yp-dev/build-sdt/tmp-cortexa53-0-zynqmp-freertos/work/xlnx_zynqmp_zcu102_rev1_0-xilinx-elf/device-tree/1.0-r0/temp/log.do_configure.3127586
ERROR: Task (mc:cortexa53-0-zynqmp-freertos:/scratch/sandeep/yocto/2024.1/yp-dev/sources/poky/../meta-xilinx/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb:do_configure) failed with exit code '1'
NOTE: Tasks Summary: Attempted 851 tasks of which 769 didn't need to be rerun and 1 failed.
Using python rstrip operations it will strip all the combinations of
its values. For example in below code
BASE_DTS ?= "${@os.path.basename(d.getVar('CONFIG_DTFILE') or '').rstrip('.dtb').rstrip('.dts') or 'system-top'}"
if CONFIG_DTFILE name is cortexa53-0-zynqmp-baremetald or
cortexa53-0-zynqmp-freertos resulting output with rstrip will be
cortexa53-0-zynqmp-baremetal
cortexa53-0-zynqmp-freerto
Hence instead of using rstrip use os.path.splitext to remove
.dtb or .dts extension from file name.
Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
Diffstat (limited to 'meta-xilinx-core/recipes-bsp/device-tree')
-rw-r--r-- | meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb b/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb index 8d7211f5..1f8ae2e3 100644 --- a/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb +++ b/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb | |||
@@ -23,7 +23,7 @@ inherit devicetree image-artifact-names | |||
23 | SYSTEM_DTFILE ??= "" | 23 | SYSTEM_DTFILE ??= "" |
24 | CONFIG_DTFILE ??= "${SYSTEM_DTFILE}" | 24 | CONFIG_DTFILE ??= "${SYSTEM_DTFILE}" |
25 | 25 | ||
26 | BASE_DTS ?= "${@os.path.basename(d.getVar('CONFIG_DTFILE') or '').rstrip('.dtb').rstrip('.dts') or 'system-top'}" | 26 | BASE_DTS ?= "${@os.path.splitext(os.path.basename(d.getVar('CONFIG_DTFILE') or ''))[0] or 'system-top'}" |
27 | 27 | ||
28 | EXTRA_DT_FILES ?= "" | 28 | EXTRA_DT_FILES ?= "" |
29 | EXTRA_DTFILE_PREFIX ?= "system-top" | 29 | EXTRA_DTFILE_PREFIX ?= "system-top" |