diff options
| author | Nathan Rossi <nathan.rossi@xilinx.com> | 2014-05-21 14:25:06 +1000 |
|---|---|---|
| committer | Nathan Rossi <nathan.rossi@xilinx.com> | 2014-05-21 14:26:24 +1000 |
| commit | 94b49db670a2a76a129ae9af787ae34ffefba008 (patch) | |
| tree | 06c6f07294dbe68d35baf0ddd82b3e451c86bfaa | |
| parent | 2389c23a7b52afcfddff0aeabdfe10167afb23b1 (diff) | |
| download | meta-xilinx-94b49db670a2a76a129ae9af787ae34ffefba008.tar.gz | |
machine-xilinx-default.inc: Update default versions
* Use the 3.14 kernel for both linux-xlnx and linux-yocto
* Use the 2014.01 u-boot
Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
| -rw-r--r-- | conf/machine/include/machine-xilinx-default.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/conf/machine/include/machine-xilinx-default.inc b/conf/machine/include/machine-xilinx-default.inc index cfe47043..d9bea42b 100644 --- a/conf/machine/include/machine-xilinx-default.inc +++ b/conf/machine/include/machine-xilinx-default.inc | |||
| @@ -6,13 +6,13 @@ IMAGE_CLASSES += "image_types_uboot" | |||
| 6 | 6 | ||
| 7 | # Kernel Configuration | 7 | # Kernel Configuration |
| 8 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx" | 8 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx" |
| 9 | PREFERRED_VERSION_linux-xlnx ?= "3.8%" | 9 | PREFERRED_VERSION_linux-xlnx ?= "3.14%" |
| 10 | PREFERRED_VERSION_linux-yocto ?= "3.10%" | 10 | PREFERRED_VERSION_linux-yocto ?= "3.14%" |
| 11 | 11 | ||
| 12 | # U-Boot Configuration | 12 | # U-Boot Configuration |
| 13 | PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx" | 13 | PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx" |
| 14 | PREFERRED_PROVIDER_u-boot ?= "u-boot-xlnx" | 14 | PREFERRED_PROVIDER_u-boot ?= "u-boot-xlnx" |
| 15 | PREFERRED_VERSION_u-boot-xlnx ?= "v2013.01%" | 15 | PREFERRED_VERSION_u-boot-xlnx ?= "v2014.01%" |
| 16 | 16 | ||
| 17 | # Architecture specific kernel configuration parts, defconfigs for Xilinx architectures | 17 | # Architecture specific kernel configuration parts, defconfigs for Xilinx architectures |
| 18 | MACHINE_KCONFIG_prepend += "common/linux/${SOC_FAMILY}/defconfig_${@'.'.join(d.getVar('LINUX_VERSION', True).split('.')[0:2]).strip('+')}.cfg " | 18 | MACHINE_KCONFIG_prepend += "common/linux/${SOC_FAMILY}/defconfig_${@'.'.join(d.getVar('LINUX_VERSION', True).split('.')[0:2]).strip('+')}.cfg " |