From 3435486f367d341cd143425c3ff9d307380d2935 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Mon, 30 Sep 2024 12:20:36 +0200 Subject: [PATCH] Extend usage for OF_OVERLAY_LIST beyond SPL Allow to use OF_OVERLAY_LIST also for the case that the overlays just need be built, e.g. when they will be picked up by binman as artifacts of the final U-Boot image. The IOT2050 boards have such a need when switching to OF_UPSTREAM. Signed-off-by: Jan Kiszka Reviewed-by: Sumit Garg Reviewed-by: Simon Glass --- dts/Kconfig | 4 ++-- scripts/Makefile.dts | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dts/Kconfig b/dts/Kconfig index 569d4be338..7ea4fd5a79 100644 --- a/dts/Kconfig +++ b/dts/Kconfig @@ -226,11 +226,11 @@ config OF_LIST config OF_OVERLAY_LIST string "List of device tree overlays to include for DT control" - depends on SPL_LOAD_FIT_APPLY_OVERLAY help This option specifies a list of device tree overlays to use for DT control. This option can then be used by a FIT generator to include - the overlays in the FIT image. + the overlays in the FIT image or by binman when assembling an image + that uses overlays during DT fixup. choice prompt "OF LIST compression" diff --git a/scripts/Makefile.dts b/scripts/Makefile.dts index 1fe142f2bb..994098c2db 100644 --- a/scripts/Makefile.dts +++ b/scripts/Makefile.dts @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0+ dtb-y += $(patsubst %,%.dtb,$(subst ",,$(CONFIG_DEFAULT_DEVICE_TREE) $(CONFIG_OF_LIST) $(CONFIG_SPL_OF_LIST))) +dtb-y += $(patsubst %,%.dtbo,$(subst ",,$(CONFIG_OF_OVERLAY_LIST))) ifeq ($(CONFIG_OF_UPSTREAM_BUILD_VENDOR),y) ifeq ($(CONFIG_ARM64),y) -- 2.39.5