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

commited newer files

parent 772ca925
...@@ -4,10 +4,11 @@ ...@@ -4,10 +4,11 @@
# http://www.elphel.com/ # http://www.elphel.com/
require conf/machine/include/tune-zynq.inc require conf/machine/include/tune-zynq.inc
require conf/machine/include/machine-xilinx-default.inc
# Corresponding from linux-xlnx and ezynq-u-boot # Corresponding from linux-xlnx and ezynq-u-boot
PREFERRED_VERSION_ezynq-u-boot ?= "v2013.01%" PREFERRED_VERSION_ezynq-u-boot = "v2013.01%"
PREFERRED_VERSION_linux-xlnx ?= "3.10%" PREFERRED_VERSION_linux-xlnx = "3.10%"
# Zedboard machine definition known by ezynq and xilinx u-boot # Zedboard machine definition known by ezynq and xilinx u-boot
UBOOT_MACHINE = "elphel393_config" UBOOT_MACHINE = "elphel393_config"
......
...@@ -8,9 +8,16 @@ IMAGE_CLASSES += "image_types_uboot" ...@@ -8,9 +8,16 @@ IMAGE_CLASSES += "image_types_uboot"
# Kernel Configuration # Kernel Configuration
PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx" PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx"
PREFERRED_VERSION_linux-xlnx ?= "3.10%" 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 ?= "3.8%"
PREFERRED_VERSION_linux-yocto-tiny ?= "3.8%" PREFERRED_VERSION_linux-yocto-tiny ?= "3.8%"
# U-Boot Configuration # U-Boot Configuration
PREFERRED_PROVIDER_u-boot ?= "u-boot-xlnx" PREFERRED_PROVIDER_u-boot ?= "u-boot-xlnx"
PREFERRED_VERSION_u-boot-xlnx ?= "v2013.01%" PREFERRED_VERSION_u-boot-xlnx ?= "v2013.01%"
>>>>>>> 772ca92533ec8b3afb28c43f9fc0df764372683f
...@@ -20,7 +20,12 @@ KERNEL_IMAGETYPE ?= "uImage" ...@@ -20,7 +20,12 @@ KERNEL_IMAGETYPE ?= "uImage"
KERNEL_EXTRA_ARGS_zynq += "UIMAGE_LOADADDR=0x8000" KERNEL_EXTRA_ARGS_zynq += "UIMAGE_LOADADDR=0x8000"
# File System Configuration # 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" IMAGE_FSTYPES ?= "cpio ext2 ext2.gz.u-boot ext2.gz"
>>>>>>> 772ca92533ec8b3afb28c43f9fc0df764372683f
IMAGE_CLASSES += "image_types_uboot" IMAGE_CLASSES += "image_types_uboot"
# ezynq-u-boot Configuration # ezynq-u-boot Configuration
......
...@@ -5,6 +5,12 @@ ...@@ -5,6 +5,12 @@
require conf/machine/include/tune-zynq.inc require conf/machine/include/tune-zynq.inc
require conf/machine/include/machine-xilinx-default.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" LINUX_VERSION = "3.10"
...@@ -13,6 +19,7 @@ LINUX_VERSION = "3.10" ...@@ -13,6 +19,7 @@ LINUX_VERSION = "3.10"
PREFERRED_VERSION_ezynq-u-boot = "v2013.01%" PREFERRED_VERSION_ezynq-u-boot = "v2013.01%"
PREFERRED_PROVIDER_virtual/kernel = "linux-xlnx" PREFERRED_PROVIDER_virtual/kernel = "linux-xlnx"
PREFERRED_VERSION_linux-xlnx = "3.10%" PREFERRED_VERSION_linux-xlnx = "3.10%"
>>>>>>> 772ca92533ec8b3afb28c43f9fc0df764372683f
# microzed machine definition known by ezynq and xilinx u-boot # microzed machine definition known by ezynq and xilinx u-boot
UBOOT_MACHINE = "zynq_microzed_config" UBOOT_MACHINE = "zynq_microzed_config"
......
...@@ -4,10 +4,11 @@ ...@@ -4,10 +4,11 @@
# http://www.elphel.com/ # http://www.elphel.com/
require conf/machine/include/tune-zynq.inc require conf/machine/include/tune-zynq.inc
require conf/machine/include/machine-xilinx-default.inc
# Corresponding from linux-xlnx and ezynq-u-boot # Corresponding from linux-xlnx and ezynq-u-boot
PREFERRED_VERSION_ezynq-u-boot ?= "v2013.01%" PREFERRED_VERSION_ezynq-u-boot = "v2013.01%"
PREFERRED_VERSION_linux-xlnx ?= "3.10%" PREFERRED_VERSION_linux-xlnx = "3.10%"
# ZC706 machine definition known by ezynq and xilinx u-boot # ZC706 machine definition known by ezynq and xilinx u-boot
UBOOT_MACHINE = "zynq_zc706_config" UBOOT_MACHINE = "zynq_zc706_config"
......
...@@ -4,10 +4,11 @@ ...@@ -4,10 +4,11 @@
# http://www.elphel.com/ # http://www.elphel.com/
require conf/machine/include/tune-zynq.inc require conf/machine/include/tune-zynq.inc
require conf/machine/include/machine-xilinx-default.inc
# Corresponding from linux-xlnx and ezynq-u-boot # Corresponding from linux-xlnx and ezynq-u-boot
PREFERRED_VERSION_ezynq-u-boot ?= "v2013.01%" PREFERRED_VERSION_ezynq-u-boot = "v2013.01%"
PREFERRED_VERSION_linux-xlnx ?= "3.10%" PREFERRED_VERSION_linux-xlnx = "3.10%"
# Zedboard machine definition known by ezynq and xilinx u-boot # Zedboard machine definition known by ezynq and xilinx u-boot
UBOOT_MACHINE = "zynq_zed_config" UBOOT_MACHINE = "zynq_zed_config"
......
...@@ -6,6 +6,11 @@ SRC_URI_append += " file://vsc3304.patch" ...@@ -6,6 +6,11 @@ SRC_URI_append += " file://vsc3304.patch"
# Kernel version and SRCREV correspond to: # Kernel version and SRCREV correspond to:
# github.com/Xilinx/linux-xlnx.git xilinx-v14.7 tag # 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" LINUX_VERSION = "3.10"
SRCREV = "efc27505715e64526653f35274717c0fc56491e3" SRCREV = "efc27505715e64526653f35274717c0fc56491e3"
...@@ -13,3 +18,4 @@ SRCREV = "efc27505715e64526653f35274717c0fc56491e3" ...@@ -13,3 +18,4 @@ SRCREV = "efc27505715e64526653f35274717c0fc56491e3"
#FILESEXTRAPATHS_append := "${@get_additional_bbpath_filespath('conf/machine/boards:', d)}" #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)}" #OOT_KERNEL_DEVICETREE_append := "${@expand_dir_basepaths_by_extension("MACHINE_DEVICETREE", os.path.join(d.getVar("WORKDIR", True), 'devicetree'), '.dts', d)}"
>>>>>>> 772ca92533ec8b3afb28c43f9fc0df764372683f
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