commited newer files

conf/machine/elphel393.conf

@@ -4,10 +4,11 @@
 #              http://www.elphel.com/ 
 
 require conf/machine/include/tune-zynq.inc
+require conf/machine/include/machine-xilinx-default.inc
 
 # Corresponding from linux-xlnx and ezynq-u-boot
-PREFERRED_VERSION_ezynq-u-boot ?= "v2013.01%"
-PREFERRED_VERSION_linux-xlnx ?= "3.10%"
+PREFERRED_VERSION_ezynq-u-boot = "v2013.01%"
+PREFERRED_VERSION_linux-xlnx = "3.10%"
 
 # Zedboard machine definition known by ezynq and xilinx u-boot
 UBOOT_MACHINE = "elphel393_config"

conf/machine/include/machine-xilinx-default.inc

@@ -8,9 +8,16 @@ IMAGE_CLASSES += "image_types_uboot"
 # Kernel Configuration
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx"
 PREFERRED_VERSION_linux-xlnx ?= "3.10%"
+<<<<<<< HEAD
+
+# U-Boot Configuration
+#PREFERRED_PROVIDER_u-boot ?= "u-boot-xlnx"
+#PREFERRED_VERSION_u-boot-xlnx ?= "v2013.01%"
+=======
 PREFERRED_VERSION_linux-yocto ?= "3.8%"
 PREFERRED_VERSION_linux-yocto-tiny ?= "3.8%"
 
 # U-Boot Configuration
 PREFERRED_PROVIDER_u-boot ?= "u-boot-xlnx"
 PREFERRED_VERSION_u-boot-xlnx ?= "v2013.01%"
+>>>>>>> 772ca92533ec8b3afb28c43f9fc0df764372683f

conf/machine/include/tune-zynq.inc

@@ -20,7 +20,12 @@ KERNEL_IMAGETYPE ?= "uImage"
 KERNEL_EXTRA_ARGS_zynq += "UIMAGE_LOADADDR=0x8000"
 
 # File System Configuration
+<<<<<<< HEAD
+#IMAGE_FSTYPES ?= "cpio ext2 ext2.gz.u-boot ext2.gz"
+IMAGE_FSTYPES ?= "ext2.gz.u-boot"
+=======
 IMAGE_FSTYPES ?= "cpio ext2 ext2.gz.u-boot ext2.gz"
+>>>>>>> 772ca92533ec8b3afb28c43f9fc0df764372683f
 IMAGE_CLASSES += "image_types_uboot"
 
 # ezynq-u-boot Configuration

conf/machine/microzed.conf

@@ -5,6 +5,12 @@
 
 require conf/machine/include/tune-zynq.inc
 require conf/machine/include/machine-xilinx-default.inc
+<<<<<<< HEAD
+
+# Corresponding from linux-xlnx and ezynq-u-boot
+PREFERRED_VERSION_linux-xlnx = "3.10%"
+PREFERRED_VERSION_ezynq-u-boot = "v2013.01%"
+=======
 
 LINUX_VERSION = "3.10"
 
@@ -13,6 +19,7 @@ LINUX_VERSION = "3.10"
 PREFERRED_VERSION_ezynq-u-boot = "v2013.01%"
 PREFERRED_PROVIDER_virtual/kernel = "linux-xlnx"
 PREFERRED_VERSION_linux-xlnx = "3.10%"
+>>>>>>> 772ca92533ec8b3afb28c43f9fc0df764372683f
 
 # microzed machine definition known by ezynq and xilinx u-boot
 UBOOT_MACHINE = "zynq_microzed_config"

conf/machine/zc706.conf

@@ -4,10 +4,11 @@
 #              http://www.elphel.com/ 
 
 require conf/machine/include/tune-zynq.inc
+require conf/machine/include/machine-xilinx-default.inc
 
 # Corresponding from linux-xlnx and ezynq-u-boot
-PREFERRED_VERSION_ezynq-u-boot ?= "v2013.01%"
-PREFERRED_VERSION_linux-xlnx ?= "3.10%"
+PREFERRED_VERSION_ezynq-u-boot = "v2013.01%"
+PREFERRED_VERSION_linux-xlnx = "3.10%"
 
 # ZC706 machine definition known by ezynq and xilinx u-boot
 UBOOT_MACHINE = "zynq_zc706_config"

conf/machine/zedboard.conf

@@ -4,10 +4,11 @@
 #              http://www.elphel.com/ 
 
 require conf/machine/include/tune-zynq.inc
+require conf/machine/include/machine-xilinx-default.inc
 
 # Corresponding from linux-xlnx and ezynq-u-boot
-PREFERRED_VERSION_ezynq-u-boot ?= "v2013.01%"
-PREFERRED_VERSION_linux-xlnx ?= "3.10%"
+PREFERRED_VERSION_ezynq-u-boot = "v2013.01%"
+PREFERRED_VERSION_linux-xlnx = "3.10%"
 
 # Zedboard machine definition known by ezynq and xilinx u-boot
 UBOOT_MACHINE = "zynq_zed_config"

recipes-kernel/linux/linux-xlnx_3.10.bbappend

@@ -6,6 +6,11 @@ SRC_URI_append += " file://vsc3304.patch"
 
 # Kernel version and SRCREV correspond to: 
 # github.com/Xilinx/linux-xlnx.git xilinx-v14.7 tag 
+<<<<<<< HEAD
+SRCREV = "efc27505715e64526653f35274717c0fc56491e3"
+
+#FILESEXTRAPATHS_append := "${@get_additional_bbpath_filespath('conf/machine/boards:', d)}"
+=======
 LINUX_VERSION = "3.10"
 SRCREV = "efc27505715e64526653f35274717c0fc56491e3"
 
@@ -13,3 +18,4 @@ SRCREV = "efc27505715e64526653f35274717c0fc56491e3"
 #FILESEXTRAPATHS_append := "${@get_additional_bbpath_filespath('conf/machine/boards:', d)}"
 
 #OOT_KERNEL_DEVICETREE_append := "${@expand_dir_basepaths_by_extension("MACHINE_DEVICETREE", os.path.join(d.getVar("WORKDIR", True), 'devicetree'), '.dts', d)}"
+>>>>>>> 772ca92533ec8b3afb28c43f9fc0df764372683f