[meta-xilinx] [PATCH 00/12] Device Tree Rework

Nathan Rossi nathan at nathanrossi.com
Wed Feb 24 01:30:53 PST 2016


This series is all about reworking the device trees in layer as well as
how the device-tree.bb recipe works. And additionally switching some
machines to use the device tree provided by the kernel sources.

Firstly the changes to device-tree recipe. This series changes the
device-tree recipe so that it will handle sourcing the 'zynq-7000.dtsi'
and 'zynqmp.dtsi' includes directly from the currently selected kernel
version, this causes the device-tree recipe to depend on the kernel
source however this only applies for the Zynq and ZynqMP targets since
MicroBlaze has no base include. Additionally zynq7-base.dtsi is still
provided for compatiblity though users should switch over to using the
base includes from the kernel.

As for the changes to in layer device trees, in order to track kernel
changes and allow for clean kernel compatiblity the in layer
device-trees now use the 'zynq-7000.dtsi' base. This currently only
applies for microzed, picozed and qemuzynq. Also all the device trees
that are in layer are now located under the
recipes-bsp/device-tree/files directory.

And finally this series changes the zc702, zc706, zedboard and zybo
machines to use the device trees that are provided in the kernel.

There are some potentially breaking changes to users of the
machine-xilinx-* includes as the default RDEPEND on device-tree is no
longer default.

Nathan Rossi (12):
  device-tree.bb: Add support to use kernel source tree includes
  device-tree.bb: Move zynq7-base.dtsi into recipe source
  qemuzynq: Rework device tree to use kernel source include
  qemuzynq: Remove older device-trees
  kc705-trd-microblazeel: Move device tree to device-tree recipe
  microzed-zynq7: Rework device tree to use kernel source include
  picozed-zynq7: Rework device tree to use kernel source include
  zc702-zynq7: Switch over to in kernel device tree
  zedboard-zynq7: Switch over to in kernel device tree
  zc706-zynq7: Switch over to in kernel device tree
  zybo-zynq7: Switch over to in kernel device tree
  machine-xilinx-*.inc: Remove default append for 'device-tree'

 conf/machine/boards/common/zynq7-base.dtsi         | 504 --------------------
 .../boards/kc705/kc705-trd-microblazeel.dts        | 526 ---------------------
 .../boards/microzed/microzed-zynq7-board.dtsi      |  76 ---
 conf/machine/boards/microzed/microzed-zynq7.dts    |   5 -
 .../boards/picozed/picozed-zynq7-board.dtsi        |  76 ---
 conf/machine/boards/picozed/picozed-zynq7.dts      |   5 -
 conf/machine/boards/qemu/qemuzynq-base.dtsi        |  70 ---
 conf/machine/boards/qemu/qemuzynq.dts              |   5 -
 conf/machine/boards/zc702/zc702-zynq7-board.dtsi   | 149 ------
 conf/machine/boards/zc702/zc702-zynq7.dts          |   5 -
 conf/machine/boards/zc706/zc706-zynq7-board.dtsi   | 143 ------
 conf/machine/boards/zc706/zc706-zynq7.dts          |   5 -
 .../boards/zedboard/zedboard-zynq7-board.dtsi      |  79 ----
 conf/machine/boards/zedboard/zedboard-zynq7.dts    |   5 -
 conf/machine/boards/zybo/zybo-zynq7-board.dtsi     |  78 ---
 conf/machine/boards/zybo/zybo-zynq7.dts            |   5 -
 conf/machine/include/machine-xilinx-board.inc      |   2 -
 conf/machine/include/machine-xilinx-default.inc    |   8 -
 conf/machine/kc705-trd-microblazeel.conf           |   3 +-
 conf/machine/microzed-zynq7.conf                   |   8 +-
 conf/machine/picozed-zynq7.conf                    |   8 +-
 conf/machine/qemuzynq.conf                         |   6 +-
 conf/machine/zc702-zynq7.conf                      |  10 +-
 conf/machine/zc706-zynq7.conf                      |   8 +-
 conf/machine/zedboard-zynq7.conf                   |   9 +-
 conf/machine/zybo-zynq7.conf                       |   8 +-
 recipes-bsp/device-tree/device-tree.bb             |  30 +-
 .../device-tree/files/common/zynq7-base.dtsi       | 504 ++++++++++++++++++++
 .../files/kc705/kc705-trd-microblazeel.dts         | 526 +++++++++++++++++++++
 .../device-tree/files/microzed/microzed-zynq7.dts  | 100 ++++
 .../device-tree/files/picozed/picozed-zynq7.dts    | 102 ++++
 recipes-bsp/device-tree/files/qemu/qemuzynq.dts    |  87 ++++
 .../u-boot/u-boot-xlnx/zc702-zynq7/uEnv.txt        |   2 +-
 .../u-boot/u-boot-xlnx/zedboard-zynq7/uEnv.txt     |   2 +-
 34 files changed, 1368 insertions(+), 1791 deletions(-)
 delete mode 100644 conf/machine/boards/common/zynq7-base.dtsi
 delete mode 100644 conf/machine/boards/kc705/kc705-trd-microblazeel.dts
 delete mode 100644 conf/machine/boards/microzed/microzed-zynq7-board.dtsi
 delete mode 100644 conf/machine/boards/microzed/microzed-zynq7.dts
 delete mode 100644 conf/machine/boards/picozed/picozed-zynq7-board.dtsi
 delete mode 100644 conf/machine/boards/picozed/picozed-zynq7.dts
 delete mode 100644 conf/machine/boards/qemu/qemuzynq-base.dtsi
 delete mode 100644 conf/machine/boards/qemu/qemuzynq.dts
 delete mode 100644 conf/machine/boards/zc702/zc702-zynq7-board.dtsi
 delete mode 100644 conf/machine/boards/zc702/zc702-zynq7.dts
 delete mode 100644 conf/machine/boards/zc706/zc706-zynq7-board.dtsi
 delete mode 100644 conf/machine/boards/zc706/zc706-zynq7.dts
 delete mode 100644 conf/machine/boards/zedboard/zedboard-zynq7-board.dtsi
 delete mode 100644 conf/machine/boards/zedboard/zedboard-zynq7.dts
 delete mode 100644 conf/machine/boards/zybo/zybo-zynq7-board.dtsi
 delete mode 100644 conf/machine/boards/zybo/zybo-zynq7.dts
 create mode 100644 recipes-bsp/device-tree/files/common/zynq7-base.dtsi
 create mode 100644 recipes-bsp/device-tree/files/kc705/kc705-trd-microblazeel.dts
 create mode 100644 recipes-bsp/device-tree/files/microzed/microzed-zynq7.dts
 create mode 100644 recipes-bsp/device-tree/files/picozed/picozed-zynq7.dts
 create mode 100644 recipes-bsp/device-tree/files/qemu/qemuzynq.dts

-- 
2.7.0



More information about the meta-xilinx mailing list