Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

MIPS: Move device-trees into vendor sub-directories

Move the MIPS device-trees into the appropriate vendor sub-directories.

Signed-off-by: Andrew Bresticker <abrestic@chromium.org>
Tested-by: Kevin Cernekee <cernekee@gmail.com>
Cc: f.fainelli@gmail.com
Cc: jaedon.shin@gmail.com
Cc: tglx@linutronix.de
Cc: jason@lakedaemon.net
Cc: jogo@openwrt.org
Cc: arnd@arndb.de
Cc: computersforpeace@gmail.com
Cc: linux-mips@linux-mips.org
Cc: devicetree@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/8835/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

authored by

Andrew Bresticker and committed by
Ralf Baechle
8c0b9ee8 ec9ddad3

+71 -20
+1 -1
arch/mips/Makefile
··· 365 365 366 366 PHONY += dtbs 367 367 dtbs: scripts 368 - $(Q)$(MAKE) $(build)=arch/mips/boot/dts dtbs 368 + $(Q)$(MAKE) $(build)=arch/mips/boot/dts 369 369 370 370 archprepare: 371 371 ifdef CONFIG_MIPS32_N32
+10 -19
arch/mips/boot/dts/Makefile
··· 1 - dtb-$(CONFIG_BCM3384) += bcm93384wvg.dtb 2 - dtb-$(CONFIG_CAVIUM_OCTEON_SOC) += octeon_3xxx.dtb octeon_68xx.dtb 3 - dtb-$(CONFIG_DT_EASY50712) += easy50712.dtb 4 - dtb-$(CONFIG_DT_XLP_EVP) += xlp_evp.dtb 5 - dtb-$(CONFIG_DT_XLP_SVP) += xlp_svp.dtb 6 - dtb-$(CONFIG_DT_XLP_FVP) += xlp_fvp.dtb 7 - dtb-$(CONFIG_DT_XLP_GVP) += xlp_gvp.dtb 8 - dtb-$(CONFIG_DTB_RT2880_EVAL) += rt2880_eval.dtb 9 - dtb-$(CONFIG_DTB_RT305X_EVAL) += rt3052_eval.dtb 10 - dtb-$(CONFIG_DTB_RT3883_EVAL) += rt3883_eval.dtb 11 - dtb-$(CONFIG_DTB_MT7620A_EVAL) += mt7620a_eval.dtb 12 - dtb-$(CONFIG_MIPS_SEAD3) += sead3.dtb 1 + dts-dirs += brcm 2 + dts-dirs += cavium-octeon 3 + dts-dirs += lantiq 4 + dts-dirs += mti 5 + dts-dirs += netlogic 6 + dts-dirs += ralink 13 7 14 - obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) 8 + obj-y := $(addsuffix /, $(dts-dirs)) 15 9 16 - targets += dtbs 17 - targets += $(dtb-y) 18 - 19 - dtbs: $(addprefix $(obj)/, $(dtb-y)) 20 - 21 - clean-files += *.dtb *.dtb.S 10 + always := $(dtb-y) 11 + subdir-y := $(dts-dirs) 12 + clean-files := *.dtb *.dtb.S
arch/mips/boot/dts/bcm3384.dtsi arch/mips/boot/dts/brcm/bcm3384.dtsi
arch/mips/boot/dts/bcm93384wvg.dts arch/mips/boot/dts/brcm/bcm93384wvg.dts
+9
arch/mips/boot/dts/brcm/Makefile
··· 1 + dtb-$(CONFIG_BCM3384) += bcm93384wvg.dtb 2 + 3 + obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) 4 + 5 + # Force kbuild to make empty built-in.o if necessary 6 + obj- += dummy.o 7 + 8 + always := $(dtb-y) 9 + clean-files := *.dtb *.dtb.S
+9
arch/mips/boot/dts/cavium-octeon/Makefile
··· 1 + dtb-$(CONFIG_CAVIUM_OCTEON_SOC) += octeon_3xxx.dtb octeon_68xx.dtb 2 + 3 + obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) 4 + 5 + # Force kbuild to make empty built-in.o if necessary 6 + obj- += dummy.o 7 + 8 + always := $(dtb-y) 9 + clean-files := *.dtb *.dtb.S
arch/mips/boot/dts/danube.dtsi arch/mips/boot/dts/lantiq/danube.dtsi
arch/mips/boot/dts/easy50712.dts arch/mips/boot/dts/lantiq/easy50712.dts
+9
arch/mips/boot/dts/lantiq/Makefile
··· 1 + dtb-$(CONFIG_DT_EASY50712) += easy50712.dtb 2 + 3 + obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) 4 + 5 + # Force kbuild to make empty built-in.o if necessary 6 + obj- += dummy.o 7 + 8 + always := $(dtb-y) 9 + clean-files := *.dtb *.dtb.S
arch/mips/boot/dts/mt7620a.dtsi arch/mips/boot/dts/ralink/mt7620a.dtsi
arch/mips/boot/dts/mt7620a_eval.dts arch/mips/boot/dts/ralink/mt7620a_eval.dts
+9
arch/mips/boot/dts/mti/Makefile
··· 1 + dtb-$(CONFIG_MIPS_SEAD3) += sead3.dtb 2 + 3 + obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) 4 + 5 + # Force kbuild to make empty built-in.o if necessary 6 + obj- += dummy.o 7 + 8 + always := $(dtb-y) 9 + clean-files := *.dtb *.dtb.S
+12
arch/mips/boot/dts/netlogic/Makefile
··· 1 + dtb-$(CONFIG_DT_XLP_EVP) += xlp_evp.dtb 2 + dtb-$(CONFIG_DT_XLP_SVP) += xlp_svp.dtb 3 + dtb-$(CONFIG_DT_XLP_FVP) += xlp_fvp.dtb 4 + dtb-$(CONFIG_DT_XLP_GVP) += xlp_gvp.dtb 5 + 6 + obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) 7 + 8 + # Force kbuild to make empty built-in.o if necessary 9 + obj- += dummy.o 10 + 11 + always := $(dtb-y) 12 + clean-files := *.dtb *.dtb.S
arch/mips/boot/dts/octeon_3xxx.dts arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dts
arch/mips/boot/dts/octeon_68xx.dts arch/mips/boot/dts/cavium-octeon/octeon_68xx.dts
+12
arch/mips/boot/dts/ralink/Makefile
··· 1 + dtb-$(CONFIG_DTB_RT2880_EVAL) += rt2880_eval.dtb 2 + dtb-$(CONFIG_DTB_RT305X_EVAL) += rt3052_eval.dtb 3 + dtb-$(CONFIG_DTB_RT3883_EVAL) += rt3883_eval.dtb 4 + dtb-$(CONFIG_DTB_MT7620A_EVAL) += mt7620a_eval.dtb 5 + 6 + obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) 7 + 8 + # Force kbuild to make empty built-in.o if necessary 9 + obj- += dummy.o 10 + 11 + always := $(dtb-y) 12 + clean-files := *.dtb *.dtb.S
arch/mips/boot/dts/rt2880.dtsi arch/mips/boot/dts/ralink/rt2880.dtsi
arch/mips/boot/dts/rt2880_eval.dts arch/mips/boot/dts/ralink/rt2880_eval.dts
arch/mips/boot/dts/rt3050.dtsi arch/mips/boot/dts/ralink/rt3050.dtsi
arch/mips/boot/dts/rt3052_eval.dts arch/mips/boot/dts/ralink/rt3052_eval.dts
arch/mips/boot/dts/rt3883.dtsi arch/mips/boot/dts/ralink/rt3883.dtsi
arch/mips/boot/dts/rt3883_eval.dts arch/mips/boot/dts/ralink/rt3883_eval.dts
arch/mips/boot/dts/sead3.dts arch/mips/boot/dts/mti/sead3.dts
arch/mips/boot/dts/xlp_evp.dts arch/mips/boot/dts/netlogic/xlp_evp.dts
arch/mips/boot/dts/xlp_fvp.dts arch/mips/boot/dts/netlogic/xlp_fvp.dts
arch/mips/boot/dts/xlp_gvp.dts arch/mips/boot/dts/netlogic/xlp_gvp.dts
arch/mips/boot/dts/xlp_svp.dts arch/mips/boot/dts/netlogic/xlp_svp.dts