Refactor zedboard machine. Move commone items into tune-zynq include file.

Signed-off-by: Sipke Vriend <sipke.vriend@xilinx.com>

3 files changed, 20 insertions, 13 deletions

diff --git a/conf/machine/include/tune-zynq.inc b/conf/machine/include/tune-zynq.inc
new file mode 100644
index 00000000..da75b698
--- /dev/null
+++ b/conf/machine/include/tune-zynq.inc
@@ -0,0 +1,15 @@
+

+MACHINE_FEATURES := ""

+

+require conf/machine/include/tune-cortexa9.inc

+

+PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx"

+PREFERRED_VERSION_linux-xlnx ?= "3.8%"

+

+KERNEL_IMAGETYPE = "uImage"

+

+IMAGE_FSTYPES = "cpio ext2"

+

+PREFERRED_PROVIDER_u-boot ?= "u-boot-xlnx"

+

+PREFERRED_VERSION_u-boot-xlnx ?= "v2013.01%"

diff --git a/meta-zedboard/conf/machine/zedboard.conf b/meta-zedboard/conf/machine/zedboard.conf
index 9f044605..301b055f 100644
--- a/meta-zedboard/conf/machine/zedboard.conf
+++ b/meta-zedboard/conf/machine/zedboard.conf
@@ -3,21 +3,13 @@
 #@DESCRIPTION: Machine support for zedboard.
 #              http://www.zedboard.org/ 
 
-MACHINE_FEATURES := ""
-
-require conf/machine/include/tune-cortexa9.inc
-
-# Consolidate these to common include?
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx"
+# Versions corresponding to zedboard documentation
 PREFERRED_VERSION_linux-xlnx ?= "3.6%"
+PREFERRED_VERSION_u-boot-xlnx ?= "v2012.10%"
 
-KERNEL_IMAGETYPE = "uImage"
-
-IMAGE_FSTYPES = "cpio ext2"
-
-PREFERRED_PROVIDER_u-boot ?= "u-boot-xlnx"
+require conf/machine/include/tune-zynq.inc
 
-PREFERRED_VERSION_u-boot-xlnx ?= "v2012.10%"
+# Zedboard machine definition known by Xilinx UBOOT
 UBOOT_MACHINE = "zynq_zed_config"
 
 SERIAL_CONSOLE = "115200 ttyPS0"
diff --git a/meta-zedboard/recipes-kernel/linux/linux-xlnx.inc b/meta-zedboard/recipes-kernel/linux/linux-xlnx.inc
index cf5d53be..5ecc153f 100644
--- a/meta-zedboard/recipes-kernel/linux/linux-xlnx.inc
+++ b/meta-zedboard/recipes-kernel/linux/linux-xlnx.inc
@@ -5,6 +5,6 @@
 #SRC_URI_append_zedboard += "file://zedboard.dts"
 #KERNEL_DEVICETREE_zedboard = "${WORKDIR}/zedboard.dts"
 
-KERNEL_DEVICETREE_zedboard = "${S}/arch/arm/boot/dts/zedboard.dts"
+KERNEL_DEVICETREE_zedboard = "${S}/arch/arm/boot/dts/zynq-zed.dts"
 
 COMPATIBLE_MACHINE_zedboard = "zedboard"