Commit 7a802596 authored by Oleg Dzhimiev's avatar Oleg Dzhimiev

fixed failed merge

parent 1a4c9f8f
......@@ -13,11 +13,3 @@ PREFERRED_VERSION_linux-xlnx ?= "3.10%"
# 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
......@@ -20,12 +20,9 @@ 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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment