diff options
| author | Robert Richter <rrichter@cavium.com> | 2014-09-03 15:54:55 +0200 |
|---|---|---|
| committer | Daniel Thompson <daniel.thompson@linaro.org> | 2017-01-23 19:28:22 +0000 |
| commit | d8fee2daf718d4b53449dc7e744eaddb6c8a648c (patch) | |
| tree | 3ff8f7a39af8e76879104c9fb7e0ac963289b1af | |
| parent | 7857f0a70f66cee3779ecb6d64b36c633c51ad77 (diff) | |
UPSTREAM: dts, arm/arm64: Remove dtbs build rules in sub-makes
Add dtb files to build targets and let kbuild handle them. Thus,
special dtbs rules can be removed. This eases Makefiles and the
implementation of the support of vendor dtb subdirectories.
Signed-off-by: Robert Richter <rrichter@cavium.com>
Patchset: dts, kbuild: Implement support for dtb vendor subdirs
(cherry picked from commit d38726c485d3fd6e9f2ebd1adaef0c3ead48a5ac)
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Daniel Thompson <daniel.thompson@linaro.org>
| -rw-r--r-- | arch/arm/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 11 | ||||
| -rw-r--r-- | arch/arm64/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/Makefile | 7 |
4 files changed, 6 insertions, 16 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index c350d0ea2581..7de6eb721ae3 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -316,7 +316,7 @@ $(INSTALL_TARGETS): PHONY += dtbs dtbs_install dtbs: prepare scripts - $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $@ + $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) dtbs_install: $(Q)$(MAKE) $(dtbinst)=$(boot)/dts MACHINE=$(MACHINE) diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 00460fc3aef0..e49d3e9d7320 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -523,14 +523,7 @@ DTB_LIST := $(addsuffix .dtb,$(DTB_NAMES)) else DTB_LIST := $(dtb-y) endif - -targets += dtbs dtbs_install -targets += $(DTB_LIST) endif -# *.dtb used to be generated in the directory above. Clean out the -# old build results so people don't accidentally use them. -dtbs: $(addprefix $(obj)/, $(DTB_LIST)) - $(Q)rm -f $(obj)/../*.dtb - -clean-files := *.dtb +always := $(dtb-y) +clean-files := *.dtb diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index 20769ee0b6de..8642eac78074 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -79,7 +79,7 @@ zinstall install: vmlinux PHONY += dtbs dtbs_install dtbs: prepare scripts - $(Q)$(MAKE) $(build)=$(boot)/dts $@ + $(Q)$(MAKE) $(build)=$(boot)/dts dtbs_install: $(Q)$(MAKE) $(dtbinst)=$(boot)/dts diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile index c7f83b2ac1ea..d2ef9827de1b 100644 --- a/arch/arm64/boot/dts/Makefile +++ b/arch/arm64/boot/dts/Makefile @@ -2,8 +2,6 @@ dtb-$(CONFIG_ARCH_THUNDER) += thunder-88xx.dtb dtb-$(CONFIG_ARCH_VEXPRESS) += rtsm_ve-aemv8a.dtb foundation-v8.dtb dtb-$(CONFIG_ARCH_XGENE) += apm-mustang.dtb -targets += dtbs dtbs_install - DTB_NAMES := $(subst $\",,$(CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE_NAMES)) ifneq ($(DTB_NAMES),) DTB_LIST := $(addsuffix .dtb,$(DTB_NAMES)) @@ -12,6 +10,5 @@ DTB_LIST := $(dtb-y) endif targets += $(DTB_LIST) -dtbs: $(addprefix $(obj)/, $(DTB_LIST)) - -clean-files := dts/*.dtb *.dtb +always := $(dtb-y) +clean-files := *.dtb |