[meta-xilinx] [meta-xilinx-community][PATCH 2/7] microzed-zynq7: Re-organize device-trees

[Nathan Rossi]

* Re-organize the device-trees for the microZed board to provide a
  default device tree for generic boot purposes which defaults to
  ramdisk if the boot args are not overriden
* Rename the board level dtsi to microzed-zynq7-board.dtsi so that the
  name of the default device-tree matches the name of the machine
* Remove the including of the zynq7-base.dtsi from the board include to
  allow its reuse in other cases

Signed-off-by: Nathan Rossi <nathan.rossi at xilinx.com>
---
 .../{microzed-zynq7.dtsi => microzed-zynq7-board.dtsi}        |  7 +++++--
 conf/machine/boards/microzed/microzed-zynq7-ram.dts           | 11 -----------
 conf/machine/boards/microzed/microzed-zynq7.dts               |  5 +++++
 conf/machine/microzed-zynq7.conf                              |  4 ++--
 4 files changed, 12 insertions(+), 15 deletions(-)
 rename conf/machine/boards/microzed/{microzed-zynq7.dtsi => microzed-zynq7-board.dtsi} (95%)
 delete mode 100644 conf/machine/boards/microzed/microzed-zynq7-ram.dts
 create mode 100644 conf/machine/boards/microzed/microzed-zynq7.dts

diff --git a/conf/machine/boards/microzed/microzed-zynq7.dtsi b/conf/machine/boards/microzed/microzed-zynq7-board.dtsi
similarity index 95%
rename from conf/machine/boards/microzed/microzed-zynq7.dtsi
rename to conf/machine/boards/microzed/microzed-zynq7-board.dtsi
index d8bcba2..4898918 100755
--- a/conf/machine/boards/microzed/microzed-zynq7.dtsi
+++ b/conf/machine/boards/microzed/microzed-zynq7-board.dtsi
@@ -1,9 +1,12 @@
-/include/ "zynq7-base.dtsi"
+/*
+ * microZed DTS for generic boot.
+ */
+
 / {
 	model = "microZed";
 
 	chosen {
-		bootargs = "console=ttyPS0,115200 earlyprintk";
+		bootargs = "console=ttyPS0,115200 earlyprintk root=/dev/ram rw";
 		linux,stdout-path = "/axi at 0/serial at e0001000";
 	} ;
 
diff --git a/conf/machine/boards/microzed/microzed-zynq7-ram.dts b/conf/machine/boards/microzed/microzed-zynq7-ram.dts
deleted file mode 100644
index a2c4b36..0000000
--- a/conf/machine/boards/microzed/microzed-zynq7-ram.dts
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * microZed DTS file header for ramdisk boot.
- */
-
-/dts-v1/;
-/include/ "microzed-zynq7.dtsi"
-/ {
-	chosen {
-		bootargs = "console=ttyPS0,115200 root=/dev/ram rw ip=none earlyprintk";
-	} ;
-} ;
diff --git a/conf/machine/boards/microzed/microzed-zynq7.dts b/conf/machine/boards/microzed/microzed-zynq7.dts
new file mode 100644
index 0000000..3470e5a
--- /dev/null
+++ b/conf/machine/boards/microzed/microzed-zynq7.dts
@@ -0,0 +1,5 @@
+/dts-v1/;
+/include/ "zynq7-base.dtsi"
+/include/ "microzed-zynq7-board.dtsi"
+/ {
+} ;
diff --git a/conf/machine/microzed-zynq7.conf b/conf/machine/microzed-zynq7.conf
index db666d1..eef016b 100644
--- a/conf/machine/microzed-zynq7.conf
+++ b/conf/machine/microzed-zynq7.conf
@@ -12,7 +12,7 @@ UBOOT_MACHINE = "zynq_zed_config"
 SERIAL_CONSOLE = "115200 ttyPS0"
 
 MACHINE_DEVICETREE := " \
-		microzed/microzed-zynq7.dtsi \
-		microzed/microzed-zynq7-ram.dts \
+		microzed/microzed-zynq7-board.dtsi \
+		microzed/microzed-zynq7.dts \
 		"
 
-- 
2.1.1