From: Andrew Bresticker <abrestic@chromium.org>
To: Ralf Baechle <ralf@linux-mips.org>,
Rob Herring <robh+dt@kernel.org>, Pawel Moll <pawel.moll@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
Kumar Gala <galak@codeaurora.org>
Cc: James Hogan <james.hogan@imgtec.com>,
Paul Burton <paul.burton@imgtec.com>,
David Daney <david.daney@cavium.com>,
John Crispin <blogic@openwrt.org>,
Jayachandran C <jchandra@broadcom.com>,
Qais Yousef <qais.yousef@imgtec.com>,
linux-mips@linux-mips.org, linux-kernel@vger.kernel.org,
devicetree@vger.kernel.org,
Andrew Bresticker <abrestic@chromium.org>
Subject: [PATCH 4/7] MIPS: Lantiq: Move device-trees to arch/mips/boot/dts/
Date: Thu, 21 Aug 2014 13:04:23 -0700 [thread overview]
Message-ID: <1408651466-8334-5-git-send-email-abrestic@chromium.org> (raw)
In-Reply-To: <1408651466-8334-1-git-send-email-abrestic@chromium.org>
Move the Lantiq device-trees to arch/mips/boot/dts/ 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 <abrestic@chromium.org>
---
arch/mips/boot/dts/Makefile | 1 +
arch/mips/{lantiq => boot}/dts/danube.dtsi | 0
arch/mips/{lantiq => boot}/dts/easy50712.dts | 0
arch/mips/lantiq/Kconfig | 1 +
arch/mips/lantiq/Makefile | 2 --
arch/mips/lantiq/dts/Makefile | 1 -
6 files changed, 2 insertions(+), 3 deletions(-)
rename arch/mips/{lantiq => boot}/dts/danube.dtsi (100%)
rename arch/mips/{lantiq => boot}/dts/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 51acad6..4f265ec 100644
--- a/arch/mips/boot/dts/Makefile
+++ b/arch/mips/boot/dts/Makefile
@@ -1,4 +1,5 @@
dtb-$(CONFIG_CAVIUM_OCTEON_SOC) += octeon_3xxx.dtb octeon_68xx.dtb
+dtb-$(CONFIG_DT_EASY50712) += easy50712.dtb
obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
diff --git a/arch/mips/lantiq/dts/danube.dtsi b/arch/mips/boot/dts/danube.dtsi
similarity index 100%
rename from arch/mips/lantiq/dts/danube.dtsi
rename to arch/mips/boot/dts/danube.dtsi
diff --git a/arch/mips/lantiq/dts/easy50712.dts b/arch/mips/boot/dts/easy50712.dts
similarity index 100%
rename from arch/mips/lantiq/dts/easy50712.dts
rename to arch/mips/boot/dts/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
next prev parent reply other threads:[~2014-08-21 20:06 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-21 20:04 [PATCH 0/7] MIPS: Move device-tree files to a common location Andrew Bresticker
2014-08-21 20:04 ` [PATCH 1/7] MIPS: Create common infrastructure for building built-in device-trees Andrew Bresticker
2014-08-21 20:04 ` [PATCH 2/7] MIPS: Add support for building device-tree binaries Andrew Bresticker
2014-08-21 20:04 ` [PATCH 3/7] MIPS: Octeon: Move device-trees to arch/mips/boot/dts/ Andrew Bresticker
2014-08-21 20:04 ` Andrew Bresticker [this message]
2014-08-21 20:04 ` [PATCH 5/7] MIPS: sead3: " Andrew Bresticker
2014-08-21 20:04 ` [PATCH 6/7] MIPS: Netlogic: " Andrew Bresticker
2014-08-21 20:04 ` [PATCH 7/7] MIPS: ralink: " Andrew Bresticker
[not found] ` <CAGVrzcZobuL4z0WNX+Sz4p_uwaPL-S5yvEmgRUwZPJi4+qq0tg@mail.gmail.com>
2014-08-22 20:57 ` [PATCH 0/7] MIPS: Move device-tree files to a common location David Daney
2014-08-22 22:10 ` Andrew Bresticker
2014-08-22 23:16 ` Jonas Gorski
2014-08-23 0:24 ` Andrew Bresticker
2014-08-22 21:10 ` Andrew Bresticker
2014-08-23 6:31 ` Olof Johansson
2014-08-23 13:56 ` Arnd Bergmann
2014-08-23 14:48 ` Jonas Gorski
2014-08-23 14:59 ` Arnd Bergmann
2014-08-23 16:14 ` Olof Johansson
2014-08-24 23:43 ` Rob Herring
2014-08-25 8:12 ` Arnd Bergmann
2014-08-25 14:49 ` Ralf Baechle
2014-08-23 19:50 ` Geert Uytterhoeven
2014-08-25 15:17 ` Jonas Gorski
2014-08-25 15:26 ` Geert Uytterhoeven
2014-08-27 18:30 ` Andrew Bresticker
2014-08-27 19:33 ` David Daney
2014-08-28 15:04 ` Rob Herring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1408651466-8334-5-git-send-email-abrestic@chromium.org \
--to=abrestic@chromium.org \
--cc=blogic@openwrt.org \
--cc=david.daney@cavium.com \
--cc=devicetree@vger.kernel.org \
--cc=galak@codeaurora.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=james.hogan@imgtec.com \
--cc=jchandra@broadcom.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=mark.rutland@arm.com \
--cc=paul.burton@imgtec.com \
--cc=pawel.moll@arm.com \
--cc=qais.yousef@imgtec.com \
--cc=ralf@linux-mips.org \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®