zc706-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, 13 insertions, 31 deletions

diff --git a/conf/machine/boards/zc706/zc706-zynq7.dtsi b/conf/machine/boards/zc706/zc706-zynq7-board.dtsi
index 4051e4f3..ff473e1b 100644
--- a/conf/machine/boards/zc706/zc706-zynq7.dtsi
+++ b/conf/machine/boards/zc706/zc706-zynq7-board.dtsi
@@ -1,8 +1,12 @@
+/*
+ * ZC706 DTS file header for generic boot.
+ */
+
 /include/ "zynq-7-base.dtsi"
 / {
         model = "Xilinx ZC706";
         chosen {
-                bootargs = "console=ttyPS0,115200 earlyprintk";
+                bootargs = "console=ttyPS0,115200 earlyprintk root=/dev/ram rw";
                 linux,stdout-path = "/amba@0/serial@e0001000";
         } ;
         ps7_ddr_0: memory@0 {
diff --git a/conf/machine/boards/zc706/zc706-zynq7-mmcblk0p2.dts b/conf/machine/boards/zc706/zc706-zynq7-mmcblk0p2.dts
deleted file mode 100644
index 57f51658..00000000
--- a/conf/machine/boards/zc706/zc706-zynq7-mmcblk0p2.dts
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * ZC706 DTS file header for sdcard/mmc partition 2 boot.
- */
-
-/dts-v1/;
-/include/ "zc706-zynq7.dtsi"
-/ {
-        chosen {
-                bootargs = "console=ttyPS0,115200 root=/dev/mmcblk0p2 ro earlyprintk";
-        } ;
-} ;
diff --git a/conf/machine/boards/zc706/zc706-zynq7-ram.dts b/conf/machine/boards/zc706/zc706-zynq7-ram.dts
deleted file mode 100644
index 70bb5fd3..00000000
--- a/conf/machine/boards/zc706/zc706-zynq7-ram.dts
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * ZC706 DTS file header for ramdisk boot.
- */
-
-/dts-v1/;
-/include/ "zc706-zynq7.dtsi"
-/ {
-        chosen {
-                bootargs = "console=ttyPS0,115200 root=/dev/ram rw earlyprintk";
-                linux,stdout-path = "/amba@0/serial@e0001000";
-        } ;
-} ;
diff --git a/conf/machine/boards/zc706/zc706-zynq7.dts b/conf/machine/boards/zc706/zc706-zynq7.dts
new file mode 100644
index 00000000..8d0ee781
--- /dev/null
+++ b/conf/machine/boards/zc706/zc706-zynq7.dts
@@ -0,0 +1,4 @@
+/dts-v1/;
+/include/ "zc706-zynq7-board.dtsi"
+/ {
+} ;
\ No newline at end of file
diff --git a/conf/machine/zc706-zynq7.conf b/conf/machine/zc706-zynq7.conf
index 31cd2d95..eabc319a 100644
--- a/conf/machine/zc706-zynq7.conf
+++ b/conf/machine/zc706-zynq7.conf
@@ -9,9 +9,6 @@
 # For the FSBL 'zynq_fsbl_0.elf' refer to UG873 and the associated design files.
 #
 
-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
 
@@ -20,7 +17,7 @@ UBOOT_MACHINE = "zynq_zc70x_config"
 
 SERIAL_CONSOLE = "115200 ttyPS0"
 
-MACHINE_DEVICETREE := "zc706/zc706-zynq7.dtsi \
-                       zc706/zc706-zynq7-ram.dts \
-                       zc706/zc706-zynq7-mmcblk0p2.dts"
-MACHINE_KCONFIG := "common/rtc.cfg"
+MACHINE_DEVICETREE := " \
+                zc706/zc706-zynq7-board.dtsi \
+                zc706/zc706-zynq7.dts \
+                "