diff options
| author | Rob Herring <robh@kernel.org> | 2017-11-09 17:05:15 -0600 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2017-11-09 17:05:15 -0600 |
| commit | 27e8524d80b7f7fa28a3c1adae5176715231caf2 (patch) | |
| tree | 63c6cd6304ae8e4cb876d887303859f2a9cd0c66 /scripts | |
| parent | 48c926cd3414c7e628909f6f831394184816da87 (diff) | |
| parent | 7e7962dd1a5307bca1793a3f9a98ad5514306c7a (diff) | |
| download | linux-next-27e8524d80b7f7fa28a3c1adae5176715231caf2.tar.gz | |
Merge branch 'dt/kbuild' into dt/next
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.dtbinst | 6 | ||||
| -rw-r--r-- | scripts/Makefile.lib | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst index 993fb85982df..8e8fdfdc92a0 100644 --- a/scripts/Makefile.dtbinst +++ b/scripts/Makefile.dtbinst @@ -5,8 +5,6 @@ # INSTALL_DTBS_PATH directory or the default location: # # $INSTALL_PATH/dtbs/$KERNELRELEASE -# -# Traverse through subdirectories listed in $(dts-dirs). # ========================================================================== src := $(obj) @@ -20,8 +18,8 @@ include include/config/auto.conf include scripts/Kbuild.include include $(src)/Makefile -dtbinst-files := $(dtb-y) -dtbinst-dirs := $(dts-dirs) +dtbinst-files := $(sort $(dtb-y) $(if $(CONFIG_OF_ALL_DTBS), $(dtb-))) +dtbinst-dirs := $(subdir-y) $(subdir-m) # Helper targets for Installing DTBs into the boot directory quiet_cmd_dtb_install = INSTALL $< diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 5e975fee0f5b..09ec69d2c499 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -69,6 +69,11 @@ obj-dirs := $(dir $(multi-objs) $(obj-y)) real-objs-y := $(foreach m, $(filter-out $(subdir-obj-y), $(obj-y)), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))),$($(m:.o=-objs)) $($(m:.o=-y)),$(m))) $(extra-y) real-objs-m := $(foreach m, $(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y)) $($(m:.o=-m))),$($(m:.o=-objs)) $($(m:.o=-y)) $($(m:.o=-m)),$(m))) +# DTB +# If CONFIG_OF_ALL_DTBS is enabled, all DT blobs are built +extra-y += $(dtb-y) +extra-$(CONFIG_OF_ALL_DTBS) += $(dtb-) + # Add subdir path extra-y := $(addprefix $(obj)/,$(extra-y)) |