From a6996cfd91c868b6570d6c8d11fe805ed3a63cdd Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Tue, 25 Apr 2023 18:13:18 -0700 Subject: device-tree: Copy BASE_DTS setting from u-boot, adjust functions BASE_DTS, and DTB_FILE_NAME default based on BASE_DTS, synced with u-boot-xlnx. This will unify the default configuration and ensure we get consistent results. Signed-off-by: Mark Hatle --- meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 a35df4ac..f403185f 100644 --- a/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb +++ b/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb @@ -23,6 +23,8 @@ inherit devicetree image-artifact-names SYSTEM_DTFILE ??= "" CONFIG_DTFILE ??= "${SYSTEM_DTFILE}" +BASE_DTS ?= "${@os.path.basename(d.getVar('CONFIG_DTFILE') or '').rstrip('.dtb').rstrip('.dts') or 'system-top'}" + EXTRA_DT_FILES ?= "" EXTRA_DTFILE_PREFIX ?= "system-top" EXTRA_DTFILES_BUNDLE ?= "" @@ -55,7 +57,7 @@ PROVIDES = "virtual/dtb" # common zynq include SRC_URI:append:zynq = " file://zynq-7000-qspi-dummy.dtsi" -DTB_FILE_NAME = "${@os.path.basename(d.getVar('CONFIG_DTFILE')).replace('.dts', '.dtb') if d.getVar('CONFIG_DTFILE') else ''}" +DTB_FILE_NAME ?= "${BASE_DTS}.dtb" DTB_BASE_NAME ?= "${MACHINE}-system${IMAGE_VERSION_SUFFIX}" -- cgit v1.2.3-54-g00ecf