diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-12-17 15:37:35 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-05 13:48:06 +0000 |
commit | 804749e401bff95524e749dac5fca722e7047a2d (patch) | |
tree | 91327dd273f310be7bf554766f99423ca609778c | |
parent | b58d9eaac1b6aa2cb1f5e575680a37f55bebdcf1 (diff) | |
download | openembedded-core-contrib-804749e401bff95524e749dac5fca722e7047a2d.tar.gz |
conf/machine: bump qemu preferred versions to 5.10
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-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 a3169b7405..ef6690b0b9 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" # kernel-related variables # PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" -PREFERRED_VERSION_linux-yocto ??= "5.8%" +PREFERRED_VERSION_linux-yocto ??= "5.10%" # # XSERVER subcomponents, used to build the XSERVER variable diff --git a/meta/conf/machine/qemuarmv5.conf b/meta/conf/machine/qemuarmv5.conf index 89328977b0..dfe2a89573 100644 --- a/meta/conf/machine/qemuarmv5.conf +++ b/meta/conf/machine/qemuarmv5.conf @@ -14,7 +14,7 @@ QB_SYSTEM_NAME = "qemu-system-arm" QB_MACHINE = "-machine versatilepb" QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty vmalloc=256" QB_OPT_APPEND = "-usb -device usb-tablet" -PREFERRED_VERSION_linux-yocto ??= "5.8%" +PREFERRED_VERSION_linux-yocto ??= "5.10%" QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" KMACHINE_qemuarmv5 = "qemuarm" |