diff options
| author | Robert Richter <rrichter@cavium.com> | 2014-09-03 15:54:55 +0200 |
|---|---|---|
| committer | Robert Richter <rrichter@cavium.com> | 2014-10-21 18:06:58 +0200 |
| commit | d38726c485d3fd6e9f2ebd1adaef0c3ead48a5ac (patch) | |
| tree | 3f49c87a782e2af45dca51c116bd7ab2d669ce8c /arch/arm | |
| parent | 9fb5e5372208973984a23ee6f5f025c05d364633 (diff) | |
| download | linux-d38726c485d3fd6e9f2ebd1adaef0c3ead48a5ac.tar.bz2 | |
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>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 10 |
2 files changed, 3 insertions, 9 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 |