summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2022-01-11 12:59:58 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-01-12 21:09:01 +0000
commit51c1d248053be1b1031bd61a5983e14e95b62930 (patch)
treee3e06569e576935d5e17c7dda680f125c1b29b13
parentd9e0a6b999d0e3975ad8467fc028f69e077613bc (diff)
downloadpoky-51c1d248053be1b1031bd61a5983e14e95b62930.tar.gz
conf/machine: bump qemu preferred versions to 5.15
5.14 has been removed from the active kernel list, so we make 5.15 the new default. (From OE-Core rev: 24fb6a22332f746e3bef89ff8e5719838f0ed8b5) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 44e4b4ec46..e76251ea2b 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.14%" 21PREFERRED_VERSION_linux-yocto ??= "5.15%"
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 3c2c4997b9..2dad504c99 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.14%" 18PREFERRED_VERSION_linux-yocto ??= "5.15%"
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"