Skip to content

Commit 6a1d798

Browse files
committed
kbuild: Support flat DTBs install
In preparation to move Arm .dts files into sub-directories grouped by vendor/family, the current flat tree of DTBs generated by dtbs_install needs to be maintained. Moving the installed DTBs to sub-directories would break various consumers using 'make dtbs_install'. This is a NOP until sub-directories are introduced. Signed-off-by: Rob Herring <robh@kernel.org>
1 parent 86684c2 commit 6a1d798

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

arch/arm/Kconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1460,6 +1460,9 @@ config USE_OF
14601460
help
14611461
Include support for flattened device tree machine descriptions.
14621462

1463+
config ARCH_WANT_FLAT_DTB_INSTALL
1464+
def_bool y
1465+
14631466
config ATAGS
14641467
bool "Support for the traditional ATAGS boot data passing"
14651468
default y

scripts/Makefile.dtbinst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ $(dst)/%.dtbo: $(obj)/%.dtbo
3434

3535
PHONY += $(subdirs)
3636
$(subdirs):
37-
$(Q)$(MAKE) $(dtbinst)=$@ dst=$(patsubst $(obj)/%,$(dst)/%,$@)
37+
$(Q)$(MAKE) $(dtbinst)=$@ dst=$(if $(CONFIG_ARCH_WANT_FLAT_DTB_INSTALL),$(dst),$(patsubst $(obj)/%,$(dst)/%,$@))
3838

3939
.PHONY: $(PHONY)

0 commit comments

Comments
 (0)