From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Bresticker Subject: [PATCH v2 4/7] MIPS: Lantiq: Move device-trees to arch/mips/boot/dts/lantiq/ Date: Wed, 27 Aug 2014 19:10:09 -0700 Message-ID: <1409191812-23697-5-git-send-email-abrestic@chromium.org> References: <1409191812-23697-1-git-send-email-abrestic@chromium.org> Return-path: In-Reply-To: <1409191812-23697-1-git-send-email-abrestic@chromium.org> Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-subscribe: List-owner: List-post: List-archive: To: Ralf Baechle , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala Cc: James Hogan , Paul Burton , David Daney , John Crispin , Jayachandran C , Qais Yousef , Florian Fainelli , Jonas Gorski , Olof Johansson , Arnd Bergmann , Geert Uytterhoeven , linux-mips@linux-mips.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Andrew Bresticker List-Id: devicetree@vger.kernel.org Move the Lantiq device-trees to arch/mips/boot/dts/lantiq/ and update the Makefiles accordingly. There is currently only a single Lantiq device-tree (EASY50712), and it's required to be built into the kernel, so select BUILTIN_DTB for it. Signed-off-by: Andrew Bresticker --- arch/mips/boot/dts/Makefile | 1 + arch/mips/boot/dts/lantiq/Makefile | 1 + arch/mips/{lantiq/dts => boot/dts/lantiq}/danube.dtsi | 0 arch/mips/{lantiq/dts => boot/dts/lantiq}/easy50712.dts | 0 arch/mips/lantiq/Kconfig | 1 + arch/mips/lantiq/Makefile | 2 -- arch/mips/lantiq/dts/Makefile | 1 - 7 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 arch/mips/boot/dts/lantiq/Makefile rename arch/mips/{lantiq/dts => boot/dts/lantiq}/danube.dtsi (100%) rename arch/mips/{lantiq/dts => boot/dts/lantiq}/easy50712.dts (100%) delete mode 100644 arch/mips/lantiq/dts/Makefile diff --git a/arch/mips/boot/dts/Makefile b/arch/mips/boot/dts/Makefile index a8daed1..0f16e92 100644 --- a/arch/mips/boot/dts/Makefile +++ b/arch/mips/boot/dts/Makefile @@ -1,4 +1,5 @@ include arch/mips/boot/dts/cavium-octeon/Makefile +include arch/mips/boot/dts/lantiq/Makefile obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) diff --git a/arch/mips/boot/dts/lantiq/Makefile b/arch/mips/boot/dts/lantiq/Makefile new file mode 100644 index 0000000..d68f45a --- /dev/null +++ b/arch/mips/boot/dts/lantiq/Makefile @@ -0,0 +1 @@ +dtb-$(CONFIG_DT_EASY50712) += lantiq/easy50712.dtb diff --git a/arch/mips/lantiq/dts/danube.dtsi b/arch/mips/boot/dts/lantiq/danube.dtsi similarity index 100% rename from arch/mips/lantiq/dts/danube.dtsi rename to arch/mips/boot/dts/lantiq/danube.dtsi diff --git a/arch/mips/lantiq/dts/easy50712.dts b/arch/mips/boot/dts/lantiq/easy50712.dts similarity index 100% rename from arch/mips/lantiq/dts/easy50712.dts rename to arch/mips/boot/dts/lantiq/easy50712.dts diff --git a/arch/mips/lantiq/Kconfig b/arch/mips/lantiq/Kconfig index c002191..e10d333 100644 --- a/arch/mips/lantiq/Kconfig +++ b/arch/mips/lantiq/Kconfig @@ -30,6 +30,7 @@ choice config DT_EASY50712 bool "Easy50712" depends on SOC_XWAY + select BUILTIN_DTB endchoice config PCI_LANTIQ diff --git a/arch/mips/lantiq/Makefile b/arch/mips/lantiq/Makefile index d6bdc57..690257a 100644 --- a/arch/mips/lantiq/Makefile +++ b/arch/mips/lantiq/Makefile @@ -6,8 +6,6 @@ obj-y := irq.o clk.o prom.o -obj-y += dts/ - obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-$(CONFIG_SOC_TYPE_XWAY) += xway/ diff --git a/arch/mips/lantiq/dts/Makefile b/arch/mips/lantiq/dts/Makefile deleted file mode 100644 index 6fa72dd..0000000 --- a/arch/mips/lantiq/dts/Makefile +++ /dev/null @@ -1 +0,0 @@ -obj-$(CONFIG_DT_EASY50712) := easy50712.dtb.o -- 2.1.0.rc2.206.gedb03e5