aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2017-11-09 18:05:15 -0500
committerRob Herring <robh@kernel.org>2017-11-09 18:05:15 -0500
commit27e8524d80b7f7fa28a3c1adae5176715231caf2 (patch)
tree63c6cd6304ae8e4cb876d887303859f2a9cd0c66
parent48c926cd3414c7e628909f6f831394184816da87 (diff)
parent7e7962dd1a5307bca1793a3f9a98ad5514306c7a (diff)
Merge branch 'dt/kbuild' into dt/next
-rw-r--r--.gitignore44
-rw-r--r--Documentation/kbuild/makefiles.txt1
-rw-r--r--Makefile2
-rw-r--r--arch/arc/boot/.gitignore1
-rw-r--r--arch/arc/boot/dts/Makefile8
-rw-r--r--arch/arm/boot/.gitignore1
-rw-r--r--arch/arm/boot/dts/Makefile6
-rw-r--r--arch/arm64/boot/dts/.gitignore1
-rw-r--r--arch/arm64/boot/dts/Makefile58
-rw-r--r--arch/arm64/boot/dts/actions/Makefile4
-rw-r--r--arch/arm64/boot/dts/al/Makefile4
-rw-r--r--arch/arm64/boot/dts/allwinner/Makefile4
-rw-r--r--arch/arm64/boot/dts/altera/Makefile4
-rw-r--r--arch/arm64/boot/dts/amd/Makefile4
-rw-r--r--arch/arm64/boot/dts/amlogic/Makefile4
-rw-r--r--arch/arm64/boot/dts/apm/Makefile4
-rw-r--r--arch/arm64/boot/dts/arm/Makefile4
-rw-r--r--arch/arm64/boot/dts/broadcom/Makefile7
-rw-r--r--arch/arm64/boot/dts/broadcom/northstar2/Makefile4
-rw-r--r--arch/arm64/boot/dts/broadcom/stingray/Makefile4
-rw-r--r--arch/arm64/boot/dts/cavium/Makefile4
-rw-r--r--arch/arm64/boot/dts/exynos/Makefile4
-rw-r--r--arch/arm64/boot/dts/freescale/Makefile4
-rw-r--r--arch/arm64/boot/dts/hisilicon/Makefile4
-rw-r--r--arch/arm64/boot/dts/lg/Makefile4
-rw-r--r--arch/arm64/boot/dts/marvell/Makefile4
-rw-r--r--arch/arm64/boot/dts/mediatek/Makefile4
-rw-r--r--arch/arm64/boot/dts/nvidia/Makefile3
-rw-r--r--arch/arm64/boot/dts/qcom/Makefile4
-rw-r--r--arch/arm64/boot/dts/realtek/Makefile4
-rw-r--r--arch/arm64/boot/dts/renesas/Makefile3
-rw-r--r--arch/arm64/boot/dts/rockchip/Makefile4
-rw-r--r--arch/arm64/boot/dts/socionext/Makefile3
-rw-r--r--arch/arm64/boot/dts/sprd/Makefile4
-rw-r--r--arch/arm64/boot/dts/xilinx/Makefile4
-rw-r--r--arch/arm64/boot/dts/zte/Makefile4
-rw-r--r--arch/c6x/boot/dts/Makefile2
-rw-r--r--arch/cris/boot/dts/Makefile2
-rw-r--r--arch/h8300/boot/dts/Makefile6
-rw-r--r--arch/metag/boot/.gitignore1
-rw-r--r--arch/metag/boot/dts/Makefile6
-rw-r--r--arch/microblaze/boot/.gitignore1
-rw-r--r--arch/microblaze/boot/Makefile2
-rw-r--r--arch/mips/boot/.gitignore1
-rw-r--r--arch/mips/boot/dts/Makefile33
-rw-r--r--arch/mips/boot/dts/brcm/Makefile4
-rw-r--r--arch/mips/boot/dts/cavium-octeon/Makefile3
-rw-r--r--arch/mips/boot/dts/img/Makefile3
-rw-r--r--arch/mips/boot/dts/ingenic/Makefile3
-rw-r--r--arch/mips/boot/dts/lantiq/Makefile3
-rw-r--r--arch/mips/boot/dts/mti/Makefile3
-rw-r--r--arch/mips/boot/dts/netlogic/Makefile3
-rw-r--r--arch/mips/boot/dts/ni/Makefile3
-rw-r--r--arch/mips/boot/dts/pic32/Makefile3
-rw-r--r--arch/mips/boot/dts/qca/Makefile3
-rw-r--r--arch/mips/boot/dts/ralink/Makefile3
-rw-r--r--arch/mips/boot/dts/xilfpga/Makefile3
-rw-r--r--arch/nios2/boot/.gitignore1
-rw-r--r--arch/nios2/boot/Makefile2
-rw-r--r--arch/openrisc/boot/dts/Makefile2
-rw-r--r--arch/powerpc/boot/.gitignore1
-rw-r--r--arch/powerpc/boot/Makefile2
-rw-r--r--arch/sh/boot/dts/Makefile2
-rw-r--r--arch/xtensa/boot/.gitignore1
-rw-r--r--arch/xtensa/boot/dts/Makefile9
-rw-r--r--drivers/of/unittest-data/.gitignore2
-rw-r--r--scripts/Makefile.dtbinst6
-rw-r--r--scripts/Makefile.lib5
68 files changed, 79 insertions, 275 deletions
diff --git a/.gitignore b/.gitignore
index 0c39aa20b6ba..6c119eab5d46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,38 +7,40 @@
7# command after changing this file, to see if there are 7# command after changing this file, to see if there are
8# any tracked files which get ignored after the change. 8# any tracked files which get ignored after the change.
9# 9#
10# Normal rules 10# Normal rules (sorted alphabetically)
11# 11#
12.* 12.*
13*.a
14*.bin
15*.bz2
16*.c.[012]*.*
17*.dtb
18*.dtb.S
19*.dwo
20*.elf
21*.gcno
22*.gz
23*.i
24*.ko
25*.ll
26*.lst
27*.lz4
28*.lzma
29*.lzo
30*.mod.c
13*.o 31*.o
14*.o.* 32*.o.*
15*.a 33*.order
34*.patch
16*.s 35*.s
17*.ko
18*.so 36*.so
19*.so.dbg 37*.so.dbg
20*.mod.c 38*.su
21*.i
22*.lst
23*.symtypes 39*.symtypes
24*.order
25*.elf
26*.bin
27*.tar 40*.tar
28*.gz
29*.bz2
30*.lzma
31*.xz 41*.xz
32*.lz4
33*.lzo
34*.patch
35*.gcno
36*.ll
37modules.builtin
38Module.symvers 42Module.symvers
39*.dwo 43modules.builtin
40*.su
41*.c.[012]*.*
42 44
43# 45#
44# Top-level generic files 46# Top-level generic files
diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt
index 329e740adea7..411b7282c287 100644
--- a/Documentation/kbuild/makefiles.txt
+++ b/Documentation/kbuild/makefiles.txt
@@ -1153,7 +1153,6 @@ When kbuild executes, the following steps are followed (roughly):
1153 1153
1154 Example: 1154 Example:
1155 targets += $(dtb-y) 1155 targets += $(dtb-y)
1156 clean-files += *.dtb
1157 DTC_FLAGS ?= -p 1024 1156 DTC_FLAGS ?= -p 1024
1158 1157
1159--- 6.8 Custom kbuild commands 1158--- 6.8 Custom kbuild commands
diff --git a/Makefile b/Makefile
index 64cbc66cebca..c1dcd852455e 100644
--- a/Makefile
+++ b/Makefile
@@ -1544,7 +1544,7 @@ clean: $(clean-dirs)
1544 $(call cmd,rmfiles) 1544 $(call cmd,rmfiles)
1545 @find $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \ 1545 @find $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \
1546 \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \ 1546 \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
1547 -o -name '*.ko.*' \ 1547 -o -name '*.ko.*' -o -name '*.dtb' -o -name '*.dtb.S' \
1548 -o -name '*.dwo' \ 1548 -o -name '*.dwo' \
1549 -o -name '*.su' \ 1549 -o -name '*.su' \
1550 -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \ 1550 -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \
diff --git a/arch/arc/boot/.gitignore b/arch/arc/boot/.gitignore
index 5246969a20c5..c4c5fd529c25 100644
--- a/arch/arc/boot/.gitignore
+++ b/arch/arc/boot/.gitignore
@@ -1,2 +1 @@
1*.dtb*
2uImage uImage
diff --git a/arch/arc/boot/dts/Makefile b/arch/arc/boot/dts/Makefile
index a09f11b71e66..9ece28b0a83f 100644
--- a/arch/arc/boot/dts/Makefile
+++ b/arch/arc/boot/dts/Makefile
@@ -10,8 +10,6 @@ dtb-y := $(builtindtb-y).dtb
10 10
11.SECONDARY: $(obj)/$(builtindtb-y).dtb.S 11.SECONDARY: $(obj)/$(builtindtb-y).dtb.S
12 12
13dtstree := $(srctree)/$(src) 13# for CONFIG_OF_ALL_DTBS test
14dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts)) 14dtstree := $(srctree)/$(src)
15 15dtb- := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts))
16always := $(dtb-y)
17clean-files := *.dtb *.dtb.S
diff --git a/arch/arm/boot/.gitignore b/arch/arm/boot/.gitignore
index 3c79f85975aa..ce1c5ff746e7 100644
--- a/arch/arm/boot/.gitignore
+++ b/arch/arm/boot/.gitignore
@@ -3,4 +3,3 @@ zImage
3xipImage 3xipImage
4bootpImage 4bootpImage
5uImage 5uImage
6*.dtb
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index faf46abaa4a2..4b650d6de017 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -1069,9 +1069,3 @@ dtb-$(CONFIG_ARCH_ASPEED) += aspeed-bmc-opp-palmetto.dtb \
1069 aspeed-bmc-opp-romulus.dtb \ 1069 aspeed-bmc-opp-romulus.dtb \
1070 aspeed-ast2500-evb.dtb 1070 aspeed-ast2500-evb.dtb
1071endif 1071endif
1072
1073dtstree := $(srctree)/$(src)
1074dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts))
1075
1076always := $(dtb-y)
1077clean-files := *.dtb
diff --git a/arch/arm64/boot/dts/.gitignore b/arch/arm64/boot/dts/.gitignore
deleted file mode 100644
index b60ed208c779..000000000000
--- a/arch/arm64/boot/dts/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
1*.dtb
diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile
index 8e1951273fd7..a7ecb42e84e6 100644
--- a/arch/arm64/boot/dts/Makefile
+++ b/arch/arm64/boot/dts/Makefile
@@ -1,33 +1,25 @@
1dts-dirs += actions 1subdir-y += actions
2dts-dirs += al 2subdir-y += al
3dts-dirs += allwinner 3subdir-y += allwinner
4dts-dirs += altera 4subdir-y += altera
5dts-dirs += amd 5subdir-y += amd
6dts-dirs += amlogic 6subdir-y += amlogic
7dts-dirs += apm 7subdir-y += apm
8dts-dirs += arm 8subdir-y += arm
9dts-dirs += broadcom 9subdir-y += broadcom
10dts-dirs += cavium 10subdir-y += cavium
11dts-dirs += exynos 11subdir-y += exynos
12dts-dirs += freescale 12subdir-y += freescale
13dts-dirs += hisilicon 13subdir-y += hisilicon
14dts-dirs += marvell 14subdir-y += marvell
15dts-dirs += mediatek 15subdir-y += mediatek
16dts-dirs += nvidia 16subdir-y += nvidia
17dts-dirs += qcom 17subdir-y += qcom
18dts-dirs += realtek 18subdir-y += realtek
19dts-dirs += renesas 19subdir-y += renesas
20dts-dirs += rockchip 20subdir-y += rockchip
21dts-dirs += socionext 21subdir-y += socionext
22dts-dirs += sprd 22subdir-y += sprd
23dts-dirs += xilinx 23subdir-y += xilinx
24dts-dirs += lg 24subdir-y += lg
25dts-dirs += zte 25subdir-y += zte
26
27subdir-y := $(dts-dirs)
28
29dtstree := $(srctree)/$(src)
30
31dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(foreach d,$(dts-dirs), $(wildcard $(dtstree)/$(d)/*.dts)))
32
33always := $(dtb-y)
diff --git a/arch/arm64/boot/dts/actions/Makefile b/arch/arm64/boot/dts/actions/Makefile
index 62922d688ce3..cc4661256356 100644
--- a/arch/arm64/boot/dts/actions/Makefile
+++ b/arch/arm64/boot/dts/actions/Makefile
@@ -1,5 +1 @@
1dtb-$(CONFIG_ARCH_ACTIONS) += s900-bubblegum-96.dtb dtb-$(CONFIG_ARCH_ACTIONS) += s900-bubblegum-96.dtb
2
3always := $(dtb-y)
4subdir-y := $(dts-dirs)
5clean-files := *.dtb
diff --git a/arch/arm64/boot/dts/al/Makefile b/arch/arm64/boot/dts/al/Makefile
index 8a6cde4f9b23..036e387112ed 100644
--- a/arch/arm64/boot/dts/al/Makefile
+++ b/arch/arm64/boot/dts/al/Makefile
@@ -1,5 +1 @@
1dtb-$(CONFIG_ARCH_ALPINE) += alpine-v2-evp.dtb dtb-$(CONFIG_ARCH_ALPINE) += alpine-v2-evp.dtb
2
3always := $(dtb-y)
4subdir-y := $(dts-dirs)
5clean-files := *.dtb
diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile
index 19c3fbd75eda..4dab590d24a5 100644
--- a/arch/arm64/boot/dts/allwinner/Makefile
+++ b/arch/arm64/boot/dts/allwinner/Makefile
@@ -8,7 +8,3 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-pc2.dtb
8dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-prime.dtb 8dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-prime.dtb
9dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus2.dtb 9dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus2.dtb
10dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-neo2.dtb 10dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-neo2.dtb
11
12always := $(dtb-y)
13subdir-y := $(dts-dirs)
14clean-files := *.dtb
diff --git a/arch/arm64/boot/dts/altera/Makefile b/arch/arm64/boot/dts/altera/Makefile
index d7a641698d77..68ba0882a8bb 100644
--- a/arch/arm64/boot/dts/altera/Makefile
+++ b/arch/arm64/boot/dts/altera/Makefile
@@ -1,5 +1 @@
1dtb-$(CONFIG_ARCH_STRATIX10) += socfpga_stratix10_socdk.dtb dtb-$(CONFIG_ARCH_STRATIX10) += socfpga_stratix10_socdk.dtb
2
3always := $(dtb-y)
4subdir-y := $(dts-dirs)
5clean-files := *.dtb
diff --git a/arch/arm64/boot/dts/amd/Makefile b/arch/arm64/boot/dts/amd/Makefile
index ba84770f789f..465cea694a6a 100644
--- a/arch/arm64/boot/dts/amd/Makefile
+++ b/arch/arm64/boot/dts/amd/Makefile
@@ -1,7 +1,3 @@
1dtb-$(CONFIG_ARCH_SEATTLE) += amd-overdrive.dtb \ 1dtb-$(CONFIG_ARCH_SEATTLE) += amd-overdrive.dtb \
2 amd-overdrive-rev-b0.dtb amd-overdrive-rev-b1.dtb \ 2 amd-overdrive-rev-b0.dtb amd-overdrive-rev-b1.dtb \
3 husky.dtb 3 husky.dtb
4
5always := $(dtb-y)
6subdir-y := $(dts-dirs)
7clean-files := *.dtb
diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
index 7a9f48c27b1f..4eb8f829472e 100644
--- a/arch/arm64/boot/dts/amlogic/Makefile
+++ b/arch/arm64/boot/dts/amlogic/Makefile
@@ -19,7 +19,3 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-nexbox-a1.dtb
19dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q200.dtb 19dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q200.dtb
20dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q201.dtb 20dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q201.dtb
21dtb-$(CONFIG_ARCH_MESON) += meson-gxm-rbox-pro.dtb 21dtb-$(CONFIG_ARCH_MESON) += meson-gxm-rbox-pro.dtb
22
23always := $(dtb-y)
24subdir-y := $(dts-dirs)
25clean-files := *.dtb
diff --git a/arch/arm64/boot/dts/apm/Makefile b/arch/arm64/boot/dts/apm/Makefile
index c75f17a49471..b96cd388ca7b 100644
--- a/arch/arm64/boot/dts/apm/Makefile
+++ b/arch/arm64/boot/dts/apm/Makefile
@@ -1,6 +1,2 @@
1dtb-$(CONFIG_ARCH_XGENE) += apm-mustang.dtb 1dtb-$(CONFIG_ARCH_XGENE) += apm-mustang.dtb
2dtb-$(CONFIG_ARCH_XGENE) += apm-merlin.dtb 2dtb-$(CONFIG_ARCH_XGENE) += apm-merlin.dtb
3
4always := $(dtb-y)
5subdir-y := $(dts-dirs)
6clean-files := *.dtb
diff --git a/arch/arm64/boot/dts/arm/Makefile b/arch/arm64/boot/dts/arm/Makefile
index 75cc2aa10101..7ca6a6ec3d68 100644
--- a/arch/arm64/boot/dts/arm/Makefile
+++ b/arch/arm64/boot/dts/arm/Makefile
@@ -2,7 +2,3 @@ dtb-$(CONFIG_ARCH_VEXPRESS) += foundation-v8.dtb foundation-v8-gicv3.dtb
2dtb-$(CONFIG_ARCH_VEXPRESS) += juno.dtb juno-r1.dtb juno-r2.dtb 2dtb-$(CONFIG_ARCH_VEXPRESS) += juno.dtb juno-r1.dtb juno-r2.dtb
3dtb-$(CONFIG_ARCH_VEXPRESS) += rtsm_ve-aemv8a.dtb 3dtb-$(CONFIG_ARCH_VEXPRESS) += rtsm_ve-aemv8a.dtb
4dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2f-1xv7-ca53x2.dtb 4dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2f-1xv7-ca53x2.dtb
5
6always := $(dtb-y)
7subdir-y := $(dts-dirs)
8clean-files := *.dtb
diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile
index 3eaef3895d66..da268c69787f 100644
--- a/arch/arm64/boot/dts/broadcom/Makefile
+++ b/arch/arm64/boot/dts/broadcom/Makefile
@@ -1,7 +1,4 @@
1dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-b.dtb 1dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-b.dtb
2 2
3dts-dirs += northstar2 3subdir-y += northstar2
4dts-dirs += stingray 4subdir-y += stingray
5always := $(dtb-y)
6subdir-y := $(dts-dirs)
7clean-files := *.dtb
diff --git a/arch/arm64/boot/dts/broadcom/northstar2/Makefile b/arch/arm64/boot/dts/broadcom/northstar2/Makefile
index e01a1485b813..83736004336d 100644
--- a/arch/arm64/boot/dts/broadcom/northstar2/Makefile
+++ b/arch/arm64/boot/dts/broadcom/northstar2/Makefile
@@ -1,6 +1,2 @@
1dtb-$(CONFIG_ARCH_BCM_IPROC) += ns2-svk.dtb 1dtb-$(CONFIG_ARCH_BCM_IPROC) += ns2-svk.dtb
2dtb-$(CONFIG_ARCH_BCM_IPROC) += ns2-xmc.dtb 2dtb-$(CONFIG_ARCH_BCM_IPROC) += ns2-xmc.dtb
3
4always := $(dtb-y)
5subdir-y := $(dts-dirs)
6clean-files := *.dtb
diff --git a/arch/arm64/boot/dts/broadcom/stingray/Makefile b/arch/arm64/boot/dts/broadcom/stingray/Makefile
index f70028edad63..ea5516b1f6da 100644
--- a/arch/arm64/boot/dts/broadcom/stingray/Makefile
+++ b/arch/arm64/boot/dts/broadcom/stingray/Makefile
@@ -1,6 +1,2 @@
1dtb-$(CONFIG_ARCH_BCM_IPROC) += bcm958742k.dtb 1dtb-$(CONFIG_ARCH_BCM_IPROC) += bcm958742k.dtb
2dtb-$(CONFIG_ARCH_BCM_IPROC) += bcm958742t.dtb 2dtb-$(CONFIG_ARCH_BCM_IPROC) += bcm958742t.dtb
3
4always := $(dtb-y)
5subdir-y := $(dts-dirs)
6clean-files := *.dtb
diff --git a/arch/arm64/boot/dts/cavium/Makefile b/arch/arm64/boot/dts/cavium/Makefile
index 581b2c1c400a..f7c0ca8d3060 100644
--- a/arch/arm64/boot/dts/cavium/Makefile
+++ b/arch/arm64/boot/dts/cavium/Makefile
@@ -1,6 +1,2 @@
1dtb-$(CONFIG_ARCH_THUNDER) += thunder-88xx.dtb 1dtb-$(CONFIG_ARCH_THUNDER) += thunder-88xx.dtb
2dtb-$(CONFIG_ARCH_THUNDER2) += thunder2-99xx.dtb 2dtb-$(CONFIG_ARCH_THUNDER2) += thunder2-99xx.dtb
3
4always := $(dtb-y)
5subdir-y := $(dts-dirs)
6clean-files := *.dtb
diff --git a/arch/arm64/boot/dts/exynos/Makefile b/arch/arm64/boot/dts/exynos/Makefile
index 7ddea53769a7..14031e159a16 100644
--- a/arch/arm64/boot/dts/exynos/Makefile
+++ b/arch/arm64/boot/dts/exynos/Makefile
@@ -2,7 +2,3 @@ dtb-$(CONFIG_ARCH_EXYNOS) += \
2 exynos5433-tm2.dtb \ 2 exynos5433-tm2.dtb \
3 exynos5433-tm2e.dtb \ 3 exynos5433-tm2e.dtb \
4 exynos7-espresso.dtb 4 exynos7-espresso.dtb
5
6always := $(dtb-y)
7subdir-y := $(dts-dirs)
8clean-files := *.dtb
diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile
index 72c4b525726f..f1b53631363e 100644
--- a/arch/arm64/boot/dts/freescale/Makefile
+++ b/arch/arm64/boot/dts/freescale/Makefile
@@ -12,7 +12,3 @@ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2080a-rdb.dtb
12dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2080a-simu.dtb 12dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2080a-simu.dtb
13dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2088a-qds.dtb 13dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2088a-qds.dtb
14dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2088a-rdb.dtb 14dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2088a-rdb.dtb
15
16always := $(dtb-y)
17subdir-y := $(dts-dirs)
18clean-files := *.dtb
diff --git a/arch/arm64/boot/dts/hisilicon/Makefile b/arch/arm64/boot/dts/hisilicon/Makefile
index 8960ecafd37d..942c9ab760bf 100644
--- a/arch/arm64/boot/dts/hisilicon/Makefile
+++ b/arch/arm64/boot/dts/hisilicon/Makefile
@@ -4,7 +4,3 @@ dtb-$(CONFIG_ARCH_HISI) += hi6220-hikey.dtb
4dtb-$(CONFIG_ARCH_HISI) += hip05-d02.dtb 4dtb-$(CONFIG_ARCH_HISI) += hip05-d02.dtb
5dtb-$(CONFIG_ARCH_HISI) += hip06-d03.dtb 5dtb-$(CONFIG_ARCH_HISI) += hip06-d03.dtb
6dtb-$(CONFIG_ARCH_HISI) += hip07-d05.dtb 6dtb-$(CONFIG_ARCH_HISI) += hip07-d05.dtb
7
8always := $(dtb-y)
9subdir-y := $(dts-dirs)
10clean-files := *.dtb
diff --git a/arch/arm64/boot/dts/lg/Makefile b/arch/arm64/boot/dts/lg/Makefile
index 5c7b54c12adc..de5dc19b59ff 100644
--- a/arch/arm64/boot/dts/lg/Makefile
+++ b/arch/arm64/boot/dts/lg/Makefile
@@ -1,6 +1,2 @@
1dtb-$(CONFIG_ARCH_LG1K) += lg1312-ref.dtb 1dtb-$(CONFIG_ARCH_LG1K) += lg1312-ref.dtb
2dtb-$(CONFIG_ARCH_LG1K) += lg1313-ref.dtb 2dtb-$(CONFIG_ARCH_LG1K) += lg1313-ref.dtb
3
4always := $(dtb-y)
5subdir-y := $(dts-dirs)
6clean-files := *.dtb
diff --git a/arch/arm64/boot/dts/marvell/Makefile b/arch/arm64/boot/dts/marvell/Makefile
index 6cff81eeaae2..7a42e0d8445f 100644
--- a/arch/arm64/boot/dts/marvell/Makefile
+++ b/arch/arm64/boot/dts/marvell/Makefile
@@ -9,7 +9,3 @@ dtb-$(CONFIG_ARCH_MVEBU) += armada-7040-db.dtb
9dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-db.dtb 9dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-db.dtb
10dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-mcbin.dtb 10dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-mcbin.dtb
11dtb-$(CONFIG_ARCH_MVEBU) += armada-8080-db.dtb 11dtb-$(CONFIG_ARCH_MVEBU) += armada-8080-db.dtb
12
13always := $(dtb-y)
14subdir-y := $(dts-dirs)
15clean-files := *.dtb
diff --git a/arch/arm64/boot/dts/mediatek/Makefile b/arch/arm64/boot/dts/mediatek/Makefile
index 151723b5c733..f22501229c2e 100644
--- a/arch/arm64/boot/dts/mediatek/Makefile
+++ b/arch/arm64/boot/dts/mediatek/Makefile
@@ -4,7 +4,3 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt6795-evb.dtb
4dtb-$(CONFIG_ARCH_MEDIATEK) += mt6797-evb.dtb 4dtb-$(CONFIG_ARCH_MEDIATEK) += mt6797-evb.dtb
5dtb-$(CONFIG_ARCH_MEDIATEK) += mt7622-rfb1.dtb 5dtb-$(CONFIG_ARCH_MEDIATEK) += mt7622-rfb1.dtb
6dtb-$(CONFIG_ARCH_MEDIATEK) += mt8173-evb.dtb 6dtb-$(CONFIG_ARCH_MEDIATEK) += mt8173-evb.dtb
7
8always := $(dtb-y)
9subdir-y := $(dts-dirs)
10clean-files := *.dtb
diff --git a/arch/arm64/boot/dts/nvidia/Makefile b/arch/arm64/boot/dts/nvidia/Makefile
index 18941458cb4d..1b69cfdc2d41 100644
--- a/arch/arm64/boot/dts/nvidia/Makefile
+++ b/arch/arm64/boot/dts/nvidia/Makefile
@@ -4,6 +4,3 @@ dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-p2371-2180.dtb
4dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-p2571.dtb 4dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-p2571.dtb
5dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-smaug.dtb 5dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-smaug.dtb
6dtb-$(CONFIG_ARCH_TEGRA_186_SOC) += tegra186-p2771-0000.dtb 6dtb-$(CONFIG_ARCH_TEGRA_186_SOC) += tegra186-p2771-0000.dtb
7
8always := $(dtb-y)
9clean-files := *.dtb
diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
index ff81d7e5805e..7a65ef19a268 100644
--- a/arch/arm64/boot/dts/qcom/Makefile
+++ b/arch/arm64/boot/dts/qcom/Makefile
@@ -5,7 +5,3 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8916-mtp.dtb
5dtb-$(CONFIG_ARCH_QCOM) += msm8992-bullhead-rev-101.dtb 5dtb-$(CONFIG_ARCH_QCOM) += msm8992-bullhead-rev-101.dtb
6dtb-$(CONFIG_ARCH_QCOM) += msm8994-angler-rev-101.dtb 6dtb-$(CONFIG_ARCH_QCOM) += msm8994-angler-rev-101.dtb
7dtb-$(CONFIG_ARCH_QCOM) += msm8996-mtp.dtb 7dtb-$(CONFIG_ARCH_QCOM) += msm8996-mtp.dtb
8
9always := $(dtb-y)
10subdir-y := $(dts-dirs)
11clean-files := *.dtb
diff --git a/arch/arm64/boot/dts/realtek/Makefile b/arch/arm64/boot/dts/realtek/Makefile
index 8521e921e59a..6e2ae59a3745 100644
--- a/arch/arm64/boot/dts/realtek/Makefile
+++ b/arch/arm64/boot/dts/realtek/Makefile
@@ -1,5 +1 @@
1dtb-$(CONFIG_ARCH_REALTEK) += rtd1295-zidoo-x9s.dtb dtb-$(CONFIG_ARCH_REALTEK) += rtd1295-zidoo-x9s.dtb
2
3always := $(dtb-y)
4subdir-y := $(dts-dirs)
5clean-files := *.dtb
diff --git a/arch/arm64/boot/dts/renesas/Makefile b/arch/arm64/boot/dts/renesas/Makefile
index 381928bc1358..5e0bb2854c33 100644
--- a/arch/arm64/boot/dts/renesas/Makefile
+++ b/arch/arm64/boot/dts/renesas/Makefile
@@ -3,6 +3,3 @@ dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-salvator-xs.dtb
3dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-es1-salvator-x.dtb r8a7795-es1-h3ulcb.dtb 3dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-es1-salvator-x.dtb r8a7795-es1-h3ulcb.dtb
4dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-salvator-x.dtb r8a7796-m3ulcb.dtb 4dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-salvator-x.dtb r8a7796-m3ulcb.dtb
5dtb-$(CONFIG_ARCH_R8A77995) += r8a77995-draak.dtb 5dtb-$(CONFIG_ARCH_R8A77995) += r8a77995-draak.dtb
6
7always := $(dtb-y)
8clean-files := *.dtb
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
index f1c9b13cea5c..573a041a220c 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -10,7 +10,3 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-firefly.dtb
10dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-kevin.dtb 10dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-kevin.dtb
11dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb 11dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb
12dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator.dtb 12dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator.dtb
13
14always := $(dtb-y)
15subdir-y := $(dts-dirs)
16clean-files := *.dtb
diff --git a/arch/arm64/boot/dts/socionext/Makefile b/arch/arm64/boot/dts/socionext/Makefile
index 4bc091b365fd..a0423165d9b6 100644
--- a/arch/arm64/boot/dts/socionext/Makefile
+++ b/arch/arm64/boot/dts/socionext/Makefile
@@ -4,6 +4,3 @@ dtb-$(CONFIG_ARCH_UNIPHIER) += \
4 uniphier-ld20-global.dtb \ 4 uniphier-ld20-global.dtb \
5 uniphier-ld20-ref.dtb \ 5 uniphier-ld20-ref.dtb \
6 uniphier-pxs3-ref.dtb 6 uniphier-pxs3-ref.dtb
7
8always := $(dtb-y)
9clean-files := *.dtb
diff --git a/arch/arm64/boot/dts/sprd/Makefile b/arch/arm64/boot/dts/sprd/Makefile
index f0535e6eaaaa..38cefdb115a8 100644
--- a/arch/arm64/boot/dts/sprd/Makefile
+++ b/arch/arm64/boot/dts/sprd/Makefile
@@ -1,6 +1,2 @@
1dtb-$(CONFIG_ARCH_SPRD) += sc9836-openphone.dtb \ 1dtb-$(CONFIG_ARCH_SPRD) += sc9836-openphone.dtb \
2 sp9860g-1h10.dtb 2 sp9860g-1h10.dtb
3
4always := $(dtb-y)
5subdir-y := $(dts-dirs)
6clean-files := *.dtb
diff --git a/arch/arm64/boot/dts/xilinx/Makefile b/arch/arm64/boot/dts/xilinx/Makefile
index ae16427f6a4a..a2d67084a514 100644
--- a/arch/arm64/boot/dts/xilinx/Makefile
+++ b/arch/arm64/boot/dts/xilinx/Makefile
@@ -1,5 +1 @@
1dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-ep108.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-ep108.dtb
2
3always := $(dtb-y)
4subdir-y := $(dts-dirs)
5clean-files := *.dtb
diff --git a/arch/arm64/boot/dts/zte/Makefile b/arch/arm64/boot/dts/zte/Makefile
index d86c4def6bc9..14a1cdfc1559 100644
--- a/arch/arm64/boot/dts/zte/Makefile
+++ b/arch/arm64/boot/dts/zte/Makefile
@@ -1,6 +1,2 @@
1dtb-$(CONFIG_ARCH_ZX) += zx296718-evb.dtb 1dtb-$(CONFIG_ARCH_ZX) += zx296718-evb.dtb
2dtb-$(CONFIG_ARCH_ZX) += zx296718-pcbox.dtb 2dtb-$(CONFIG_ARCH_ZX) += zx296718-pcbox.dtb
3
4always := $(dtb-y)
5subdir-y := $(dts-dirs)
6clean-files := *.dtb
diff --git a/arch/c6x/boot/dts/Makefile b/arch/c6x/boot/dts/Makefile
index c7528b02d061..cb4874c67050 100644
--- a/arch/c6x/boot/dts/Makefile
+++ b/arch/c6x/boot/dts/Makefile
@@ -16,5 +16,3 @@ $(obj)/builtin.dtb: $(obj)/$(DTB).dtb
16 $(call if_changed,cp) 16 $(call if_changed,cp)
17 17
18$(obj)/linked_dtb.o: $(obj)/builtin.dtb 18$(obj)/linked_dtb.o: $(obj)/builtin.dtb
19
20clean-files := *.dtb
diff --git a/arch/cris/boot/dts/Makefile b/arch/cris/boot/dts/Makefile
index faf69fb9919f..4a97c7dbd865 100644
--- a/arch/cris/boot/dts/Makefile
+++ b/arch/cris/boot/dts/Makefile
@@ -2,5 +2,3 @@ BUILTIN_DTB := $(patsubst "%",%,$(CONFIG_BUILTIN_DTB)).dtb.o
2ifneq ($(CONFIG_BUILTIN_DTB),"") 2ifneq ($(CONFIG_BUILTIN_DTB),"")
3obj-$(CONFIG_OF) += $(BUILTIN_DTB) 3obj-$(CONFIG_OF) += $(BUILTIN_DTB)
4endif 4endif
5
6clean-files := *.dtb.S
diff --git a/arch/h8300/boot/dts/Makefile b/arch/h8300/boot/dts/Makefile
index 6c08467c6a3a..ae3188472b3a 100644
--- a/arch/h8300/boot/dts/Makefile
+++ b/arch/h8300/boot/dts/Makefile
@@ -7,9 +7,3 @@ obj-y += $(BUILTIN_DTB)
7dtb-$(CONFIG_H8300H_SIM) := h8300h_sim.dtb 7dtb-$(CONFIG_H8300H_SIM) := h8300h_sim.dtb
8dtb-$(CONFIG_H8S_SIM) := h8s_sim.dtb 8dtb-$(CONFIG_H8S_SIM) := h8s_sim.dtb
9dtb-$(CONFIG_H8S_EDOSK2674) := edosk2674.dtb 9dtb-$(CONFIG_H8S_EDOSK2674) := edosk2674.dtb
10
11dtstree := $(srctree)/$(src)
12dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts))
13
14always := $(dtb-y)
15clean-files := *.dtb.S *.dtb
diff --git a/arch/metag/boot/.gitignore b/arch/metag/boot/.gitignore
index 2d6c0c160884..6c662ddb909a 100644
--- a/arch/metag/boot/.gitignore
+++ b/arch/metag/boot/.gitignore
@@ -1,4 +1,3 @@
1vmlinux* 1vmlinux*
2uImage* 2uImage*
3ramdisk.* 3ramdisk.*
4*.dtb*
diff --git a/arch/metag/boot/dts/Makefile b/arch/metag/boot/dts/Makefile
index 097c6da4547f..0060147e12a6 100644
--- a/arch/metag/boot/dts/Makefile
+++ b/arch/metag/boot/dts/Makefile
@@ -12,10 +12,4 @@ endif
12dtb-$(CONFIG_METAG_BUILTIN_DTB) += $(builtindtb-y).dtb 12dtb-$(CONFIG_METAG_BUILTIN_DTB) += $(builtindtb-y).dtb
13obj-$(CONFIG_METAG_BUILTIN_DTB) += $(builtindtb-y).dtb.o 13obj-$(CONFIG_METAG_BUILTIN_DTB) += $(builtindtb-y).dtb.o
14 14
15dtstree := $(srctree)/$(src)
16dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts))
17
18.SECONDARY: $(obj)/$(builtindtb-y).dtb.S 15.SECONDARY: $(obj)/$(builtindtb-y).dtb.S
19
20always += $(dtb-y)
21clean-files += *.dtb *.dtb.S
diff --git a/arch/microblaze/boot/.gitignore b/arch/microblaze/boot/.gitignore
index bf0459186027..679502d64a97 100644
--- a/arch/microblaze/boot/.gitignore
+++ b/arch/microblaze/boot/.gitignore
@@ -1,3 +1,2 @@
1*.dtb
2linux.bin* 1linux.bin*
3simpleImage.* 2simpleImage.*
diff --git a/arch/microblaze/boot/Makefile b/arch/microblaze/boot/Makefile
index 91d2068da1b9..1cb84cf7c766 100644
--- a/arch/microblaze/boot/Makefile
+++ b/arch/microblaze/boot/Makefile
@@ -34,4 +34,4 @@ $(obj)/simpleImage.%: vmlinux FORCE
34 $(call if_changed,strip) 34 $(call if_changed,strip)
35 @echo 'Kernel: $@ is ready' ' (#'`cat .version`')' 35 @echo 'Kernel: $@ is ready' ' (#'`cat .version`')'
36 36
37clean-files += simpleImage.*.unstrip linux.bin.ub dts/*.dtb 37clean-files += simpleImage.*.unstrip linux.bin.ub
diff --git a/arch/mips/boot/.gitignore b/arch/mips/boot/.gitignore
index d3962cd5ce0c..a73d6e2c4f64 100644
--- a/arch/mips/boot/.gitignore
+++ b/arch/mips/boot/.gitignore
@@ -5,4 +5,3 @@ zImage
5zImage.tmp 5zImage.tmp
6calc_vmlinuz_load_addr 6calc_vmlinuz_load_addr
7uImage 7uImage
8*.dtb
diff --git a/arch/mips/boot/dts/Makefile b/arch/mips/boot/dts/Makefile
index cbac26ce063e..bc4ce85db136 100644
--- a/arch/mips/boot/dts/Makefile
+++ b/arch/mips/boot/dts/Makefile
@@ -1,21 +1,14 @@
1dts-dirs += brcm 1subdir-y += brcm
2dts-dirs += cavium-octeon 2subdir-y += cavium-octeon
3dts-dirs += img 3subdir-y += img
4dts-dirs += ingenic 4subdir-y += ingenic
5dts-dirs += lantiq 5subdir-y += lantiq
6dts-dirs += mti 6subdir-y += mti
7dts-dirs += netlogic 7subdir-y += netlogic
8dts-dirs += ni 8subdir-y += ni
9dts-dirs += pic32 9subdir-y += pic32
10dts-dirs += qca 10subdir-y += qca
11dts-dirs += ralink 11subdir-y += ralink
12dts-dirs += xilfpga 12subdir-y += xilfpga
13 13
14obj-y := $(addsuffix /, $(dts-dirs)) 14obj-$(CONFIG_BUILTIN_DTB) := $(addsuffix /, $(subdir-y))
15
16dtstree := $(srctree)/$(src)
17dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(foreach d,$(dts-dirs), $(wildcard $(dtstree)/$(d)/*.dts)))
18
19always := $(dtb-y)
20subdir-y := $(dts-dirs)
21clean-files := *.dtb *.dtb.S
diff --git a/arch/mips/boot/dts/brcm/Makefile b/arch/mips/boot/dts/brcm/Makefile
index d61bc2aebf69..bacb13159857 100644
--- a/arch/mips/boot/dts/brcm/Makefile
+++ b/arch/mips/boot/dts/brcm/Makefile
@@ -22,7 +22,6 @@ dtb-$(CONFIG_DT_NONE) += \
22 bcm63268-comtrend-vr-3032u.dtb \ 22 bcm63268-comtrend-vr-3032u.dtb \
23 bcm93384wvg.dtb \ 23 bcm93384wvg.dtb \
24 bcm93384wvg_viper.dtb \ 24 bcm93384wvg_viper.dtb \
25 bcm96358nb4ser.dtb \
26 bcm96368mvwg.dtb \ 25 bcm96368mvwg.dtb \
27 bcm9ejtagprb.dtb \ 26 bcm9ejtagprb.dtb \
28 bcm97125cbmb.dtb \ 27 bcm97125cbmb.dtb \
@@ -38,6 +37,3 @@ obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
38 37
39# Force kbuild to make empty built-in.o if necessary 38# Force kbuild to make empty built-in.o if necessary
40obj- += dummy.o 39obj- += dummy.o
41
42always := $(dtb-y)
43clean-files := *.dtb *.dtb.S
diff --git a/arch/mips/boot/dts/cavium-octeon/Makefile b/arch/mips/boot/dts/cavium-octeon/Makefile
index 5b99c40a058f..e9592a995349 100644
--- a/arch/mips/boot/dts/cavium-octeon/Makefile
+++ b/arch/mips/boot/dts/cavium-octeon/Makefile
@@ -4,6 +4,3 @@ obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
4 4
5# Force kbuild to make empty built-in.o if necessary 5# Force kbuild to make empty built-in.o if necessary
6obj- += dummy.o 6obj- += dummy.o
7
8always := $(dtb-y)
9clean-files := *.dtb *.dtb.S
diff --git a/arch/mips/boot/dts/img/Makefile b/arch/mips/boot/dts/img/Makefile
index 3d70958d0f5a..a46d77390aed 100644
--- a/arch/mips/boot/dts/img/Makefile
+++ b/arch/mips/boot/dts/img/Makefile
@@ -5,6 +5,3 @@ obj-$(CONFIG_MACH_PISTACHIO) += pistachio_marduk.dtb.o
5 5
6# Force kbuild to make empty built-in.o if necessary 6# Force kbuild to make empty built-in.o if necessary
7obj- += dummy.o 7obj- += dummy.o
8
9always := $(dtb-y)
10clean-files := *.dtb *.dtb.S
diff --git a/arch/mips/boot/dts/ingenic/Makefile b/arch/mips/boot/dts/ingenic/Makefile
index f2b864f07850..ddd0fafd120e 100644
--- a/arch/mips/boot/dts/ingenic/Makefile
+++ b/arch/mips/boot/dts/ingenic/Makefile
@@ -5,6 +5,3 @@ obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
5 5
6# Force kbuild to make empty built-in.o if necessary 6# Force kbuild to make empty built-in.o if necessary
7obj- += dummy.o 7obj- += dummy.o
8
9always := $(dtb-y)
10clean-files := *.dtb *.dtb.S
diff --git a/arch/mips/boot/dts/lantiq/Makefile b/arch/mips/boot/dts/lantiq/Makefile
index 0906c62141b9..586b1c9e580b 100644
--- a/arch/mips/boot/dts/lantiq/Makefile
+++ b/arch/mips/boot/dts/lantiq/Makefile
@@ -4,6 +4,3 @@ obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
4 4
5# Force kbuild to make empty built-in.o if necessary 5# Force kbuild to make empty built-in.o if necessary
6obj- += dummy.o 6obj- += dummy.o
7
8always := $(dtb-y)
9clean-files := *.dtb *.dtb.S
diff --git a/arch/mips/boot/dts/mti/Makefile b/arch/mips/boot/dts/mti/Makefile
index fcabd69b7030..faf7ac44725a 100644
--- a/arch/mips/boot/dts/mti/Makefile
+++ b/arch/mips/boot/dts/mti/Makefile
@@ -5,6 +5,3 @@ obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
5 5
6# Force kbuild to make empty built-in.o if necessary 6# Force kbuild to make empty built-in.o if necessary
7obj- += dummy.o 7obj- += dummy.o
8
9always := $(dtb-y)
10clean-files := *.dtb *.dtb.S
diff --git a/arch/mips/boot/dts/netlogic/Makefile b/arch/mips/boot/dts/netlogic/Makefile
index 9868057140b5..77ffb30c591b 100644
--- a/arch/mips/boot/dts/netlogic/Makefile
+++ b/arch/mips/boot/dts/netlogic/Makefile
@@ -8,6 +8,3 @@ obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
8 8
9# Force kbuild to make empty built-in.o if necessary 9# Force kbuild to make empty built-in.o if necessary
10obj- += dummy.o 10obj- += dummy.o
11
12always := $(dtb-y)
13clean-files := *.dtb *.dtb.S
diff --git a/arch/mips/boot/dts/ni/Makefile b/arch/mips/boot/dts/ni/Makefile
index 66cfdffc51c2..6cd9c606f025 100644
--- a/arch/mips/boot/dts/ni/Makefile
+++ b/arch/mips/boot/dts/ni/Makefile
@@ -2,6 +2,3 @@ dtb-$(CONFIG_FIT_IMAGE_FDT_NI169445) += 169445.dtb
2 2
3# Force kbuild to make empty built-in.o if necessary 3# Force kbuild to make empty built-in.o if necessary
4obj- += dummy.o 4obj- += dummy.o
5
6always := $(dtb-y)
7clean-files := *.dtb *.dtb.S
diff --git a/arch/mips/boot/dts/pic32/Makefile b/arch/mips/boot/dts/pic32/Makefile
index 7ac790551ec9..5a08e48dbabb 100644
--- a/arch/mips/boot/dts/pic32/Makefile
+++ b/arch/mips/boot/dts/pic32/Makefile
@@ -7,6 +7,3 @@ obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
7 7
8# Force kbuild to make empty built-in.o if necessary 8# Force kbuild to make empty built-in.o if necessary
9obj- += dummy.o 9obj- += dummy.o
10
11always := $(dtb-y)
12clean-files := *.dtb *.dtb.S
diff --git a/arch/mips/boot/dts/qca/Makefile b/arch/mips/boot/dts/qca/Makefile
index 63a9ddf048c9..181db5d824ea 100644
--- a/arch/mips/boot/dts/qca/Makefile
+++ b/arch/mips/boot/dts/qca/Makefile
@@ -7,6 +7,3 @@ dtb-$(CONFIG_ATH79) += ar9331_tl_mr3020.dtb
7 7
8# Force kbuild to make empty built-in.o if necessary 8# Force kbuild to make empty built-in.o if necessary
9obj- += dummy.o 9obj- += dummy.o
10
11always := $(dtb-y)
12clean-files := *.dtb *.dtb.S
diff --git a/arch/mips/boot/dts/ralink/Makefile b/arch/mips/boot/dts/ralink/Makefile
index 55e2937b61f3..7b64654c958c 100644
--- a/arch/mips/boot/dts/ralink/Makefile
+++ b/arch/mips/boot/dts/ralink/Makefile
@@ -9,6 +9,3 @@ obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
9 9
10# Force kbuild to make empty built-in.o if necessary 10# Force kbuild to make empty built-in.o if necessary
11obj- += dummy.o 11obj- += dummy.o
12
13always := $(dtb-y)
14clean-files := *.dtb *.dtb.S
diff --git a/arch/mips/boot/dts/xilfpga/Makefile b/arch/mips/boot/dts/xilfpga/Makefile
index 913a752a9ff1..77c809645d75 100644
--- a/arch/mips/boot/dts/xilfpga/Makefile
+++ b/arch/mips/boot/dts/xilfpga/Makefile
@@ -4,6 +4,3 @@ obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
4 4
5# Force kbuild to make empty built-in.o if necessary 5# Force kbuild to make empty built-in.o if necessary
6obj- += dummy.o 6obj- += dummy.o
7
8always := $(dtb-y)
9clean-files := *.dtb *.dtb.S
diff --git a/arch/nios2/boot/.gitignore b/arch/nios2/boot/.gitignore
index 109279ca5a4d..64386a8dedd8 100644
--- a/arch/nios2/boot/.gitignore
+++ b/arch/nios2/boot/.gitignore
@@ -1,2 +1 @@
1*.dtb
2vmImage vmImage
diff --git a/arch/nios2/boot/Makefile b/arch/nios2/boot/Makefile
index c899876320df..2ba23a679732 100644
--- a/arch/nios2/boot/Makefile
+++ b/arch/nios2/boot/Makefile
@@ -53,7 +53,5 @@ $(obj)/%.dtb: $(src)/dts/%.dts FORCE
53 53
54$(obj)/dtbs: $(addprefix $(obj)/, $(dtb-y)) 54$(obj)/dtbs: $(addprefix $(obj)/, $(dtb-y))
55 55
56clean-files := *.dtb
57
58install: 56install:
59 sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map "$(INSTALL_PATH)" 57 sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map "$(INSTALL_PATH)"
diff --git a/arch/openrisc/boot/dts/Makefile b/arch/openrisc/boot/dts/Makefile
index b092d30d6c23..0a5017ceaa6c 100644
--- a/arch/openrisc/boot/dts/Makefile
+++ b/arch/openrisc/boot/dts/Makefile
@@ -5,6 +5,4 @@ BUILTIN_DTB :=
5endif 5endif
6obj-y += $(BUILTIN_DTB) 6obj-y += $(BUILTIN_DTB)
7 7
8clean-files := *.dtb.S
9
10#DTC_FLAGS ?= -p 1024 8#DTC_FLAGS ?= -p 1024
diff --git a/arch/powerpc/boot/.gitignore b/arch/powerpc/boot/.gitignore
index 84774ccba1c2..f92d0530ceb1 100644
--- a/arch/powerpc/boot/.gitignore
+++ b/arch/powerpc/boot/.gitignore
@@ -18,7 +18,6 @@ otheros.bld
18uImage 18uImage
19cuImage.* 19cuImage.*
20dtbImage.* 20dtbImage.*
21*.dtb
22treeImage.* 21treeImage.*
23vmlinux.strip 22vmlinux.strip
24zImage 23zImage
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index c4e6fe35c075..c3caa5bdd6e6 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -439,7 +439,7 @@ zInstall: $(CONFIGURE) $(addprefix $(obj)/, $(image-y))
439clean-files += $(image-) $(initrd-) cuImage.* dtbImage.* treeImage.* \ 439clean-files += $(image-) $(initrd-) cuImage.* dtbImage.* treeImage.* \
440 zImage zImage.initrd zImage.chrp zImage.coff zImage.holly \ 440 zImage zImage.initrd zImage.chrp zImage.coff zImage.holly \
441 zImage.miboot zImage.pmac zImage.pseries \ 441 zImage.miboot zImage.pmac zImage.pseries \
442 zImage.maple simpleImage.* otheros.bld *.dtb 442 zImage.maple simpleImage.* otheros.bld
443 443
444# clean up files cached by wrapper 444# clean up files cached by wrapper
445clean-kernel-base := vmlinux.strip vmlinux.bin 445clean-kernel-base := vmlinux.strip vmlinux.bin
diff --git a/arch/sh/boot/dts/Makefile b/arch/sh/boot/dts/Makefile
index e5ce3a0de7f4..715def00a436 100644
--- a/arch/sh/boot/dts/Makefile
+++ b/arch/sh/boot/dts/Makefile
@@ -1,3 +1 @@
1obj-$(CONFIG_USE_BUILTIN_DTB) += $(patsubst "%",%,$(CONFIG_BUILTIN_DTB_SOURCE)).dtb.o obj-$(CONFIG_USE_BUILTIN_DTB) += $(patsubst "%",%,$(CONFIG_BUILTIN_DTB_SOURCE)).dtb.o
2
3clean-files := *.dtb.S
diff --git a/arch/xtensa/boot/.gitignore b/arch/xtensa/boot/.gitignore
index be7655998b26..38177c7ebcab 100644
--- a/arch/xtensa/boot/.gitignore
+++ b/arch/xtensa/boot/.gitignore
@@ -1,3 +1,2 @@
1uImage 1uImage
2zImage.redboot 2zImage.redboot
3*.dtb
diff --git a/arch/xtensa/boot/dts/Makefile b/arch/xtensa/boot/dts/Makefile
index a15e241c9153..f8052ba5aea8 100644
--- a/arch/xtensa/boot/dts/Makefile
+++ b/arch/xtensa/boot/dts/Makefile
@@ -12,9 +12,6 @@ ifneq ($(CONFIG_BUILTIN_DTB),"")
12obj-$(CONFIG_OF) += $(BUILTIN_DTB) 12obj-$(CONFIG_OF) += $(BUILTIN_DTB)
13endif 13endif
14 14
15dtstree := $(srctree)/$(src) 15# for CONFIG_OF_ALL_DTBS test
16dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts)) 16dtstree := $(srctree)/$(src)
17 17dtb- := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts))
18always += $(dtb-y)
19clean-files += *.dtb *.dtb.S
20
diff --git a/drivers/of/unittest-data/.gitignore b/drivers/of/unittest-data/.gitignore
deleted file mode 100644
index 4b3cf8b16de2..000000000000
--- a/drivers/of/unittest-data/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
1testcases.dtb
2testcases.dtb.S
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 @@
5# INSTALL_DTBS_PATH directory or the default location: 5# INSTALL_DTBS_PATH directory or the default location:
6# 6#
7# $INSTALL_PATH/dtbs/$KERNELRELEASE 7# $INSTALL_PATH/dtbs/$KERNELRELEASE
8#
9# Traverse through subdirectories listed in $(dts-dirs).
10# ========================================================================== 8# ==========================================================================
11 9
12src := $(obj) 10src := $(obj)
@@ -20,8 +18,8 @@ include include/config/auto.conf
20include scripts/Kbuild.include 18include scripts/Kbuild.include
21include $(src)/Makefile 19include $(src)/Makefile
22 20
23dtbinst-files := $(dtb-y) 21dtbinst-files := $(sort $(dtb-y) $(if $(CONFIG_OF_ALL_DTBS), $(dtb-)))
24dtbinst-dirs := $(dts-dirs) 22dtbinst-dirs := $(subdir-y) $(subdir-m)
25 23
26# Helper targets for Installing DTBs into the boot directory 24# Helper targets for Installing DTBs into the boot directory
27quiet_cmd_dtb_install = INSTALL $< 25quiet_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))
69real-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) 69real-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)
70real-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))) 70real-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)))
71 71
72# DTB
73# If CONFIG_OF_ALL_DTBS is enabled, all DT blobs are built
74extra-y += $(dtb-y)
75extra-$(CONFIG_OF_ALL_DTBS) += $(dtb-)
76
72# Add subdir path 77# Add subdir path
73 78
74extra-y := $(addprefix $(obj)/,$(extra-y)) 79extra-y := $(addprefix $(obj)/,$(extra-y))