1. Clean up 2. Fixed confs pointing to wrong inc files

conf/machine/elphel393.conf

@@ -3,8 +3,8 @@
 #@DESCRIPTION: Machine support for elphel393.
 #              http://www.elphel.com/ 
 
-require conf/machine/include/tune-zynq.inc
-require conf/machine/include/machine-xilinx-default.inc
+require include/tune-zynq.inc
+require include/machine-xilinx-default.inc
 
 # Corresponding from linux-xlnx and ezynq-u-boot
 PREFERRED_VERSION_ezynq-u-boot = "v2013.01%"

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

 # Default Xilinx BSP Machine settings
 
 # File System Configuration
-IMAGE_FSTYPES ?= "cpio tar.gz ext2 ext2.gz.u-boot ext2.gz"
+# IMAGE_FSTYPES ?= "cpio tar.gz ext2 ext2.gz.u-boot ext2.gz"
+IMAGE_FSTYPES ?= "ext2.gz.u-boot ext2"
 IMAGE_CLASSES += "image_types_uboot"
 
 # Kernel Configuration
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx"
 PREFERRED_VERSION_linux-xlnx ?= "3.10%"
-#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%"
+PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ezynq"
+PREFERRED_PROVIDER_u-boot ?= "u-boot-ezynq"
+PREFERRED_VERSION_u-boot-ezynq ?= "v2013.0%"

conf/machine/microzed.conf

@@ -3,15 +3,10 @@
 #@DESCRIPTION: Machine support for microzed.
 #              http://www.elphel.com/ 
 
-# Corresponding from linux-xlnx and ezynq-u-boot
-PREFERRED_VERSION_linux-xlnx = "3.10%"
-PREFERRED_VERSION_ezynq-u-boot = "v2013.01%"
-IMAGE_FSTYPES = "ext2.gz.u-boot ext2"
+require include/tune-zynq.inc
+require include/machine-xilinx-default.inc
 
-require conf/machine/include/tune-zynq.inc
-require conf/machine/include/machine-xilinx-default.inc
-
-# microzed machine definition known by ezynq and xilinx u-boot
+# microzed machine definition known by ezynq and probably xilinx u-boot
 UBOOT_MACHINE = "zynq_microzed_config"
 
 SERIAL_CONSOLE = "115200 ttyPS0"

conf/machine/zc706.conf

@@ -3,8 +3,8 @@
 #@DESCRIPTION: Machine support for zc706.
 #              http://www.elphel.com/ 
 
-require conf/machine/include/tune-zynq.inc
-require conf/machine/include/machine-xilinx-default.inc
+require include/tune-zynq.inc
+require include/machine-xilinx-default.inc
 
 # Corresponding from linux-xlnx and ezynq-u-boot
 PREFERRED_VERSION_ezynq-u-boot = "v2013.01%"

conf/machine/zedboard.conf

@@ -3,8 +3,8 @@
 #@DESCRIPTION: Machine support for zedboard.
 #              http://www.elphel.com/ 
 
-require conf/machine/include/tune-zynq.inc
-require conf/machine/include/machine-xilinx-default.inc
+require include/tune-zynq.inc
+require include/machine-xilinx-default.inc
 
 # Corresponding from linux-xlnx and ezynq-u-boot
 PREFERRED_VERSION_ezynq-u-boot = "v2013.01%"

recipes-core/images/core-image-elphel393.bb

@@ -3,7 +3,7 @@ DESCRIPTION = "Elphel NC 393 image (based on core-image-minimal)."
 IMAGE_INSTALL = "packagegroup-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL}"
 
 # remove not needed ipkg informations
-IMAGE_INSTALL_append = "ezynq-u-boot"
+IMAGE_INSTALL_append = "u-boot-ezynq"
 IMAGE_INSTALL_append += " python-core \
                          htop \
                          i2c-tools \

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

@@ -7,4 +7,3 @@ SRC_URI_append += " file://vsc3304.patch"
 # Kernel version and SRCREV correspond to: 
 # github.com/Xilinx/linux-xlnx.git xilinx-v14.7 tag 
 SRCREV = "efc27505715e64526653f35274717c0fc56491e3"
-LINUX_VERSION = "3.10"