[PATCH v2 0/7] MIPS: Move device-tree files to a common location

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




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.  Note that
since there is currently no Kbuild infrastructure for recursively
building dtbs like there is for object files, the top level Makefile
in arch/mips/boot/dts/ just includes the sub-Makefiles.

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' makefile target to allow building of just
the DT binaries.

Patches 3-7 move 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-rc2.

Changes from v1:
 - moved to per-vendor subdirectories
 - rebased on 3.17-rc2

Andrew Bresticker (7):
  MIPS: Create common infrastructure for building built-in device-trees
  MIPS: Add support for building device-tree binaries
  MIPS: Octeon: Move device-trees to arch/mips/boot/dts/cavium-octeon/
  MIPS: Lantiq: Move device-trees to arch/mips/boot/dts/lantiq/
  MIPS: sead3: Move device-trees to arch/mips/boot/dts/mti/
  MIPS: Netlogic: Move device-trees to arch/mips/boot/dts/netlogic/
  MIPS: ralink: Move device-trees to arch/mips/boot/dts/ralink/

 arch/mips/Kconfig                                          |  5 +++++
 arch/mips/Makefile                                         | 11 +++++++++++
 arch/mips/boot/.gitignore                                  |  1 +
 arch/mips/boot/dts/Makefile                                | 14 ++++++++++++++
 arch/mips/boot/dts/cavium-octeon/Makefile                  |  2 ++
 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                         |  1 +
 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                            |  1 +
 arch/mips/{mti-sead3 => boot/dts/mti}/sead3.dts            |  0
 arch/mips/boot/dts/netlogic/Makefile                       |  4 ++++
 arch/mips/{netlogic/dts => boot/dts/netlogic}/xlp_evp.dts  |  0
 arch/mips/{netlogic/dts => boot/dts/netlogic}/xlp_fvp.dts  |  0
 arch/mips/{netlogic/dts => boot/dts/netlogic}/xlp_gvp.dts  |  0
 arch/mips/{netlogic/dts => boot/dts/netlogic}/xlp_svp.dts  |  0
 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/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, 52 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@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Device Tree Compilter]     [Device Tree Spec]     [Linux Driver Backports]     [Video for Linux]     [Linux USB Devel]     [Linux PCI Devel]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [XFree86]     [Yosemite Backpacking]
  Powered by Linux