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>,
Florian Fainelli <f.fainelli@gmail.com>,
Jonas Gorski <jogo@openwrt.org>, Olof Johansson <olof@lixom.net>,
Arnd Bergmann <arnd@arndb.de>,
Geert Uytterhoeven <geert@linux-m68k.org>,
linux-mips@linux-mips.org, linux-kernel@vger.kernel.org,
devicetree@vger.kernel.org,
Andrew Bresticker <abrestic@chromium.org>
Subject: [PATCH v2 7/7] MIPS: ralink: Move device-trees to arch/mips/boot/dts/ralink/
Date: Thu, 28 Aug 2014 20:27:42 -0700 [thread overview]
Message-ID: <1409282862-4435-1-git-send-email-abrestic@chromium.org> (raw)
In-Reply-To: <1409191812-23697-1-git-send-email-abrestic@chromium.org>
Move the Ralink device-trees to arch/mips/boot/dts/ralink/ 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>
---
Looks like this one didn't make it through the first time.
---
arch/mips/boot/dts/Makefile | 1 +
arch/mips/boot/dts/ralink/Makefile | 4 ++++
arch/mips/{ralink/dts => boot/dts/ralink}/mt7620a.dtsi | 0
arch/mips/{ralink/dts => boot/dts/ralink}/mt7620a_eval.dts | 0
arch/mips/{ralink/dts => boot/dts/ralink}/rt2880.dtsi | 0
arch/mips/{ralink/dts => boot/dts/ralink}/rt2880_eval.dts | 0
arch/mips/{ralink/dts => boot/dts/ralink}/rt3050.dtsi | 0
arch/mips/{ralink/dts => boot/dts/ralink}/rt3052_eval.dts | 0
arch/mips/{ralink/dts => boot/dts/ralink}/rt3883.dtsi | 0
arch/mips/{ralink/dts => boot/dts/ralink}/rt3883_eval.dts | 0
arch/mips/ralink/Kconfig | 4 ++++
arch/mips/ralink/Makefile | 2 --
arch/mips/ralink/dts/Makefile | 4 ----
13 files changed, 9 insertions(+), 6 deletions(-)
create mode 100644 arch/mips/boot/dts/ralink/Makefile
rename arch/mips/{ralink/dts => boot/dts/ralink}/mt7620a.dtsi (100%)
rename arch/mips/{ralink/dts => boot/dts/ralink}/mt7620a_eval.dts (100%)
rename arch/mips/{ralink/dts => boot/dts/ralink}/rt2880.dtsi (100%)
rename arch/mips/{ralink/dts => boot/dts/ralink}/rt2880_eval.dts (100%)
rename arch/mips/{ralink/dts => boot/dts/ralink}/rt3050.dtsi (100%)
rename arch/mips/{ralink/dts => boot/dts/ralink}/rt3052_eval.dts (100%)
rename arch/mips/{ralink/dts => boot/dts/ralink}/rt3883.dtsi (100%)
rename arch/mips/{ralink/dts => boot/dts/ralink}/rt3883_eval.dts (100%)
delete mode 100644 arch/mips/ralink/dts/Makefile
diff --git a/arch/mips/boot/dts/Makefile b/arch/mips/boot/dts/Makefile
index a861be5..47406f7 100644
--- a/arch/mips/boot/dts/Makefile
+++ b/arch/mips/boot/dts/Makefile
@@ -2,6 +2,7 @@ include arch/mips/boot/dts/cavium-octeon/Makefile
include arch/mips/boot/dts/lantiq/Makefile
include arch/mips/boot/dts/mti/Makefile
include arch/mips/boot/dts/netlogic/Makefile
+include arch/mips/boot/dts/ralink/Makefile
obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
diff --git a/arch/mips/boot/dts/ralink/Makefile b/arch/mips/boot/dts/ralink/Makefile
new file mode 100644
index 0000000..81a567e
--- /dev/null
+++ b/arch/mips/boot/dts/ralink/Makefile
@@ -0,0 +1,4 @@
+dtb-$(CONFIG_DTB_RT2880_EVAL) += ralink/rt2880_eval.dtb
+dtb-$(CONFIG_DTB_RT305X_EVAL) += ralink/rt3052_eval.dtb
+dtb-$(CONFIG_DTB_RT3883_EVAL) += ralink/rt3883_eval.dtb
+dtb-$(CONFIG_DTB_MT7620A_EVAL) += ralink/mt7620a_eval.dtb
diff --git a/arch/mips/ralink/dts/mt7620a.dtsi b/arch/mips/boot/dts/ralink/mt7620a.dtsi
similarity index 100%
rename from arch/mips/ralink/dts/mt7620a.dtsi
rename to arch/mips/boot/dts/ralink/mt7620a.dtsi
diff --git a/arch/mips/ralink/dts/mt7620a_eval.dts b/arch/mips/boot/dts/ralink/mt7620a_eval.dts
similarity index 100%
rename from arch/mips/ralink/dts/mt7620a_eval.dts
rename to arch/mips/boot/dts/ralink/mt7620a_eval.dts
diff --git a/arch/mips/ralink/dts/rt2880.dtsi b/arch/mips/boot/dts/ralink/rt2880.dtsi
similarity index 100%
rename from arch/mips/ralink/dts/rt2880.dtsi
rename to arch/mips/boot/dts/ralink/rt2880.dtsi
diff --git a/arch/mips/ralink/dts/rt2880_eval.dts b/arch/mips/boot/dts/ralink/rt2880_eval.dts
similarity index 100%
rename from arch/mips/ralink/dts/rt2880_eval.dts
rename to arch/mips/boot/dts/ralink/rt2880_eval.dts
diff --git a/arch/mips/ralink/dts/rt3050.dtsi b/arch/mips/boot/dts/ralink/rt3050.dtsi
similarity index 100%
rename from arch/mips/ralink/dts/rt3050.dtsi
rename to arch/mips/boot/dts/ralink/rt3050.dtsi
diff --git a/arch/mips/ralink/dts/rt3052_eval.dts b/arch/mips/boot/dts/ralink/rt3052_eval.dts
similarity index 100%
rename from arch/mips/ralink/dts/rt3052_eval.dts
rename to arch/mips/boot/dts/ralink/rt3052_eval.dts
diff --git a/arch/mips/ralink/dts/rt3883.dtsi b/arch/mips/boot/dts/ralink/rt3883.dtsi
similarity index 100%
rename from arch/mips/ralink/dts/rt3883.dtsi
rename to arch/mips/boot/dts/ralink/rt3883.dtsi
diff --git a/arch/mips/ralink/dts/rt3883_eval.dts b/arch/mips/boot/dts/ralink/rt3883_eval.dts
similarity index 100%
rename from arch/mips/ralink/dts/rt3883_eval.dts
rename to arch/mips/boot/dts/ralink/rt3883_eval.dts
diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig
index 4a29665..77e8a96 100644
--- a/arch/mips/ralink/Kconfig
+++ b/arch/mips/ralink/Kconfig
@@ -42,18 +42,22 @@ choice
config DTB_RT2880_EVAL
bool "RT2880 eval kit"
depends on SOC_RT288X
+ select BUILTIN_DTB
config DTB_RT305X_EVAL
bool "RT305x eval kit"
depends on SOC_RT305X
+ select BUILTIN_DTB
config DTB_RT3883_EVAL
bool "RT3883 eval kit"
depends on SOC_RT3883
+ select BUILTIN_DTB
config DTB_MT7620A_EVAL
bool "MT7620A eval kit"
depends on SOC_MT7620
+ select BUILTIN_DTB
endchoice
diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile
index 98ae349..2c09c8a 100644
--- a/arch/mips/ralink/Makefile
+++ b/arch/mips/ralink/Makefile
@@ -16,5 +16,3 @@ obj-$(CONFIG_SOC_RT3883) += rt3883.o
obj-$(CONFIG_SOC_MT7620) += mt7620.o
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
-
-obj-y += dts/
diff --git a/arch/mips/ralink/dts/Makefile b/arch/mips/ralink/dts/Makefile
deleted file mode 100644
index 18194fa..0000000
--- a/arch/mips/ralink/dts/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-obj-$(CONFIG_DTB_RT2880_EVAL) := rt2880_eval.dtb.o
-obj-$(CONFIG_DTB_RT305X_EVAL) := rt3052_eval.dtb.o
-obj-$(CONFIG_DTB_RT3883_EVAL) := rt3883_eval.dtb.o
-obj-$(CONFIG_DTB_MT7620A_EVAL) := mt7620a_eval.dtb.o
--
2.1.0.rc2.206.gedb03e5
next prev parent reply other threads:[~2014-08-29 5:45 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-28 2:10 [PATCH v2 0/7] MIPS: Move device-tree files to a common location Andrew Bresticker
2014-08-28 2:10 ` [PATCH v2 1/7] MIPS: Create common infrastructure for building built-in device-trees Andrew Bresticker
2014-08-28 2:10 ` [PATCH v2 2/7] MIPS: Add support for building device-tree binaries Andrew Bresticker
2014-08-28 2:10 ` [PATCH v2 3/7] MIPS: Octeon: Move device-trees to arch/mips/boot/dts/cavium-octeon/ Andrew Bresticker
2014-08-28 2:10 ` [PATCH v2 4/7] MIPS: Lantiq: Move device-trees to arch/mips/boot/dts/lantiq/ Andrew Bresticker
2014-08-28 2:10 ` [PATCH v2 5/7] MIPS: sead3: Move device-trees to arch/mips/boot/dts/mti/ Andrew Bresticker
2014-08-28 2:10 ` [PATCH v2 6/7] MIPS: Netlogic: Move device-trees to arch/mips/boot/dts/netlogic/ Andrew Bresticker
2014-08-29 3:27 ` Andrew Bresticker [this message]
2014-08-29 3:56 ` [PATCH v2 7/7] MIPS: ralink: Move device-trees to arch/mips/boot/dts/ralink/ Andrew Bresticker
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=1409282862-4435-1-git-send-email-abrestic@chromium.org \
--to=abrestic@chromium.org \
--cc=arnd@arndb.de \
--cc=blogic@openwrt.org \
--cc=david.daney@cavium.com \
--cc=devicetree@vger.kernel.org \
--cc=f.fainelli@gmail.com \
--cc=galak@codeaurora.org \
--cc=geert@linux-m68k.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=james.hogan@imgtec.com \
--cc=jchandra@broadcom.com \
--cc=jogo@openwrt.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=mark.rutland@arm.com \
--cc=olof@lixom.net \
--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®