diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2021-08-15 11:08:58 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-18 17:01:06 +0100 |
commit | 5d0464b17ff93beb70c6b56c83b7347f9326d2d0 (patch) | |
tree | ff67d17ea15430674fbfc8aadf3725b1054eee32 /meta | |
parent | 1ce72e983c2b0c5509289388a93a139eb0eec1a9 (diff) | |
download | poky-5d0464b17ff93beb70c6b56c83b7347f9326d2d0.tar.gz |
conf/machine: bump qemu preferred versions to 5.13
5.13 is the latest reference kernel, so let's make it the
default.
(From OE-Core rev: a7ebb5053a5dd7d0989a15cc4dee7116d3ef0948)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/conf/machine/include/x86-base.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/qemuarmv5.conf | 2 |
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 ef6690b0b9..958b3490e8 100644 --- a/meta/conf/machine/include/x86-base.inc +++ b/meta/conf/machine/include/x86-base.inc | |||
@@ -18,7 +18,7 @@ SERIAL_CONSOLES ?= "115200;ttyS0" | |||
18 | # kernel-related variables | 18 | # kernel-related variables |
19 | # | 19 | # |
20 | PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" | 20 | PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" |
21 | PREFERRED_VERSION_linux-yocto ??= "5.10%" | 21 | PREFERRED_VERSION_linux-yocto ??= "5.13%" |
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 7650c2f4a2..b0dc1022fa 100644 --- a/meta/conf/machine/qemuarmv5.conf +++ b/meta/conf/machine/qemuarmv5.conf | |||
@@ -14,7 +14,7 @@ QB_SYSTEM_NAME = "qemu-system-arm" | |||
14 | QB_MACHINE = "-machine versatilepb" | 14 | QB_MACHINE = "-machine versatilepb" |
15 | QB_KERNEL_CMDLINE_APPEND = "vmalloc=256" | 15 | QB_KERNEL_CMDLINE_APPEND = "vmalloc=256" |
16 | QB_OPT_APPEND = "-usb -device usb-tablet" | 16 | QB_OPT_APPEND = "-usb -device usb-tablet" |
17 | PREFERRED_VERSION_linux-yocto ??= "5.10%" | 17 | PREFERRED_VERSION_linux-yocto ??= "5.13%" |
18 | QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" | 18 | QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" |
19 | 19 | ||
20 | KMACHINE:qemuarmv5 = "qemuarm" | 20 | KMACHINE:qemuarmv5 = "qemuarm" |