summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
Diffstat (limited to 'meta/conf')
-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 bc0c27b73e..023eb5ecca 100644
--- a/meta/conf/machine/include/x86-base.inc
+++ b/meta/conf/machine/include/x86-base.inc
@@ -21,7 +21,7 @@ SERIAL_CONSOLE ?= "115200 ttyS0"
21# kernel-related variables 21# kernel-related variables
22# 22#
23PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" 23PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto"
24PREFERRED_VERSION_linux-yocto ??= "4.10%" 24PREFERRED_VERSION_linux-yocto ??= "4.12%"
25 25
26# 26#
27# XSERVER subcomponents, used to build the XSERVER variable 27# XSERVER subcomponents, used to build the XSERVER variable
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
index 1f0a65f291..c8932ddc59 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 -device usb-tablet -device virtio-rng-pci" 18QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet -device virtio-rng-pci"
19PREFERRED_VERSION_linux-yocto ??= "4.10%" 19PREFERRED_VERSION_linux-yocto ??= "4.12%"
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)}"