summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2023-07-09 23:20:24 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-08-16 07:49:17 +0100
commitad9b04b0518078eb0e76860665e4b02edc2c0dd2 (patch)
tree13180315e9cbacc2e301261f4cc8414b5962759e /meta/conf/machine
parent05affd7d0d143d6fa5c6aff0d40c5d9e046f4b0c (diff)
downloadpoky-ad9b04b0518078eb0e76860665e4b02edc2c0dd2.tar.gz
conf/machine: set preferred kernel to be 6.4
(From OE-Core rev: b544e62827d2a3606fbc886ea520256c948e197c) (From OE-Core rev: 505ea7fe653d4c61f348e737c409d43bb490ee4f) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine')
-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 c3cc0dbff6..050c20af70 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 ??= "6.1%" 21PREFERRED_VERSION_linux-yocto ??= "6.4%"
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 ef1b4ece23..deb4869c0a 100644
--- a/meta/conf/machine/qemuarmv5.conf
+++ b/meta/conf/machine/qemuarmv5.conf
@@ -16,5 +16,5 @@ QB_GRAPHICS = "-device virtio-gpu-pci"
16QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd" 16QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd"
17QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" 17QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}"
18 18
19PREFERRED_VERSION_linux-yocto ??= "6.1%" 19PREFERRED_VERSION_linux-yocto ??= "6.4%"
20KMACHINE:qemuarmv5 = "arm-versatile-926ejs" 20KMACHINE:qemuarmv5 = "arm-versatile-926ejs"