From: Andrew Bresticker <abrestic-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
To: Ralf Baechle <ralf-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org>,
Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org>,
Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org>,
Ian Campbell
<ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org>,
Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
Cc: Andrew Bresticker
<abrestic-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>,
James Hogan <james.hogan-1AXoQHu6uovQT0dZR+AlfA@public.gmane.org>,
Paul Burton <paul.burton-1AXoQHu6uovQT0dZR+AlfA@public.gmane.org>,
David Daney <david.daney-YGCgFSpz5w/QT0dZR+AlfA@public.gmane.org>,
John Crispin <blogic-p3rKhJxN3npAfugRpC6u6w@public.gmane.org>,
Jayachandran C <jchandra-dY08KVG/lbpWk0Htik3J/w@public.gmane.org>,
Qais Yousef <qais.yousef-1AXoQHu6uovQT0dZR+AlfA@public.gmane.org>,
Florian Fainelli
<f.fainelli-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
Jonas Gorski <jogo-p3rKhJxN3npAfugRpC6u6w@public.gmane.org>,
Olof Johansson <olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>,
Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>,
Geert Uytterhoeven
<geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org>,
linux-mips-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: [PATCH v3 0/3] MIPS: Move device-tree files to a common location
Date: Mon, 15 Sep 2014 10:53:56 -0700 [thread overview]
Message-ID: <1410803639-3159-1-git-send-email-abrestic@chromium.org> (raw)
To be consistent with other architectures and to avoid unnecessary
makefile duplication, move all MIPS device-trees to arch/mips/boot/dts
and build them with a common makefile. Per Olof's suggestion in v1,
device-trees are grouped into per-vendor subdirectories, based on the
kbuild changes introduced by Robert Richter's series for arm64 DTS
vendor subdirectories [0]. The makefiles for MIPS must be adjusted
slightly from what is used for arm{,64} since most MIPS platforms
require builtin device-tree binaries. This introduces two bits of
ugliness: a) *.dtb.o files are still generated by 'make dtbs' since
there is no longer a 'dtbs' target for the .../boot/dts makefile, and
b) the dummy.o trick to force kbuild to make an empty built-in.o.
I'd be interested in any suggestions to avoid these, since I"m by
no means a makefile/kbuild expert.
Patch 1 sets up the makefiles for building the DTs in arch/mips/boot/dts
and introduces the config option BUILTIN_DTB for platforms that require
it.
Patch 2 introduces the 'dtbs' and 'dtbs_install' makefile targets.
Patch 3 moves the DTs out of the platform directores.
I've build tested this on all affected platforms (Octeon, Lantiq, SEAD3,
Netlogic, and Ralink) as well as Malta. For platforms where builtin DTBs
are optional (Netlogic and Ralink), I built with and without the builtin
DTBs.
Based on 3.17-rc5.
Changes from v2:
- added 'dtbs_install' target
- squashed move of dts files into a single patch
- rebased on 3.17-rc5 + Robert's dts vendor subdir support
Changes from v1:
- moved to per-vendor subdirectories
- rebased on 3.17-rc2
[0] https://lkml.org/lkml/2014/9/5/64
Andrew Bresticker (3):
MIPS: Create common infrastructure for building built-in device-trees
MIPS: Add support for building and installing device-tree binaries
MIPS: Move device-trees to arch/mips/boot/dts
arch/mips/Kconfig | 5 +++++
arch/mips/Makefile | 16 ++++++++++++++++
arch/mips/boot/.gitignore | 1 +
arch/mips/boot/dts/Makefile | 10 ++++++++++
arch/mips/boot/dts/cavium-octeon/Makefile | 9 +++++++++
arch/mips/{ => boot/dts}/cavium-octeon/octeon_3xxx.dts | 0
arch/mips/{ => boot/dts}/cavium-octeon/octeon_68xx.dts | 0
arch/mips/boot/dts/lantiq/Makefile | 9 +++++++++
arch/mips/{lantiq/dts => boot/dts/lantiq}/danube.dtsi | 0
arch/mips/{lantiq/dts => boot/dts/lantiq}/easy50712.dts | 0
arch/mips/boot/dts/mti/Makefile | 9 +++++++++
arch/mips/{mti-sead3 => boot/dts/mti}/sead3.dts | 0
arch/mips/boot/dts/netlogic/Makefile | 12 ++++++++++++
.../mips/{netlogic/dts => boot/dts/netlogic}/xlp_evp.dts | 0
.../mips/{netlogic/dts => boot/dts/netlogic}/xlp_fvp.dts | 0
.../mips/{netlogic/dts => boot/dts/netlogic}/xlp_gvp.dts | 0
.../mips/{netlogic/dts => boot/dts/netlogic}/xlp_svp.dts | 0
arch/mips/boot/dts/ralink/Makefile | 12 ++++++++++++
arch/mips/{ralink/dts => boot/dts/ralink}/mt7620a.dtsi | 0
.../{ralink/dts => boot/dts/ralink}/mt7620a_eval.dts | 0
arch/mips/{ralink/dts => boot/dts/ralink}/rt2880.dtsi | 0
.../mips/{ralink/dts => boot/dts/ralink}/rt2880_eval.dts | 0
arch/mips/{ralink/dts => boot/dts/ralink}/rt3050.dtsi | 0
.../mips/{ralink/dts => boot/dts/ralink}/rt3052_eval.dts | 0
arch/mips/{ralink/dts => boot/dts/ralink}/rt3883.dtsi | 0
.../mips/{ralink/dts => boot/dts/ralink}/rt3883_eval.dts | 0
arch/mips/cavium-octeon/.gitignore | 2 --
arch/mips/cavium-octeon/Makefile | 10 ----------
arch/mips/lantiq/Kconfig | 1 +
arch/mips/lantiq/Makefile | 2 --
arch/mips/lantiq/dts/Makefile | 1 -
arch/mips/mti-sead3/Makefile | 4 ----
arch/mips/netlogic/Kconfig | 4 ++++
arch/mips/netlogic/Makefile | 1 -
arch/mips/netlogic/dts/Makefile | 4 ----
arch/mips/ralink/Kconfig | 4 ++++
arch/mips/ralink/Makefile | 2 --
arch/mips/ralink/dts/Makefile | 4 ----
38 files changed, 92 insertions(+), 30 deletions(-)
create mode 100644 arch/mips/boot/dts/Makefile
create mode 100644 arch/mips/boot/dts/cavium-octeon/Makefile
rename arch/mips/{ => boot/dts}/cavium-octeon/octeon_3xxx.dts (100%)
rename arch/mips/{ => boot/dts}/cavium-octeon/octeon_68xx.dts (100%)
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%)
create mode 100644 arch/mips/boot/dts/mti/Makefile
rename arch/mips/{mti-sead3 => boot/dts/mti}/sead3.dts (100%)
create mode 100644 arch/mips/boot/dts/netlogic/Makefile
rename arch/mips/{netlogic/dts => boot/dts/netlogic}/xlp_evp.dts (100%)
rename arch/mips/{netlogic/dts => boot/dts/netlogic}/xlp_fvp.dts (100%)
rename arch/mips/{netlogic/dts => boot/dts/netlogic}/xlp_gvp.dts (100%)
rename arch/mips/{netlogic/dts => boot/dts/netlogic}/xlp_svp.dts (100%)
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/cavium-octeon/.gitignore
delete mode 100644 arch/mips/lantiq/dts/Makefile
delete mode 100644 arch/mips/netlogic/dts/Makefile
delete mode 100644 arch/mips/ralink/dts/Makefile
--
2.1.0.rc2.206.gedb03e5
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next reply other threads:[~2014-09-15 17:53 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-15 17:53 Andrew Bresticker [this message]
2014-09-15 17:53 ` [PATCH v3 2/3] MIPS: Add support for building and installing device-tree binaries Andrew Bresticker
[not found] ` <1410803639-3159-1-git-send-email-abrestic-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
2014-09-15 17:53 ` [PATCH v3 1/3] MIPS: Create common infrastructure for building built-in device-trees Andrew Bresticker
2014-09-15 17:53 ` [PATCH v3 3/3] MIPS: Move device-trees to arch/mips/boot/dts Andrew Bresticker
2014-09-15 18:11 ` [PATCH v3 0/3] MIPS: Move device-tree files to a common location John Crispin
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=1410803639-3159-1-git-send-email-abrestic@chromium.org \
--to=abrestic-f7+t8e8rja9g9huczpvpmw@public.gmane.org \
--cc=arnd-r2nGTMty4D4@public.gmane.org \
--cc=blogic-p3rKhJxN3npAfugRpC6u6w@public.gmane.org \
--cc=david.daney-YGCgFSpz5w/QT0dZR+AlfA@public.gmane.org \
--cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=f.fainelli-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org \
--cc=geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org \
--cc=ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org \
--cc=james.hogan-1AXoQHu6uovQT0dZR+AlfA@public.gmane.org \
--cc=jchandra-dY08KVG/lbpWk0Htik3J/w@public.gmane.org \
--cc=jogo-p3rKhJxN3npAfugRpC6u6w@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-mips-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org \
--cc=mark.rutland-5wv7dgnIgG8@public.gmane.org \
--cc=olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org \
--cc=paul.burton-1AXoQHu6uovQT0dZR+AlfA@public.gmane.org \
--cc=pawel.moll-5wv7dgnIgG8@public.gmane.org \
--cc=qais.yousef-1AXoQHu6uovQT0dZR+AlfA@public.gmane.org \
--cc=ralf-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org \
--cc=robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.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).