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 6/7] MIPS: Netlogic: Move device-trees to arch/mips/boot/dts/
Date: Thu, 21 Aug 2014 13:04:25 -0700 [thread overview]
Message-ID: <1408651466-8334-7-git-send-email-abrestic@chromium.org> (raw)
In-Reply-To: <1408651466-8334-1-git-send-email-abrestic@chromium.org>
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>
---
arch/mips/boot/dts/Makefile | 4 ++++
arch/mips/{netlogic => boot}/dts/xlp_evp.dts | 0
arch/mips/{netlogic => boot}/dts/xlp_fvp.dts | 0
arch/mips/{netlogic => boot}/dts/xlp_gvp.dts | 0
arch/mips/{netlogic => boot}/dts/xlp_svp.dts | 0
arch/mips/netlogic/Kconfig | 4 ++++
arch/mips/netlogic/Makefile | 1 -
arch/mips/netlogic/dts/Makefile | 4 ----
8 files changed, 8 insertions(+), 5 deletions(-)
rename arch/mips/{netlogic => boot}/dts/xlp_evp.dts (100%)
rename arch/mips/{netlogic => boot}/dts/xlp_fvp.dts (100%)
rename arch/mips/{netlogic => boot}/dts/xlp_gvp.dts (100%)
rename arch/mips/{netlogic => boot}/dts/xlp_svp.dts (100%)
delete mode 100644 arch/mips/netlogic/dts/Makefile
diff --git a/arch/mips/boot/dts/Makefile b/arch/mips/boot/dts/Makefile
index 8df3d3e..1638a38 100644
--- a/arch/mips/boot/dts/Makefile
+++ b/arch/mips/boot/dts/Makefile
@@ -1,5 +1,9 @@
dtb-$(CONFIG_CAVIUM_OCTEON_SOC) += octeon_3xxx.dtb octeon_68xx.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
obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
diff --git a/arch/mips/netlogic/dts/xlp_evp.dts b/arch/mips/boot/dts/xlp_evp.dts
similarity index 100%
rename from arch/mips/netlogic/dts/xlp_evp.dts
rename to arch/mips/boot/dts/xlp_evp.dts
diff --git a/arch/mips/netlogic/dts/xlp_fvp.dts b/arch/mips/boot/dts/xlp_fvp.dts
similarity index 100%
rename from arch/mips/netlogic/dts/xlp_fvp.dts
rename to arch/mips/boot/dts/xlp_fvp.dts
diff --git a/arch/mips/netlogic/dts/xlp_gvp.dts b/arch/mips/boot/dts/xlp_gvp.dts
similarity index 100%
rename from arch/mips/netlogic/dts/xlp_gvp.dts
rename to arch/mips/boot/dts/xlp_gvp.dts
diff --git a/arch/mips/netlogic/dts/xlp_svp.dts b/arch/mips/boot/dts/xlp_svp.dts
similarity index 100%
rename from arch/mips/netlogic/dts/xlp_svp.dts
rename to arch/mips/boot/dts/xlp_svp.dts
diff --git a/arch/mips/netlogic/Kconfig b/arch/mips/netlogic/Kconfig
index 4eb683a..0823321 100644
--- a/arch/mips/netlogic/Kconfig
+++ b/arch/mips/netlogic/Kconfig
@@ -4,6 +4,7 @@ if NLM_XLP_BOARD
config DT_XLP_EVP
bool "Built-in device tree for XLP EVP boards"
default y
+ select BUILTIN_DTB
help
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
@@ -13,6 +14,7 @@ config DT_XLP_EVP
config DT_XLP_SVP
bool "Built-in device tree for XLP SVP boards"
default y
+ select BUILTIN_DTB
help
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
@@ -22,6 +24,7 @@ config DT_XLP_SVP
config DT_XLP_FVP
bool "Built-in device tree for XLP FVP boards"
default y
+ select BUILTIN_DTB
help
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
@@ -31,6 +34,7 @@ config DT_XLP_FVP
config DT_XLP_GVP
bool "Built-in device tree for XLP GVP boards"
default y
+ select BUILTIN_DTB
help
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
diff --git a/arch/mips/netlogic/Makefile b/arch/mips/netlogic/Makefile
index 7602d13..36d169b 100644
--- a/arch/mips/netlogic/Makefile
+++ b/arch/mips/netlogic/Makefile
@@ -1,4 +1,3 @@
obj-$(CONFIG_NLM_COMMON) += common/
obj-$(CONFIG_CPU_XLR) += xlr/
obj-$(CONFIG_CPU_XLP) += xlp/
-obj-$(CONFIG_CPU_XLP) += dts/
diff --git a/arch/mips/netlogic/dts/Makefile b/arch/mips/netlogic/dts/Makefile
deleted file mode 100644
index 25c8e87..0000000
--- a/arch/mips/netlogic/dts/Makefile
+++ /dev/null
@@ -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
--
2.1.0.rc2.206.gedb03e5
next prev parent reply other threads:[~2014-08-21 20:04 UTC|newest]
Thread overview: 28+ 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
[not found] ` <1408651466-8334-1-git-send-email-abrestic-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
2014-08-21 20:04 ` [PATCH 2/7] MIPS: Add support for building device-tree binaries Andrew Bresticker
2014-08-21 20:04 ` [PATCH 4/7] MIPS: Lantiq: Move device-trees to arch/mips/boot/dts/ Andrew Bresticker
2014-08-21 20:04 ` [PATCH 3/7] MIPS: Octeon: " Andrew Bresticker
2014-08-21 20:04 ` [PATCH 5/7] MIPS: sead3: " Andrew Bresticker
2014-08-21 20:04 ` Andrew Bresticker [this message]
2014-08-21 20:04 ` [PATCH 7/7] MIPS: ralink: " Andrew Bresticker
2014-08-22 20:42 ` [PATCH 0/7] MIPS: Move device-tree files to a common location Florian Fainelli
2014-08-22 20:57 ` David Daney
2014-08-22 22:10 ` Andrew Bresticker
2014-08-22 23:16 ` Jonas Gorski
[not found] ` <CAOiHx=kLfKLZA2Nv+dn87S50209DBXRj8OgZsywXQ0MoqTVA8A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
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
[not found] ` <201408231556.42571.arnd-r2nGTMty4D4@public.gmane.org>
2014-08-23 14:48 ` Jonas Gorski
[not found] ` <CAOiHx=noe=614vv4GyhuvfoAYj0jYDhO5vX+7M2RbQBpE-uPnQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
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
[not found] ` <CAMuHMdXudu0kuOkKN8JCrWZSrQ4awKHhHU0E2ss++ProP0rteQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-08-25 15:17 ` Jonas Gorski
[not found] ` <CAOiHx=mZPt=p_jw4fyEqgniJvqunQ86ro_Run5ZtD1zLYWzmqA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-08-25 15:26 ` Geert Uytterhoeven
2014-08-27 18:30 ` Andrew Bresticker
[not found] ` <CAL1qeaFTw=0XMEkag1Z8C4jKkWnwBeGJLYxHGiYfKXBk-9o0Yw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
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-7-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;
as well as URLs for NNTP newsgroup(s).