Skip to content

L
linux
Commit 27e8524d authored by Rob Herring's avatar Rob Herring
Browse files
Options

Merge branch 'dt/kbuild' into dt/next

parents 48c926cd 7e7962dd
Show whitespace changes
Inline Side-by-side
Showing with 79 additions and 275 deletions
.gitignore
View file @ 27e8524d
...@@ -7,38 +7,40 @@ ...@@ -7,38 +7,40 @@
# command after changing this file, to see if there are # command after changing this file, to see if there are
# any tracked files which get ignored after the change. # any tracked files which get ignored after the change.
# #
# Normal rules # Normal rules (sorted alphabetically)
# #
.* .*
*.a
*.bin
*.bz2
*.c.[012]*.*
*.dtb
*.dtb.S
*.dwo
*.elf
*.gcno
*.gz
*.i
*.ko
*.ll
*.lst
*.lz4
*.lzma
*.lzo
*.mod.c
*.o *.o
*.o.* *.o.*
*.a *.order
*.patch
*.s *.s
*.ko
*.so *.so
*.so.dbg *.so.dbg
*.mod.c *.su
*.i
*.lst
*.symtypes *.symtypes
*.order
*.elf
*.bin
*.tar *.tar
*.gz
*.bz2
*.lzma
*.xz *.xz
*.lz4
*.lzo
*.patch
*.gcno
*.ll
modules.builtin
Module.symvers Module.symvers
*.dwo modules.builtin
*.su
*.c.[012]*.*
# #
# Top-level generic files # Top-level generic files
......
Documentation/kbuild/makefiles.txt
View file @ 27e8524d
...@@ -1153,7 +1153,6 @@ When kbuild executes, the following steps are followed (roughly): ...@@ -1153,7 +1153,6 @@ When kbuild executes, the following steps are followed (roughly):
Example: Example:
targets += $(dtb-y) targets += $(dtb-y)
clean-files += *.dtb
DTC_FLAGS ?= -p 1024 DTC_FLAGS ?= -p 1024
--- 6.8 Custom kbuild commands --- 6.8 Custom kbuild commands
......
Makefile
View file @ 27e8524d
...@@ -1544,7 +1544,7 @@ clean: $(clean-dirs) ...@@ -1544,7 +1544,7 @@ clean: $(clean-dirs)
$(call cmd,rmfiles) $(call cmd,rmfiles)
@find $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \ @find $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \
\( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \ \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
-o -name '*.ko.*' \ -o -name '*.ko.*' -o -name '*.dtb' -o -name '*.dtb.S' \
-o -name '*.dwo' \ -o -name '*.dwo' \
-o -name '*.su' \ -o -name '*.su' \
-o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \ -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \
......
arch/arc/boot/dts/Makefile
View file @ 27e8524d
...@@ -10,8 +10,6 @@ dtb-y := $(builtindtb-y).dtb ...@@ -10,8 +10,6 @@ dtb-y := $(builtindtb-y).dtb
.SECONDARY: $(obj)/$(builtindtb-y).dtb.S .SECONDARY: $(obj)/$(builtindtb-y).dtb.S
# for CONFIG_OF_ALL_DTBS test
dtstree := $(srctree)/$(src) dtstree := $(srctree)/$(src)
dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts)) dtb- := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts))
always := $(dtb-y)
clean-files := *.dtb *.dtb.S
arch/arm/boot/.gitignore
View file @ 27e8524d
...@@ -3,4 +3,3 @@ zImage ...@@ -3,4 +3,3 @@ zImage
xipImage xipImage
bootpImage bootpImage
uImage uImage
*.dtb
arch/arm/boot/dts/Makefile
View file @ 27e8524d
...@@ -1069,9 +1069,3 @@ dtb-$(CONFIG_ARCH_ASPEED) += aspeed-bmc-opp-palmetto.dtb \ ...@@ -1069,9 +1069,3 @@ dtb-$(CONFIG_ARCH_ASPEED) += aspeed-bmc-opp-palmetto.dtb \
aspeed-bmc-opp-romulus.dtb \ aspeed-bmc-opp-romulus.dtb \
aspeed-ast2500-evb.dtb aspeed-ast2500-evb.dtb
endif endif
dtstree := $(srctree)/$(src)
dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts))
always := $(dtb-y)
clean-files := *.dtb
arch/arm64/boot/dts/Makefile
View file @ 27e8524d
dts-dirs += actions subdir-y += actions
dts-dirs += al subdir-y += al
dts-dirs += allwinner subdir-y += allwinner
dts-dirs += altera subdir-y += altera
dts-dirs += amd subdir-y += amd
dts-dirs += amlogic subdir-y += amlogic
dts-dirs += apm subdir-y += apm
dts-dirs += arm subdir-y += arm
dts-dirs += broadcom subdir-y += broadcom
dts-dirs += cavium subdir-y += cavium
dts-dirs += exynos subdir-y += exynos
dts-dirs += freescale subdir-y += freescale
dts-dirs += hisilicon subdir-y += hisilicon
dts-dirs += marvell subdir-y += marvell
dts-dirs += mediatek subdir-y += mediatek
dts-dirs += nvidia subdir-y += nvidia
dts-dirs += qcom subdir-y += qcom
dts-dirs += realtek subdir-y += realtek
dts-dirs += renesas subdir-y += renesas
dts-dirs += rockchip subdir-y += rockchip
dts-dirs += socionext subdir-y += socionext
dts-dirs += sprd subdir-y += sprd
dts-dirs += xilinx subdir-y += xilinx
dts-dirs += lg subdir-y += lg
dts-dirs += zte subdir-y += zte
subdir-y := $(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)
arch/arm64/boot/dts/actions/Makefile
View file @ 27e8524d
dtb-$(CONFIG_ARCH_ACTIONS) += s900-bubblegum-96.dtb dtb-$(CONFIG_ARCH_ACTIONS) += s900-bubblegum-96.dtb
always := $(dtb-y)
subdir-y := $(dts-dirs)
clean-files := *.dtb
arch/arm64/boot/dts/al/Makefile
View file @ 27e8524d
dtb-$(CONFIG_ARCH_ALPINE) += alpine-v2-evp.dtb dtb-$(CONFIG_ARCH_ALPINE) += alpine-v2-evp.dtb
always := $(dtb-y)
subdir-y := $(dts-dirs)
clean-files := *.dtb
arch/arm64/boot/dts/allwinner/Makefile
View file @ 27e8524d
...@@ -8,7 +8,3 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-pc2.dtb ...@@ -8,7 +8,3 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-pc2.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-prime.dtb dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-prime.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus2.dtb dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus2.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-neo2.dtb dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-neo2.dtb
always := $(dtb-y)
subdir-y := $(dts-dirs)
clean-files := *.dtb
arch/arm64/boot/dts/altera/Makefile
View file @ 27e8524d
dtb-$(CONFIG_ARCH_STRATIX10) += socfpga_stratix10_socdk.dtb dtb-$(CONFIG_ARCH_STRATIX10) += socfpga_stratix10_socdk.dtb
always := $(dtb-y)
subdir-y := $(dts-dirs)
clean-files := *.dtb
arch/arm64/boot/dts/amd/Makefile
View file @ 27e8524d
dtb-$(CONFIG_ARCH_SEATTLE) += amd-overdrive.dtb \ dtb-$(CONFIG_ARCH_SEATTLE) += amd-overdrive.dtb \
amd-overdrive-rev-b0.dtb amd-overdrive-rev-b1.dtb \ amd-overdrive-rev-b0.dtb amd-overdrive-rev-b1.dtb \
husky.dtb husky.dtb
always := $(dtb-y)
subdir-y := $(dts-dirs)
clean-files := *.dtb
arch/arm64/boot/dts/amlogic/Makefile
View file @ 27e8524d
...@@ -19,7 +19,3 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-nexbox-a1.dtb ...@@ -19,7 +19,3 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-nexbox-a1.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q200.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q200.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q201.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q201.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-rbox-pro.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxm-rbox-pro.dtb
always := $(dtb-y)
subdir-y := $(dts-dirs)
clean-files := *.dtb
arch/arm64/boot/dts/apm/Makefile
View file @ 27e8524d
dtb-$(CONFIG_ARCH_XGENE) += apm-mustang.dtb dtb-$(CONFIG_ARCH_XGENE) += apm-mustang.dtb
dtb-$(CONFIG_ARCH_XGENE) += apm-merlin.dtb dtb-$(CONFIG_ARCH_XGENE) += apm-merlin.dtb
always := $(dtb-y)
subdir-y := $(dts-dirs)
clean-files := *.dtb
arch/arm64/boot/dts/arm/Makefile
View file @ 27e8524d
...@@ -2,7 +2,3 @@ dtb-$(CONFIG_ARCH_VEXPRESS) += foundation-v8.dtb foundation-v8-gicv3.dtb ...@@ -2,7 +2,3 @@ dtb-$(CONFIG_ARCH_VEXPRESS) += foundation-v8.dtb foundation-v8-gicv3.dtb
dtb-$(CONFIG_ARCH_VEXPRESS) += juno.dtb juno-r1.dtb juno-r2.dtb dtb-$(CONFIG_ARCH_VEXPRESS) += juno.dtb juno-r1.dtb juno-r2.dtb
dtb-$(CONFIG_ARCH_VEXPRESS) += rtsm_ve-aemv8a.dtb dtb-$(CONFIG_ARCH_VEXPRESS) += rtsm_ve-aemv8a.dtb
dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2f-1xv7-ca53x2.dtb dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2f-1xv7-ca53x2.dtb
always := $(dtb-y)
subdir-y := $(dts-dirs)
clean-files := *.dtb
arch/arm64/boot/dts/broadcom/Makefile
View file @ 27e8524d
dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-b.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-b.dtb
dts-dirs += northstar2 subdir-y += northstar2
dts-dirs += stingray subdir-y += stingray
always := $(dtb-y)
subdir-y := $(dts-dirs)
clean-files := *.dtb
arch/arm64/boot/dts/broadcom/northstar2/Makefile
View file @ 27e8524d
dtb-$(CONFIG_ARCH_BCM_IPROC) += ns2-svk.dtb dtb-$(CONFIG_ARCH_BCM_IPROC) += ns2-svk.dtb
dtb-$(CONFIG_ARCH_BCM_IPROC) += ns2-xmc.dtb dtb-$(CONFIG_ARCH_BCM_IPROC) += ns2-xmc.dtb
always := $(dtb-y)
subdir-y := $(dts-dirs)
clean-files := *.dtb
arch/arm64/boot/dts/broadcom/stingray/Makefile
View file @ 27e8524d
dtb-$(CONFIG_ARCH_BCM_IPROC) += bcm958742k.dtb dtb-$(CONFIG_ARCH_BCM_IPROC) += bcm958742k.dtb
dtb-$(CONFIG_ARCH_BCM_IPROC) += bcm958742t.dtb dtb-$(CONFIG_ARCH_BCM_IPROC) += bcm958742t.dtb
always := $(dtb-y)
subdir-y := $(dts-dirs)
clean-files := *.dtb
arch/arm64/boot/dts/cavium/Makefile
View file @ 27e8524d
dtb-$(CONFIG_ARCH_THUNDER) += thunder-88xx.dtb dtb-$(CONFIG_ARCH_THUNDER) += thunder-88xx.dtb
dtb-$(CONFIG_ARCH_THUNDER2) += thunder2-99xx.dtb dtb-$(CONFIG_ARCH_THUNDER2) += thunder2-99xx.dtb
always := $(dtb-y)
subdir-y := $(dts-dirs)
clean-files := *.dtb
arch/arm64/boot/dts/exynos/Makefile
View file @ 27e8524d
...@@ -2,7 +2,3 @@ dtb-$(CONFIG_ARCH_EXYNOS) += \ ...@@ -2,7 +2,3 @@ dtb-$(CONFIG_ARCH_EXYNOS) += \
exynos5433-tm2.dtb \ exynos5433-tm2.dtb \
exynos5433-tm2e.dtb \ exynos5433-tm2e.dtb \
exynos7-espresso.dtb exynos7-espresso.dtb
always := $(dtb-y)
subdir-y := $(dts-dirs)
clean-files := *.dtb
arch/arm64/boot/dts/freescale/Makefile
View file @ 27e8524d
...@@ -12,7 +12,3 @@ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2080a-rdb.dtb ...@@ -12,7 +12,3 @@ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2080a-rdb.dtb
dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2080a-simu.dtb dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2080a-simu.dtb
dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2088a-qds.dtb dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2088a-qds.dtb
dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2088a-rdb.dtb dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2088a-rdb.dtb
always := $(dtb-y)
subdir-y := $(dts-dirs)
clean-files := *.dtb
arch/arm64/boot/dts/hisilicon/Makefile
View file @ 27e8524d
...@@ -4,7 +4,3 @@ dtb-$(CONFIG_ARCH_HISI) += hi6220-hikey.dtb ...@@ -4,7 +4,3 @@ dtb-$(CONFIG_ARCH_HISI) += hi6220-hikey.dtb
dtb-$(CONFIG_ARCH_HISI) += hip05-d02.dtb dtb-$(CONFIG_ARCH_HISI) += hip05-d02.dtb
dtb-$(CONFIG_ARCH_HISI) += hip06-d03.dtb dtb-$(CONFIG_ARCH_HISI) += hip06-d03.dtb
dtb-$(CONFIG_ARCH_HISI) += hip07-d05.dtb dtb-$(CONFIG_ARCH_HISI) += hip07-d05.dtb
always := $(dtb-y)
subdir-y := $(dts-dirs)
clean-files := *.dtb
arch/arm64/boot/dts/lg/Makefile
View file @ 27e8524d
dtb-$(CONFIG_ARCH_LG1K) += lg1312-ref.dtb dtb-$(CONFIG_ARCH_LG1K) += lg1312-ref.dtb
dtb-$(CONFIG_ARCH_LG1K) += lg1313-ref.dtb dtb-$(CONFIG_ARCH_LG1K) += lg1313-ref.dtb
always := $(dtb-y)
subdir-y := $(dts-dirs)
clean-files := *.dtb
arch/arm64/boot/dts/marvell/Makefile
View file @ 27e8524d
...@@ -9,7 +9,3 @@ dtb-$(CONFIG_ARCH_MVEBU) += armada-7040-db.dtb ...@@ -9,7 +9,3 @@ dtb-$(CONFIG_ARCH_MVEBU) += armada-7040-db.dtb
dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-db.dtb dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-db.dtb
dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-mcbin.dtb dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-mcbin.dtb
dtb-$(CONFIG_ARCH_MVEBU) += armada-8080-db.dtb dtb-$(CONFIG_ARCH_MVEBU) += armada-8080-db.dtb
always := $(dtb-y)
subdir-y := $(dts-dirs)
clean-files := *.dtb
arch/arm64/boot/dts/mediatek/Makefile
View file @ 27e8524d
...@@ -4,7 +4,3 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt6795-evb.dtb ...@@ -4,7 +4,3 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt6795-evb.dtb
dtb-$(CONFIG_ARCH_MEDIATEK) += mt6797-evb.dtb dtb-$(CONFIG_ARCH_MEDIATEK) += mt6797-evb.dtb
dtb-$(CONFIG_ARCH_MEDIATEK) += mt7622-rfb1.dtb dtb-$(CONFIG_ARCH_MEDIATEK) += mt7622-rfb1.dtb
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8173-evb.dtb dtb-$(CONFIG_ARCH_MEDIATEK) += mt8173-evb.dtb
always := $(dtb-y)
subdir-y := $(dts-dirs)
clean-files := *.dtb
arch/arm64/boot/dts/nvidia/Makefile
View file @ 27e8524d
...@@ -4,6 +4,3 @@ dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-p2371-2180.dtb ...@@ -4,6 +4,3 @@ dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-p2371-2180.dtb
dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-p2571.dtb dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-p2571.dtb
dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-smaug.dtb dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-smaug.dtb
dtb-$(CONFIG_ARCH_TEGRA_186_SOC) += tegra186-p2771-0000.dtb dtb-$(CONFIG_ARCH_TEGRA_186_SOC) += tegra186-p2771-0000.dtb
always := $(dtb-y)
clean-files := *.dtb
arch/arm64/boot/dts/qcom/Makefile
View file @ 27e8524d
...@@ -5,7 +5,3 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8916-mtp.dtb ...@@ -5,7 +5,3 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8916-mtp.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8992-bullhead-rev-101.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8992-bullhead-rev-101.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8994-angler-rev-101.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8994-angler-rev-101.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8996-mtp.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8996-mtp.dtb
always := $(dtb-y)
subdir-y := $(dts-dirs)
clean-files := *.dtb
arch/arm64/boot/dts/realtek/Makefile
View file @ 27e8524d
dtb-$(CONFIG_ARCH_REALTEK) += rtd1295-zidoo-x9s.dtb dtb-$(CONFIG_ARCH_REALTEK) += rtd1295-zidoo-x9s.dtb
always := $(dtb-y)
subdir-y := $(dts-dirs)
clean-files := *.dtb
arch/arm64/boot/dts/renesas/Makefile
View file @ 27e8524d
...@@ -3,6 +3,3 @@ dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-salvator-xs.dtb ...@@ -3,6 +3,3 @@ dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-salvator-xs.dtb
dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-es1-salvator-x.dtb r8a7795-es1-h3ulcb.dtb dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-es1-salvator-x.dtb r8a7795-es1-h3ulcb.dtb
dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-salvator-x.dtb r8a7796-m3ulcb.dtb dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-salvator-x.dtb r8a7796-m3ulcb.dtb
dtb-$(CONFIG_ARCH_R8A77995) += r8a77995-draak.dtb dtb-$(CONFIG_ARCH_R8A77995) += r8a77995-draak.dtb
always := $(dtb-y)
clean-files := *.dtb
arch/arm64/boot/dts/rockchip/Makefile
View file @ 27e8524d
...@@ -10,7 +10,3 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-firefly.dtb ...@@ -10,7 +10,3 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-firefly.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-kevin.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-kevin.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator.dtb
always := $(dtb-y)
subdir-y := $(dts-dirs)
clean-files := *.dtb
arch/arm64/boot/dts/socionext/Makefile
View file @ 27e8524d
...@@ -4,6 +4,3 @@ dtb-$(CONFIG_ARCH_UNIPHIER) += \ ...@@ -4,6 +4,3 @@ dtb-$(CONFIG_ARCH_UNIPHIER) += \
uniphier-ld20-global.dtb \ uniphier-ld20-global.dtb \
uniphier-ld20-ref.dtb \ uniphier-ld20-ref.dtb \
uniphier-pxs3-ref.dtb uniphier-pxs3-ref.dtb
always := $(dtb-y)
clean-files := *.dtb
arch/arm64/boot/dts/sprd/Makefile
View file @ 27e8524d
dtb-$(CONFIG_ARCH_SPRD) += sc9836-openphone.dtb \ dtb-$(CONFIG_ARCH_SPRD) += sc9836-openphone.dtb \
sp9860g-1h10.dtb sp9860g-1h10.dtb
always := $(dtb-y)
subdir-y := $(dts-dirs)
clean-files := *.dtb
arch/arm64/boot/dts/xilinx/Makefile
View file @ 27e8524d
dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-ep108.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-ep108.dtb
always := $(dtb-y)
subdir-y := $(dts-dirs)
clean-files := *.dtb
arch/arm64/boot/dts/zte/Makefile
View file @ 27e8524d
dtb-$(CONFIG_ARCH_ZX) += zx296718-evb.dtb dtb-$(CONFIG_ARCH_ZX) += zx296718-evb.dtb
dtb-$(CONFIG_ARCH_ZX) += zx296718-pcbox.dtb dtb-$(CONFIG_ARCH_ZX) += zx296718-pcbox.dtb
always := $(dtb-y)
subdir-y := $(dts-dirs)
clean-files := *.dtb
arch/c6x/boot/dts/Makefile
View file @ 27e8524d
...@@ -16,5 +16,3 @@ $(obj)/builtin.dtb: $(obj)/$(DTB).dtb ...@@ -16,5 +16,3 @@ $(obj)/builtin.dtb: $(obj)/$(DTB).dtb
$(call if_changed,cp) $(call if_changed,cp)
$(obj)/linked_dtb.o: $(obj)/builtin.dtb $(obj)/linked_dtb.o: $(obj)/builtin.dtb
clean-files := *.dtb
arch/cris/boot/dts/Makefile
View file @ 27e8524d
...@@ -2,5 +2,3 @@ BUILTIN_DTB := $(patsubst "%",%,$(CONFIG_BUILTIN_DTB)).dtb.o ...@@ -2,5 +2,3 @@ BUILTIN_DTB := $(patsubst "%",%,$(CONFIG_BUILTIN_DTB)).dtb.o
ifneq ($(CONFIG_BUILTIN_DTB),"") ifneq ($(CONFIG_BUILTIN_DTB),"")
obj-$(CONFIG_OF) += $(BUILTIN_DTB) obj-$(CONFIG_OF) += $(BUILTIN_DTB)
endif endif
clean-files := *.dtb.S
arch/h8300/boot/dts/Makefile
View file @ 27e8524d
...@@ -7,9 +7,3 @@ obj-y += $(BUILTIN_DTB) ...@@ -7,9 +7,3 @@ obj-y += $(BUILTIN_DTB)
dtb-$(CONFIG_H8300H_SIM) := h8300h_sim.dtb dtb-$(CONFIG_H8300H_SIM) := h8300h_sim.dtb
dtb-$(CONFIG_H8S_SIM) := h8s_sim.dtb dtb-$(CONFIG_H8S_SIM) := h8s_sim.dtb
dtb-$(CONFIG_H8S_EDOSK2674) := edosk2674.dtb dtb-$(CONFIG_H8S_EDOSK2674) := edosk2674.dtb
dtstree := $(srctree)/$(src)
dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts))
always := $(dtb-y)
clean-files := *.dtb.S *.dtb
arch/metag/boot/.gitignore
View file @ 27e8524d
vmlinux* vmlinux*
uImage* uImage*
ramdisk.* ramdisk.*
*.dtb*
arch/metag/boot/dts/Makefile
View file @ 27e8524d
...@@ -12,10 +12,4 @@ endif ...@@ -12,10 +12,4 @@ endif
dtb-$(CONFIG_METAG_BUILTIN_DTB) += $(builtindtb-y).dtb dtb-$(CONFIG_METAG_BUILTIN_DTB) += $(builtindtb-y).dtb
obj-$(CONFIG_METAG_BUILTIN_DTB) += $(builtindtb-y).dtb.o obj-$(CONFIG_METAG_BUILTIN_DTB) += $(builtindtb-y).dtb.o
dtstree := $(srctree)/$(src)
dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts))
.SECONDARY: $(obj)/$(builtindtb-y).dtb.S .SECONDARY: $(obj)/$(builtindtb-y).dtb.S
always += $(dtb-y)
clean-files += *.dtb *.dtb.S
arch/microblaze/boot/.gitignore
View file @ 27e8524d
*.dtb
linux.bin* linux.bin*
simpleImage.* simpleImage.*
arch/microblaze/boot/Makefile
View file @ 27e8524d
...@@ -34,4 +34,4 @@ $(obj)/simpleImage.%: vmlinux FORCE ...@@ -34,4 +34,4 @@ $(obj)/simpleImage.%: vmlinux FORCE
$(call if_changed,strip) $(call if_changed,strip)
@echo 'Kernel: $@ is ready' ' (#'`cat .version`')' @echo 'Kernel: $@ is ready' ' (#'`cat .version`')'
clean-files += simpleImage.*.unstrip linux.bin.ub dts/*.dtb clean-files += simpleImage.*.unstrip linux.bin.ub
arch/mips/boot/.gitignore
View file @ 27e8524d
...@@ -5,4 +5,3 @@ zImage ...@@ -5,4 +5,3 @@ zImage
zImage.tmp zImage.tmp
calc_vmlinuz_load_addr calc_vmlinuz_load_addr
uImage uImage
*.dtb
arch/mips/boot/dts/Makefile
View file @ 27e8524d
dts-dirs += brcm subdir-y += brcm
dts-dirs += cavium-octeon subdir-y += cavium-octeon
dts-dirs += img subdir-y += img
dts-dirs += ingenic subdir-y += ingenic
dts-dirs += lantiq subdir-y += lantiq
dts-dirs += mti subdir-y += mti
dts-dirs += netlogic subdir-y += netlogic
dts-dirs += ni subdir-y += ni
dts-dirs += pic32 subdir-y += pic32
dts-dirs += qca subdir-y += qca
dts-dirs += ralink subdir-y += ralink
dts-dirs += xilfpga subdir-y += xilfpga
obj-y := $(addsuffix /, $(dts-dirs)) obj-$(CONFIG_BUILTIN_DTB) := $(addsuffix /, $(subdir-y))
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
arch/mips/boot/dts/brcm/Makefile
View file @ 27e8524d
...@@ -22,7 +22,6 @@ dtb-$(CONFIG_DT_NONE) += \ ...@@ -22,7 +22,6 @@ dtb-$(CONFIG_DT_NONE) += \
bcm63268-comtrend-vr-3032u.dtb \ bcm63268-comtrend-vr-3032u.dtb \
bcm93384wvg.dtb \ bcm93384wvg.dtb \
bcm93384wvg_viper.dtb \ bcm93384wvg_viper.dtb \
bcm96358nb4ser.dtb \
bcm96368mvwg.dtb \ bcm96368mvwg.dtb \
bcm9ejtagprb.dtb \ bcm9ejtagprb.dtb \
bcm97125cbmb.dtb \ bcm97125cbmb.dtb \
...@@ -38,6 +37,3 @@ obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) ...@@ -38,6 +37,3 @@ obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
# Force kbuild to make empty built-in.o if necessary # Force kbuild to make empty built-in.o if necessary
obj- += dummy.o obj- += dummy.o
always := $(dtb-y)
clean-files := *.dtb *.dtb.S
arch/mips/boot/dts/cavium-octeon/Makefile
View file @ 27e8524d
...@@ -4,6 +4,3 @@ obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) ...@@ -4,6 +4,3 @@ obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
# Force kbuild to make empty built-in.o if necessary # Force kbuild to make empty built-in.o if necessary
obj- += dummy.o obj- += dummy.o
always := $(dtb-y)
clean-files := *.dtb *.dtb.S
arch/mips/boot/dts/img/Makefile
View file @ 27e8524d
...@@ -5,6 +5,3 @@ obj-$(CONFIG_MACH_PISTACHIO) += pistachio_marduk.dtb.o ...@@ -5,6 +5,3 @@ obj-$(CONFIG_MACH_PISTACHIO) += pistachio_marduk.dtb.o
# Force kbuild to make empty built-in.o if necessary # Force kbuild to make empty built-in.o if necessary
obj- += dummy.o obj- += dummy.o
always := $(dtb-y)
clean-files := *.dtb *.dtb.S
arch/mips/boot/dts/ingenic/Makefile
View file @ 27e8524d
...@@ -5,6 +5,3 @@ obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) ...@@ -5,6 +5,3 @@ obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
# Force kbuild to make empty built-in.o if necessary # Force kbuild to make empty built-in.o if necessary
obj- += dummy.o obj- += dummy.o
always := $(dtb-y)
clean-files := *.dtb *.dtb.S
arch/mips/boot/dts/lantiq/Makefile
View file @ 27e8524d
...@@ -4,6 +4,3 @@ obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) ...@@ -4,6 +4,3 @@ obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
# Force kbuild to make empty built-in.o if necessary # Force kbuild to make empty built-in.o if necessary
obj- += dummy.o obj- += dummy.o
always := $(dtb-y)
clean-files := *.dtb *.dtb.S
arch/mips/boot/dts/mti/Makefile
View file @ 27e8524d
...@@ -5,6 +5,3 @@ obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) ...@@ -5,6 +5,3 @@ obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
# Force kbuild to make empty built-in.o if necessary # Force kbuild to make empty built-in.o if necessary
obj- += dummy.o obj- += dummy.o
always := $(dtb-y)
clean-files := *.dtb *.dtb.S
arch/mips/boot/dts/netlogic/Makefile
View file @ 27e8524d
...@@ -8,6 +8,3 @@ obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) ...@@ -8,6 +8,3 @@ obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
# Force kbuild to make empty built-in.o if necessary # Force kbuild to make empty built-in.o if necessary
obj- += dummy.o obj- += dummy.o
always := $(dtb-y)
clean-files := *.dtb *.dtb.S
arch/mips/boot/dts/ni/Makefile
View file @ 27e8524d
...@@ -2,6 +2,3 @@ dtb-$(CONFIG_FIT_IMAGE_FDT_NI169445) += 169445.dtb ...@@ -2,6 +2,3 @@ dtb-$(CONFIG_FIT_IMAGE_FDT_NI169445) += 169445.dtb
# Force kbuild to make empty built-in.o if necessary # Force kbuild to make empty built-in.o if necessary
obj- += dummy.o obj- += dummy.o
always := $(dtb-y)
clean-files := *.dtb *.dtb.S
arch/mips/boot/dts/pic32/Makefile
View file @ 27e8524d
...@@ -7,6 +7,3 @@ obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) ...@@ -7,6 +7,3 @@ obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
# Force kbuild to make empty built-in.o if necessary # Force kbuild to make empty built-in.o if necessary
obj- += dummy.o obj- += dummy.o
always := $(dtb-y)
clean-files := *.dtb *.dtb.S
arch/mips/boot/dts/qca/Makefile
View file @ 27e8524d
...@@ -7,6 +7,3 @@ dtb-$(CONFIG_ATH79) += ar9331_tl_mr3020.dtb ...@@ -7,6 +7,3 @@ dtb-$(CONFIG_ATH79) += ar9331_tl_mr3020.dtb
# Force kbuild to make empty built-in.o if necessary # Force kbuild to make empty built-in.o if necessary
obj- += dummy.o obj- += dummy.o
always := $(dtb-y)
clean-files := *.dtb *.dtb.S
arch/mips/boot/dts/ralink/Makefile
View file @ 27e8524d
...@@ -9,6 +9,3 @@ obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) ...@@ -9,6 +9,3 @@ obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
# Force kbuild to make empty built-in.o if necessary # Force kbuild to make empty built-in.o if necessary
obj- += dummy.o obj- += dummy.o
always := $(dtb-y)
clean-files := *.dtb *.dtb.S
arch/mips/boot/dts/xilfpga/Makefile
View file @ 27e8524d
...@@ -4,6 +4,3 @@ obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) ...@@ -4,6 +4,3 @@ obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
# Force kbuild to make empty built-in.o if necessary # Force kbuild to make empty built-in.o if necessary
obj- += dummy.o obj- += dummy.o
always := $(dtb-y)
clean-files := *.dtb *.dtb.S
arch/nios2/boot/Makefile
View file @ 27e8524d
...@@ -53,7 +53,5 @@ $(obj)/%.dtb: $(src)/dts/%.dts FORCE ...@@ -53,7 +53,5 @@ $(obj)/%.dtb: $(src)/dts/%.dts FORCE
$(obj)/dtbs: $(addprefix $(obj)/, $(dtb-y)) $(obj)/dtbs: $(addprefix $(obj)/, $(dtb-y))
clean-files := *.dtb
install: install:
sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map "$(INSTALL_PATH)" sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map "$(INSTALL_PATH)"
arch/openrisc/boot/dts/Makefile
View file @ 27e8524d
...@@ -5,6 +5,4 @@ BUILTIN_DTB := ...@@ -5,6 +5,4 @@ BUILTIN_DTB :=
endif endif
obj-y += $(BUILTIN_DTB) obj-y += $(BUILTIN_DTB)
clean-files := *.dtb.S
#DTC_FLAGS ?= -p 1024 #DTC_FLAGS ?= -p 1024
arch/powerpc/boot/.gitignore
View file @ 27e8524d
...@@ -18,7 +18,6 @@ otheros.bld ...@@ -18,7 +18,6 @@ otheros.bld
uImage uImage
cuImage.* cuImage.*
dtbImage.* dtbImage.*
*.dtb
treeImage.* treeImage.*
vmlinux.strip vmlinux.strip
zImage zImage
......
arch/powerpc/boot/Makefile
View file @ 27e8524d
...@@ -439,7 +439,7 @@ zInstall: $(CONFIGURE) $(addprefix $(obj)/, $(image-y)) ...@@ -439,7 +439,7 @@ zInstall: $(CONFIGURE) $(addprefix $(obj)/, $(image-y))
clean-files += $(image-) $(initrd-) cuImage.* dtbImage.* treeImage.* \ clean-files += $(image-) $(initrd-) cuImage.* dtbImage.* treeImage.* \
zImage zImage.initrd zImage.chrp zImage.coff zImage.holly \ zImage zImage.initrd zImage.chrp zImage.coff zImage.holly \
zImage.miboot zImage.pmac zImage.pseries \ zImage.miboot zImage.pmac zImage.pseries \
zImage.maple simpleImage.* otheros.bld *.dtb zImage.maple simpleImage.* otheros.bld
# clean up files cached by wrapper # clean up files cached by wrapper
clean-kernel-base := vmlinux.strip vmlinux.bin clean-kernel-base := vmlinux.strip vmlinux.bin
......
arch/sh/boot/dts/Makefile
View file @ 27e8524d
obj-$(CONFIG_USE_BUILTIN_DTB) += $(patsubst "%",%,$(CONFIG_BUILTIN_DTB_SOURCE)).dtb.o obj-$(CONFIG_USE_BUILTIN_DTB) += $(patsubst "%",%,$(CONFIG_BUILTIN_DTB_SOURCE)).dtb.o
clean-files := *.dtb.S
arch/xtensa/boot/.gitignore
View file @ 27e8524d
uImage uImage
zImage.redboot zImage.redboot
*.dtb
arch/xtensa/boot/dts/Makefile
View file @ 27e8524d
...@@ -12,9 +12,6 @@ ifneq ($(CONFIG_BUILTIN_DTB),"") ...@@ -12,9 +12,6 @@ ifneq ($(CONFIG_BUILTIN_DTB),"")
obj-$(CONFIG_OF) += $(BUILTIN_DTB) obj-$(CONFIG_OF) += $(BUILTIN_DTB)
endif endif
# for CONFIG_OF_ALL_DTBS test
dtstree := $(srctree)/$(src) dtstree := $(srctree)/$(src)
dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts)) dtb- := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts))
always += $(dtb-y)
clean-files += *.dtb *.dtb.S
scripts/Makefile.dtbinst
View file @ 27e8524d
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
# INSTALL_DTBS_PATH directory or the default location: # INSTALL_DTBS_PATH directory or the default location:
# #
# $INSTALL_PATH/dtbs/$KERNELRELEASE # $INSTALL_PATH/dtbs/$KERNELRELEASE
#
# Traverse through subdirectories listed in $(dts-dirs).
# ========================================================================== # ==========================================================================
src := $(obj) src := $(obj)
...@@ -20,8 +18,8 @@ include include/config/auto.conf ...@@ -20,8 +18,8 @@ include include/config/auto.conf
include scripts/Kbuild.include include scripts/Kbuild.include
include $(src)/Makefile include $(src)/Makefile
dtbinst-files := $(dtb-y) dtbinst-files := $(sort $(dtb-y) $(if $(CONFIG_OF_ALL_DTBS), $(dtb-)))
dtbinst-dirs := $(dts-dirs) dtbinst-dirs := $(subdir-y) $(subdir-m)
# Helper targets for Installing DTBs into the boot directory # Helper targets for Installing DTBs into the boot directory
quiet_cmd_dtb_install = INSTALL $< quiet_cmd_dtb_install = INSTALL $<
......
scripts/Makefile.lib
View file @ 27e8524d
...@@ -69,6 +69,11 @@ obj-dirs := $(dir $(multi-objs) $(obj-y)) ...@@ -69,6 +69,11 @@ obj-dirs := $(dir $(multi-objs) $(obj-y))
real-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) real-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)
real-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))) real-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)))
# DTB
# If CONFIG_OF_ALL_DTBS is enabled, all DT blobs are built
extra-y += $(dtb-y)
extra-$(CONFIG_OF_ALL_DTBS) += $(dtb-)
# Add subdir path # Add subdir path
extra-y := $(addprefix $(obj)/,$(extra-y)) extra-y := $(addprefix $(obj)/,$(extra-y))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7