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

Move the SEAD-3 device-tree to arch/mips/boot/dts/ and update the
Makefiles accordingly.  Since SEAD-3 requires the device-tree to be
built into the kernel, select BUILTIN_DTB when building for SEAD-3.

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/7555/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index a77ba5b81f61cf84f89ebca1ffd122d7a83374df..d7c8bd4e2f0ec59670f17f3b258e31798d97ead9 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -353,6 +353,7 @@ config MIPS_SEAD3
        bool "MIPS SEAD3 board"
        select BOOT_ELF32
        select BOOT_RAW
+       select BUILTIN_DTB
        select CEVT_R4K
        select CSRC_R4K
        select CSRC_GIC

diff --git a/arch/mips/boot/dts/Makefile b/arch/mips/boot/dts/Makefile
index 4f265ec447eb74ddda2a64ac9680cde7d7535e2f..8df3d3ef0a85a17affbbac27afb624c0ef58cb56 100644 (file)
--- a/arch/mips/boot/dts/Makefile
+++ b/arch/mips/boot/dts/Makefile
@@ -1,5 +1,6 @@
 dtb-$(CONFIG_CAVIUM_OCTEON_SOC)                += octeon_3xxx.dtb octeon_68xx.dtb
 dtb-$(CONFIG_DT_EASY50712)             += easy50712.dtb
+dtb-$(CONFIG_MIPS_SEAD3)               += sead3.dtb
 
 obj-y          += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
 

diff --git a/arch/mips/boot/dts/sead3.dts b/arch/mips/boot/dts/sead3.dts
new file mode 100644 (file)
index 0000000..e4b317d
--- /dev/null
+++ b/arch/mips/boot/dts/sead3.dts
@@ -0,0 +1,22 @@
+/dts-v1/;
+
+/memreserve/ 0x00000000 0x00001000;    // reserved
+/memreserve/ 0x00001000 0x000ef000;    // ROM data
+/memreserve/ 0x000f0000 0x004cc000;    // reserved
+
+/ {
+       #address-cells = <1>;
+       #size-cells = <1>;
+       compatible = "mti,sead-3";
+
+       cpus {
+               cpu@0 {
+                       compatible = "mti,mips14KEc", "mti,mips14Kc";
+               };
+       };
+
+       memory {
+               device_type = "memory";
+               reg = <0x0 0x08000000>;
+       };
+};

diff --git a/arch/mips/mti-sead3/Makefile b/arch/mips/mti-sead3/Makefile
index 071786fa234ba5652cb290f9254f0e80ecebf6ce..febf4334545e5dc21cae2baae586e3067b064c4f 100644 (file)
--- a/arch/mips/mti-sead3/Makefile
+++ b/arch/mips/mti-sead3/Makefile
@@ -19,9 +19,5 @@ obj-y                         += sead3-i2c-dev.o sead3-i2c.o \
 
 obj-$(CONFIG_EARLY_PRINTK)     += sead3-console.o
 obj-$(CONFIG_USB_EHCI_HCD)     += sead3-ehci.o
-obj-$(CONFIG_OF)               += sead3.dtb.o
 
 CFLAGS_sead3-setup.o = -I$(src)/../../../scripts/dtc/libfdt
-
-$(obj)/%.dtb: $(obj)/%.dts
-       $(call if_changed,dtc)

diff --git a/arch/mips/mti-sead3/sead3.dts b/arch/mips/mti-sead3/sead3.dts
deleted file mode 100644 (file)
index e4b317d..0000000
--- a/arch/mips/mti-sead3/sead3.dts
+++ /dev/null
@@ -1,22 +0,0 @@
-/dts-v1/;
-
-/memreserve/ 0x00000000 0x00001000;    // reserved
-/memreserve/ 0x00001000 0x000ef000;    // ROM data
-/memreserve/ 0x000f0000 0x004cc000;    // reserved
-
-/ {
-       #address-cells = <1>;
-       #size-cells = <1>;
-       compatible = "mti,sead-3";
-
-       cpus {
-               cpu@0 {
-                       compatible = "mti,mips14KEc", "mti,mips14Kc";
-               };
-       };
-
-       memory {
-               device_type = "memory";
-               reg = <0x0 0x08000000>;
-       };
-};