machine/zedboard-zynq7: Fixed to use updated naming convention

* Added machine documentation, reference material and links

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

5 files changed, 32 insertions, 26 deletions

diff --git a/conf/machine/boards/zedboard/zynq7-zedboard-mmcblkc0p2.dts b/conf/machine/boards/zedboard/zedboard-zynq7-mmcblk0p2.dts
index ef0c1014..305acf7d 100644
--- a/conf/machine/boards/zedboard/zynq7-zedboard-mmcblkc0p2.dts
+++ b/conf/machine/boards/zedboard/zedboard-zynq7-mmcblk0p2.dts
@@ -3,7 +3,7 @@
  */
 
 /dts-v1/;
-/include/ "zynq7-zedboard.dtsi"
+/include/ "zedboard-zynq7.dtsi"
 / {
         chosen {
                 bootargs = "console=ttyPS0,115200 root=/dev/mmcblk0p2 ro earlyprintk";
diff --git a/conf/machine/boards/zedboard/zynq7-zedboard-ram.dts b/conf/machine/boards/zedboard/zedboard-zynq7-ram.dts
index c2556a3d..8c91db45 100644
--- a/conf/machine/boards/zedboard/zynq7-zedboard-ram.dts
+++ b/conf/machine/boards/zedboard/zedboard-zynq7-ram.dts
@@ -3,7 +3,7 @@
  */
 
 /dts-v1/;
-/include/ "zynq7-zedboard.dtsi"
+/include/ "zedboard-zynq7.dtsi"
 / {
         chosen {
                 bootargs = "console=ttyPS0,115200 root=/dev/ram rw earlyprintk";
diff --git a/conf/machine/boards/zedboard/zynq7-zedboard.dtsi b/conf/machine/boards/zedboard/zedboard-zynq7.dtsi
index 3f3d67ac..3f3d67ac 100644
--- a/conf/machine/boards/zedboard/zynq7-zedboard.dtsi
+++ b/conf/machine/boards/zedboard/zedboard-zynq7.dtsi
diff --git a/conf/machine/zedboard-zynq7.conf b/conf/machine/zedboard-zynq7.conf
new file mode 100644
index 00000000..94c853c1
--- /dev/null
+++ b/conf/machine/zedboard-zynq7.conf
@@ -0,0 +1,30 @@
+#@TYPE: Machine
+#@NAME: zedboard-zynq7
+#@DESCRIPTION: Machine support for ZedBoard. (http://www.zedboard.org/)
+#
+# For details on the Evaluation board:
+#     http://www.zedboard.org/content/overview
+# For design files (including 'zynq_fsbl_0.elf') for the ZedBoard:
+#     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
+
+# Zedboard machine definition known by Xilinx UBOOT
+UBOOT_MACHINE = "zynq_zed_config"
+
+SERIAL_CONSOLE = "115200 ttyPS0"
+
+MACHINE_DEVICETREE := " \
+                ${XILINX_BOARDDIR}/zedboard/zedboard-zynq7.dtsi \
+                ${XILINX_BOARDDIR}/zedboard/zedboard-zynq7-mmcblk0p2.dts \
+                ${XILINX_BOARDDIR}/zedboard/zedboard-zynq7-ram.dts \
+                "
+MACHINE_KCONFIG := " \
+                ${XILINX_BOARDDIR}/common/xilinx_zynq_defconfig_${LINUX_VERSION}.cfg \
+                ${XILINX_BOARDDIR}/common/nortc.cfg \
+                "
diff --git a/conf/machine/zynq7-zedboard.conf b/conf/machine/zynq7-zedboard.conf
deleted file mode 100644
index d919d758..00000000
--- a/conf/machine/zynq7-zedboard.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-#@TYPE: Machine
-#@NAME: zynq7-zedboard
-#@DESCRIPTION: Machine support for zedboard. (http://www.zedboard.org/)
-
-# 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
-
-# Zedboard machine definition known by Xilinx UBOOT
-UBOOT_MACHINE = "zynq_zed_config"
-
-SERIAL_CONSOLE = "115200 ttyPS0"
-
-MACHINE_DEVICETREE := " \
-                ${XILINX_BOARDDIR}/zedboard/zynq7-zedboard.dtsi \
-                ${XILINX_BOARDDIR}/zedboard/zynq7-zedboard-mmcblkc0p2.dts \
-                ${XILINX_BOARDDIR}/zedboard/zynq7-zedboard-ram.dts \
-                "
-MACHINE_KCONFIG := " \
-                ${XILINX_BOARDDIR}/common/xilinx_zynq_defconfig_${LINUX_VERSION}.cfg \
-                ${XILINX_BOARDDIR}/common/nortc.cfg \
-                "