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

MIPS: Netlogic: Move device-trees to arch/mips/boot/dts/

Move the Netlogic XLP device-trees to arch/mips/boot/dts/ and update the
Makefiles accordingly. A built-in device-tree is optional, so select
BUILTIN_DTB when it is requested.

Signed-off-by: Andrew Bresticker <abrestic@chromium.org>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
Cc: Kumar Gala <galak@codeaurora.org>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: David Daney <david.daney@cavium.com>
Cc: John Crispin <blogic@openwrt.org>
Cc: Jayachandran C <jchandra@broadcom.com>
Cc: Qais Yousef <qais.yousef@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Cc: devicetree@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/7560/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

authored by

Andrew Bresticker and committed by
Ralf Baechle 36094619 f262b5f2

+8 -5
+4
arch/mips/boot/dts/Makefile
··· 1 1 dtb-$(CONFIG_CAVIUM_OCTEON_SOC) += octeon_3xxx.dtb octeon_68xx.dtb 2 2 dtb-$(CONFIG_DT_EASY50712) += easy50712.dtb 3 + dtb-$(CONFIG_DT_XLP_EVP) += xlp_evp.dtb 4 + dtb-$(CONFIG_DT_XLP_SVP) += xlp_svp.dtb 5 + dtb-$(CONFIG_DT_XLP_FVP) += xlp_fvp.dtb 6 + dtb-$(CONFIG_DT_XLP_GVP) += xlp_gvp.dtb 3 7 dtb-$(CONFIG_MIPS_SEAD3) += sead3.dtb 4 8 5 9 obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
+4
arch/mips/netlogic/Kconfig
··· 4 4 config DT_XLP_EVP 5 5 bool "Built-in device tree for XLP EVP boards" 6 6 default y 7 + select BUILTIN_DTB 7 8 help 8 9 Add an FDT blob for XLP EVP boards into the kernel. 9 10 This DTB will be used if the firmware does not pass in a DTB ··· 14 13 config DT_XLP_SVP 15 14 bool "Built-in device tree for XLP SVP boards" 16 15 default y 16 + select BUILTIN_DTB 17 17 help 18 18 Add an FDT blob for XLP VP boards into the kernel. 19 19 This DTB will be used if the firmware does not pass in a DTB ··· 24 22 config DT_XLP_FVP 25 23 bool "Built-in device tree for XLP FVP boards" 26 24 default y 25 + select BUILTIN_DTB 27 26 help 28 27 Add an FDT blob for XLP FVP board into the kernel. 29 28 This DTB will be used if the firmware does not pass in a DTB ··· 34 31 config DT_XLP_GVP 35 32 bool "Built-in device tree for XLP GVP boards" 36 33 default y 34 + select BUILTIN_DTB 37 35 help 38 36 Add an FDT blob for XLP GVP board into the kernel. 39 37 This DTB will be used if the firmware does not pass in a DTB
-1
arch/mips/netlogic/Makefile
··· 1 1 obj-$(CONFIG_NLM_COMMON) += common/ 2 2 obj-$(CONFIG_CPU_XLR) += xlr/ 3 3 obj-$(CONFIG_CPU_XLP) += xlp/ 4 - obj-$(CONFIG_CPU_XLP) += dts/
-4
arch/mips/netlogic/dts/Makefile
··· 1 - obj-$(CONFIG_DT_XLP_EVP) := xlp_evp.dtb.o 2 - obj-$(CONFIG_DT_XLP_SVP) += xlp_svp.dtb.o 3 - obj-$(CONFIG_DT_XLP_FVP) += xlp_fvp.dtb.o 4 - obj-$(CONFIG_DT_XLP_GVP) += xlp_gvp.dtb.o
arch/mips/netlogic/dts/xlp_evp.dts arch/mips/boot/dts/xlp_evp.dts
arch/mips/netlogic/dts/xlp_fvp.dts arch/mips/boot/dts/xlp_fvp.dts
arch/mips/netlogic/dts/xlp_gvp.dts arch/mips/boot/dts/xlp_gvp.dts
arch/mips/netlogic/dts/xlp_svp.dts arch/mips/boot/dts/xlp_svp.dts