From 232195510c63685496c2c4fd132713222c312b9b Mon Sep 17 00:00:00 2001 From: Qubot <1445788683@qq.com> Date: Fri, 12 Jun 2026 21:28:00 +0800 Subject: [PATCH] kbuild: install DT overlays from dtbo-y --- scripts/Makefile.dtbinst | 3 ++- scripts/Makefile.lib | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst index 190d781e8..73fb0a1b4 100644 --- a/scripts/Makefile.dtbinst +++ b/scripts/Makefile.dtbinst @@ -17,7 +17,8 @@ include include/config/auto.conf include $(srctree)/scripts/Kbuild.include include $(src)/Makefile -dtbs := $(addprefix $(dst)/, $(dtb-y) $(if $(CONFIG_OF_ALL_DTBS),$(dtb-))) +dtbs := $(addprefix $(dst)/, $(dtb-y) $(dtbo-y) \ + $(if $(CONFIG_OF_ALL_DTBS),$(dtb-) $(dtbo-))) subdirs := $(addprefix $(obj)/, $(subdir-y) $(subdir-m)) __dtbs_install: $(dtbs) $(subdirs) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 0a8a4689c..354bedc43 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -77,6 +77,7 @@ always-y += $(userprogs-always-y) $(userprogs-always-m) # DTB # If CONFIG_OF_ALL_DTBS is enabled, all DT blobs are built dtb-$(CONFIG_OF_ALL_DTBS) += $(dtb-) +dtbo-$(CONFIG_OF_ALL_DTBS) += $(dtbo-) # Composite DTB (i.e. DTB constructed by overlay) multi-dtb-y := $(call multi-search, $(dtb-y), .dtb, -dtbs) @@ -85,7 +86,7 @@ real-dtb-y := $(call real-search, $(dtb-y), .dtb, -dtbs) # Base DTB that overlay is applied onto (each first word of $(*-dtbs) expansion) base-dtb-y := $(foreach m, $(multi-dtb-y), $(firstword $(call suffix-search, $m, .dtb, -dtbs))) -always-y += $(dtb-y) +always-y += $(dtb-y) $(dtbo-y) ifneq ($(CHECK_DTBS),) always-y += $(patsubst %.dtb,%.dt.yaml, $(real-dtb-y))