summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2021-09-22 17:53:52 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-09-24 09:15:28 (GMT)
commitc744decea1ab83c7ba36091c593967bd041e363c (patch)
treea95dc13a59cf7cc749db9d49b9bf44df28c7136d /meta/conf
parent99fcf4832709434451c458cbb5d736dc2e5c18c7 (diff)
downloadpoky-c744decea1ab83c7ba36091c593967bd041e363c.tar.gz
conf/machine: bump qemu preferred versions to 5.14
5.14 is the latest reference kernel, so let's make it the default. (From OE-Core rev: af19c44c4af68568de2ddb5c11d8ad34ac600522) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/machine/include/x86/x86-base.inc2
-rw-r--r--meta/conf/machine/qemuarmv5.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/machine/include/x86/x86-base.inc b/meta/conf/machine/include/x86/x86-base.inc
index 958b349..44e4b4e 100644
--- a/meta/conf/machine/include/x86/x86-base.inc
+++ b/meta/conf/machine/include/x86/x86-base.inc
@@ -18,7 +18,7 @@ SERIAL_CONSOLES ?= "115200;ttyS0"
18# kernel-related variables 18# kernel-related variables
19# 19#
20PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" 20PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto"
21PREFERRED_VERSION_linux-yocto ??= "5.13%" 21PREFERRED_VERSION_linux-yocto ??= "5.14%"
22 22
23# 23#
24# XSERVER subcomponents, used to build the XSERVER variable 24# XSERVER subcomponents, used to build the XSERVER variable
diff --git a/meta/conf/machine/qemuarmv5.conf b/meta/conf/machine/qemuarmv5.conf
index 252d628..3c2c499 100644
--- a/meta/conf/machine/qemuarmv5.conf
+++ b/meta/conf/machine/qemuarmv5.conf
@@ -15,7 +15,7 @@ QB_MACHINE = "-machine versatilepb"
15QB_KERNEL_CMDLINE_APPEND = "vmalloc=256" 15QB_KERNEL_CMDLINE_APPEND = "vmalloc=256"
16QB_GRAPHICS = "-device virtio-gpu-pci" 16QB_GRAPHICS = "-device virtio-gpu-pci"
17QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd" 17QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd"
18PREFERRED_VERSION_linux-yocto ??= "5.13%" 18PREFERRED_VERSION_linux-yocto ??= "5.14%"
19QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" 19QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}"
20 20
21KMACHINE:qemuarmv5 = "qemuarm" 21KMACHINE:qemuarmv5 = "qemuarm"