Merge tag 'devicetree-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mirror_ubuntu-bionic-kernel.git] / arch / mips / boot / dts / Makefile

diff --git a/arch/mips/boot/dts/Makefile b/arch/mips/boot/dts/Makefile
index e0a4e939f843f48170c4f9a2f3da4b62bd1bfb7f..e2c6f131c8ebbd5bdd3db36b89ddb44ca1aa4423 100644 (file)
--- a/arch/mips/boot/dts/Makefile
+++ b/arch/mips/boot/dts/Makefile
@@ -1,22 +1,15 @@
 # SPDX-License-Identifier: GPL-2.0
-dts-dirs       += brcm
-dts-dirs       += cavium-octeon
-dts-dirs       += img
-dts-dirs       += ingenic
-dts-dirs       += lantiq
-dts-dirs       += mti
-dts-dirs       += netlogic
-dts-dirs       += ni
-dts-dirs       += pic32
-dts-dirs       += qca
-dts-dirs       += ralink
-dts-dirs       += xilfpga
+subdir-y       += brcm
+subdir-y       += cavium-octeon
+subdir-y       += img
+subdir-y       += ingenic
+subdir-y       += lantiq
+subdir-y       += mti
+subdir-y       += netlogic
+subdir-y       += ni
+subdir-y       += pic32
+subdir-y       += qca
+subdir-y       += ralink
+subdir-y       += xilfpga
 
-obj-y          := $(addsuffix /, $(dts-dirs))
-
-dtstree                := $(srctree)/$(src)
-dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(foreach d,$(dts-dirs), $(wildcard $(dtstree)/$(d)/*.dts)))
-
-always         := $(dtb-y)
-subdir-y       := $(dts-dirs)
-clean-files    := *.dtb *.dtb.S
+obj-$(CONFIG_BUILTIN_DTB)      := $(addsuffix /, $(subdir-y))