diff options
| -rw-r--r-- | meta/conf/machine/include/x86-base.inc | 2 | ||||
| -rw-r--r-- | meta/conf/machine/qemuarm64.conf | 2 | ||||
| -rw-r--r-- | meta/conf/machine/qemuarmv5.conf | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/meta/conf/machine/include/x86-base.inc b/meta/conf/machine/include/x86-base.inc index c29279209b..686f938233 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 ??= "4.18%" | 21 | PREFERRED_VERSION_linux-yocto ??= "5.0%" |
| 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/qemuarm64.conf b/meta/conf/machine/qemuarm64.conf index 6919e555a8..22f6cb742b 100644 --- a/meta/conf/machine/qemuarm64.conf +++ b/meta/conf/machine/qemuarm64.conf | |||
| @@ -29,5 +29,3 @@ QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=none,format=raw -device virtio | |||
| 29 | # Virtio serial console | 29 | # Virtio serial console |
| 30 | QB_SERIAL_OPT = "-device virtio-serial-device -chardev null,id=virtcon -device virtconsole,chardev=virtcon" | 30 | QB_SERIAL_OPT = "-device virtio-serial-device -chardev null,id=virtcon -device virtconsole,chardev=virtcon" |
| 31 | QB_TCPSERIAL_OPT = "-device virtio-serial-device -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1 -device virtconsole,chardev=virtcon" | 31 | QB_TCPSERIAL_OPT = "-device virtio-serial-device -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1 -device virtconsole,chardev=virtcon" |
| 32 | |||
| 33 | PREFERRED_VERSION_linux-yocto ?= "4.19%" | ||
diff --git a/meta/conf/machine/qemuarmv5.conf b/meta/conf/machine/qemuarmv5.conf index 5f90accc24..e3948a25da 100644 --- a/meta/conf/machine/qemuarmv5.conf +++ b/meta/conf/machine/qemuarmv5.conf | |||
| @@ -17,7 +17,7 @@ QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty" | |||
| 17 | QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" | 17 | QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" |
| 18 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy | 18 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy |
| 19 | QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" | 19 | QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" |
| 20 | PREFERRED_VERSION_linux-yocto ??= "4.18%" | 20 | PREFERRED_VERSION_linux-yocto ??= "5.0%" |
| 21 | QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" | 21 | QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" |
| 22 | 22 | ||
| 23 | KMACHINE_qemuarmv5 = "qemuarm" \ No newline at end of file | 23 | KMACHINE_qemuarmv5 = "qemuarm" \ No newline at end of file |
