zedboard-zynq7: Cleaned up device trees and configuration

* Cleaned up device trees, refactored the dts per boot args setup

Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>

5 files changed, 11 insertions, 30 deletions

diff --git a/conf/machine/boards/zedboard/zedboard-zynq7.dtsi b/conf/machine/boards/zedboard/zedboard-zynq7-board.dtsi
index af5c8b0e..fb4a0594 100644
--- a/conf/machine/boards/zedboard/zedboard-zynq7.dtsi
+++ b/conf/machine/boards/zedboard/zedboard-zynq7-board.dtsi
@@ -1,8 +1,12 @@
+/*
+ * ZedBoard DTS file header for generic boot.
+ */
+
 /include/ "zynq-7-base.dtsi"
 / {
         model = "ZedBoard";
         chosen {
-                bootargs = "console=ttyPS0,115200 earlyprintk";
+                bootargs = "console=ttyPS0,115200 earlyprintk root=/dev/ram rw";
                 linux,stdout-path = "/axi@0/serial@e0001000";
         } ;
         ps7_ddr_0: memory@0 {
diff --git a/conf/machine/boards/zedboard/zedboard-zynq7-mmcblk0p2.dts b/conf/machine/boards/zedboard/zedboard-zynq7-mmcblk0p2.dts
deleted file mode 100644
index 305acf7d..00000000
--- a/conf/machine/boards/zedboard/zedboard-zynq7-mmcblk0p2.dts
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Zedboard DTS file header for sdcard/mmc partition 2 boot.
- */
-
-/dts-v1/;
-/include/ "zedboard-zynq7.dtsi"
-/ {
-        chosen {
-                bootargs = "console=ttyPS0,115200 root=/dev/mmcblk0p2 ro earlyprintk";
-        } ;
-} ;
diff --git a/conf/machine/boards/zedboard/zedboard-zynq7-ram.dts b/conf/machine/boards/zedboard/zedboard-zynq7-ram.dts
deleted file mode 100644
index 8c91db45..00000000
--- a/conf/machine/boards/zedboard/zedboard-zynq7-ram.dts
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Zedboard DTS file header for ramdisk boot.
- */
-
-/dts-v1/;
-/include/ "zedboard-zynq7.dtsi"
-/ {
-        chosen {
-                bootargs = "console=ttyPS0,115200 root=/dev/ram rw earlyprintk";
-        } ;
-} ;
diff --git a/conf/machine/boards/zedboard/zedboard-zynq7.dts b/conf/machine/boards/zedboard/zedboard-zynq7.dts
new file mode 100644
index 00000000..2874837d
--- /dev/null
+++ b/conf/machine/boards/zedboard/zedboard-zynq7.dts
@@ -0,0 +1,4 @@
+/dts-v1/;
+/include/ "zedboard-zynq7-board.dtsi"
+/ {
+} ;
\ No newline at end of file
diff --git a/conf/machine/zedboard-zynq7.conf b/conf/machine/zedboard-zynq7.conf
index c668c3e4..6b313cfb 100644
--- a/conf/machine/zedboard-zynq7.conf
+++ b/conf/machine/zedboard-zynq7.conf
@@ -8,10 +8,6 @@
 #     http://www.zedboard.org/reference-designs-categories/zynq-concepts-tools-and-techniques-zedboard
 #
 
-# Versions corresponding to zedboard documentation
-PREFERRED_VERSION_linux-xlnx ?= "3.8%"
-PREFERRED_VERSION_u-boot-xlnx ?= "v2013.01%"
-
 require conf/machine/include/tune-zynq.inc
 require conf/machine/include/machine-xilinx-default.inc
 
@@ -21,7 +17,6 @@ UBOOT_MACHINE = "zynq_zed_config"
 SERIAL_CONSOLE = "115200 ttyPS0"
 
 MACHINE_DEVICETREE := " \
-                zedboard/zedboard-zynq7.dtsi \
-                zedboard/zedboard-zynq7-mmcblk0p2.dts \
-                zedboard/zedboard-zynq7-ram.dts \
+                zedboard/zedboard-zynq7-board.dtsi \
+                zedboard/zedboard-zynq7.dts \
                 "