diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.build | 7 | ||||
| -rw-r--r-- | scripts/Makefile.dtbs | 8 |
2 files changed, 9 insertions, 6 deletions
diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 0b4485b564af..8bb92c986298 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -38,6 +38,11 @@ include $(srctree)/scripts/Makefile.compiler include $(kbuild-file) include $(srctree)/scripts/Makefile.lib +# Make DT directory targets reachable for architectures with a DTS tree. +ifeq ($(obj),arch/$(SRCARCH)) +subdir-$(need-dtbslist) += boot/dts +endif + # flags that take effect in current and sub directories KBUILD_AFLAGS += $(subdir-asflags-y) KBUILD_CFLAGS += $(subdir-ccflags-y) @@ -589,7 +594,7 @@ targets += $(filter-out $(single-subdir-goals), $(MAKECMDGOALS)) targets := $(filter-out $(PHONY), $(targets)) # Now that targets is fully known, include dtb rules if needed -ifneq ($(need-dtbslist)$(dtb-y)$(dtb-)$(filter %.dtb %.dtb.o %.dtbo.o,$(targets)),) +ifneq ($(need-dtbslist)$(dtb-y)$(dtb-) $(filter %.dtb %.dtbo %.dtb.o %.dtbo.o,$(targets)),) include $(srctree)/scripts/Makefile.dtbs endif diff --git a/scripts/Makefile.dtbs b/scripts/Makefile.dtbs index c4e466390284..6a1f5f7aad89 100644 --- a/scripts/Makefile.dtbs +++ b/scripts/Makefile.dtbs @@ -23,17 +23,15 @@ dtb-y := $(addprefix $(obj)/, $(dtb-y)) multi-dtb-y := $(addprefix $(obj)/, $(multi-dtb-y)) real-dtb-y := $(addprefix $(obj)/, $(real-dtb-y)) -always-y += $(dtb-y) +always-$(need-dtbslist) += $(dtb-y) targets += $(real-dtb-y) # dtbs-list # --------------------------------------------------------------------------- -ifdef need-dtbslist subdir-dtbslist := $(addsuffix /dtbs-list, $(subdir-ym)) -dtb-y += $(subdir-dtbslist) -always-y += $(obj)/dtbs-list -endif +dtb-$(need-dtbslist) += $(subdir-dtbslist) +always-$(need-dtbslist) += $(obj)/dtbs-list $(subdir-dtbslist): $(obj)/%/dtbs-list: $(obj)/% ; |