aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Richter <rrichter@cavium.com>2014-09-03 15:54:55 +0200
committerKevin Hilman <khilman@linaro.org>2015-05-13 11:53:11 -0700
commit3a2a5c941a4bb9b5d80f2525118972ed6c48c1b3 (patch)
treecc962637f63fa51263b8b7dace49a1a7a6625a7b
parent8456bd7ceec5f9f897e82490c534d04657146f6d (diff)
downloadlinux-linaro-stable-3a2a5c941a4bb9b5d80f2525118972ed6c48c1b3.tar.gz
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> (cherry picked from commit d38726c485d3fd6e9f2ebd1adaef0c3ead48a5ac) Signed-off-by: Kevin Hilman <khilman@linaro.org>
-rw-r--r--arch/arm/Makefile2
-rw-r--r--arch/arm/boot/dts/Makefile10
-rw-r--r--arch/arm64/Makefile2
-rw-r--r--arch/arm64/boot/dts/Makefile8
4 files changed, 6 insertions, 16 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index c81e0674e568..b61adfae29d1 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -314,7 +314,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 e0d348b4d1fa..6e784fac5798 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -517,13 +517,7 @@ dtb-$(CONFIG_MACH_DOVE) += dove-cm-a510.dtb \
dove-dove-db.dtb
dtb-$(CONFIG_ARCH_MEDIATEK) += mt6589-aquaris5.dtb
-targets += dtbs dtbs_install
-targets += $(dtb-y)
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-y))
- $(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 8e9167a19b6b..1c43cec971b5 100644
--- a/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@ -73,7 +73,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 29ac5adf50ae..aa28902c3582 100644
--- a/arch/arm64/boot/dts/Makefile
+++ b/arch/arm64/boot/dts/Makefile
@@ -2,9 +2,5 @@ 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
-targets += $(dtb-y)
-
-dtbs: $(addprefix $(obj)/, $(dtb-y))
-
-clean-files := *.dtb
+always := $(dtb-y)
+clean-files := *.dtb