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:41 +0000 |
| commit | b3a187301054c02f00761ae10b4010403dd1cad3 (patch) | |
| tree | 521367ef2345d5c81b7e3d223672b65449ece073 | |
| parent | e4e3a328b67a133a2e864fe1e96d84994643d4d1 (diff) | |
| download | poky-b3a187301054c02f00761ae10b4010403dd1cad3.tar.gz | |
conf/machine: bump qemu preferred versions to 5.10
(From OE-Core rev: 804749e401bff95524e749dac5fca722e7047a2d)
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-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" | |||
| 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.8%" | 21 | PREFERRED_VERSION_linux-yocto ??= "5.10%" |
| 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 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" | |||
| 14 | QB_MACHINE = "-machine versatilepb" | 14 | QB_MACHINE = "-machine versatilepb" |
| 15 | QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty vmalloc=256" | 15 | QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty vmalloc=256" |
| 16 | QB_OPT_APPEND = "-usb -device usb-tablet" | 16 | QB_OPT_APPEND = "-usb -device usb-tablet" |
| 17 | PREFERRED_VERSION_linux-yocto ??= "5.8%" | 17 | PREFERRED_VERSION_linux-yocto ??= "5.10%" |
| 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" |