summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/machine/include/x86-base.inc2
-rw-r--r--meta/conf/machine/qemuarm.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/machine/include/x86-base.inc b/meta/conf/machine/include/x86-base.inc
index 40d59577fd..7365953ca8 100644
--- a/meta/conf/machine/include/x86-base.inc
+++ b/meta/conf/machine/include/x86-base.inc
@@ -20,7 +20,7 @@ SERIAL_CONSOLE ?= "115200 ttyS0"
20# kernel-related variables 20# kernel-related variables
21# 21#
22PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" 22PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto"
23PREFERRED_VERSION_linux-yocto ??= "4.8%" 23PREFERRED_VERSION_linux-yocto ??= "4.10%"
24 24
25# 25#
26# XSERVER subcomponents, used to build the XSERVER variable 26# XSERVER subcomponents, used to build the XSERVER variable
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
index f9d6dd7e36..6b875e415c 100644
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/conf/machine/qemuarm.conf
@@ -16,5 +16,5 @@ QB_MACHINE = "-machine versatilepb"
16QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty" 16QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty"
17# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy 17# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
18QB_OPT_APPEND = "-show-cursor -usb -usbdevice tablet -device virtio-rng-pci" 18QB_OPT_APPEND = "-show-cursor -usb -usbdevice tablet -device virtio-rng-pci"
19PREFERRED_VERSION_linux-yocto ??= "4.8%" 19PREFERRED_VERSION_linux-yocto ??= "4.10%"
20QB_DTB = "${@base_version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" 20QB_DTB = "${@base_version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}"