OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Andrew Bresticker 2014-08-21 13:04:25 -07:00 committed by Ralf Baechle
parent f262b5f2d5
commit 36094619e4
8 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/mips/boot/dts/Makefile
View File

@ -1,5 +1,9 @@
dtb-$(CONFIG_CAVIUM_OCTEON_SOC) += octeon_3xxx.dtb octeon_68xx.dtb dtb-$(CONFIG_CAVIUM_OCTEON_SOC) += octeon_3xxx.dtb octeon_68xx.dtb
dtb-$(CONFIG_DT_EASY50712) += easy50712.dtb dtb-$(CONFIG_DT_EASY50712) += easy50712.dtb
dtb-$(CONFIG_DT_XLP_EVP) += xlp_evp.dtb
dtb-$(CONFIG_DT_XLP_SVP) += xlp_svp.dtb
dtb-$(CONFIG_DT_XLP_FVP) += xlp_fvp.dtb
dtb-$(CONFIG_DT_XLP_GVP) += xlp_gvp.dtb
dtb-$(CONFIG_MIPS_SEAD3) += sead3.dtb dtb-$(CONFIG_MIPS_SEAD3) += sead3.dtb
obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))

0
arch/mips/netlogic/dts/xlp_evp.dts → arch/mips/boot/dts/xlp_evp.dts
View File

0
arch/mips/netlogic/dts/xlp_fvp.dts → arch/mips/boot/dts/xlp_fvp.dts
View File

0
arch/mips/netlogic/dts/xlp_gvp.dts → arch/mips/boot/dts/xlp_gvp.dts
View File

0
arch/mips/netlogic/dts/xlp_svp.dts → arch/mips/boot/dts/xlp_svp.dts
View File

4
arch/mips/netlogic/Kconfig
View File

@ -4,6 +4,7 @@ if NLM_XLP_BOARD
config DT_XLP_EVP config DT_XLP_EVP
bool "Built-in device tree for XLP EVP boards" bool "Built-in device tree for XLP EVP boards"
default y default y
select BUILTIN_DTB
help help
Add an FDT blob for XLP EVP boards into the kernel. Add an FDT blob for XLP EVP boards into the kernel.
This DTB will be used if the firmware does not pass in a DTB This DTB will be used if the firmware does not pass in a DTB
@ -13,6 +14,7 @@ config DT_XLP_EVP
config DT_XLP_SVP config DT_XLP_SVP
bool "Built-in device tree for XLP SVP boards" bool "Built-in device tree for XLP SVP boards"
default y default y
select BUILTIN_DTB
help help
Add an FDT blob for XLP VP boards into the kernel. Add an FDT blob for XLP VP boards into the kernel.
This DTB will be used if the firmware does not pass in a DTB This DTB will be used if the firmware does not pass in a DTB
@ -22,6 +24,7 @@ config DT_XLP_SVP
config DT_XLP_FVP config DT_XLP_FVP
bool "Built-in device tree for XLP FVP boards" bool "Built-in device tree for XLP FVP boards"
default y default y
select BUILTIN_DTB
help help
Add an FDT blob for XLP FVP board into the kernel. Add an FDT blob for XLP FVP board into the kernel.
This DTB will be used if the firmware does not pass in a DTB This DTB will be used if the firmware does not pass in a DTB
@ -31,6 +34,7 @@ config DT_XLP_FVP
config DT_XLP_GVP config DT_XLP_GVP
bool "Built-in device tree for XLP GVP boards" bool "Built-in device tree for XLP GVP boards"
default y default y
select BUILTIN_DTB
help help
Add an FDT blob for XLP GVP board into the kernel. Add an FDT blob for XLP GVP board into the kernel.
This DTB will be used if the firmware does not pass in a DTB This DTB will be used if the firmware does not pass in a DTB

1
arch/mips/netlogic/Makefile
View File

@ -1,4 +1,3 @@
obj-$(CONFIG_NLM_COMMON) += common/ obj-$(CONFIG_NLM_COMMON) += common/
obj-$(CONFIG_CPU_XLR) += xlr/ obj-$(CONFIG_CPU_XLR) += xlr/
obj-$(CONFIG_CPU_XLP) += xlp/ obj-$(CONFIG_CPU_XLP) += xlp/
obj-$(CONFIG_CPU_XLP) += dts/

4
arch/mips/netlogic/dts/Makefile
View File

@ -1,4 +0,0 @@
obj-$(CONFIG_DT_XLP_EVP) := xlp_evp.dtb.o
obj-$(CONFIG_DT_XLP_SVP) += xlp_svp.dtb.o
obj-$(CONFIG_DT_XLP_FVP) += xlp_fvp.dtb.o
obj-$(CONFIG_DT_XLP_GVP) += xlp_gvp.dtb.o