diff options
-rw-r--r-- | meta/conf/machine/include/x86-base.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/qemuarm.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 06de778b5b..c29279209b 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.15%" | 21 | PREFERRED_VERSION_linux-yocto ??= "4.18%" |
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/qemuarm.conf b/meta/conf/machine/qemuarm.conf index 9403b1e7e3..d2f2c85c3f 100644 --- a/meta/conf/machine/qemuarm.conf +++ b/meta/conf/machine/qemuarm.conf | |||
@@ -16,5 +16,5 @@ QB_MACHINE = "-machine versatilepb" | |||
16 | QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty" | 16 | QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty" |
17 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy | 17 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy |
18 | QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet -device virtio-rng-pci" | 18 | QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet -device virtio-rng-pci" |
19 | PREFERRED_VERSION_linux-yocto ??= "4.15%" | 19 | PREFERRED_VERSION_linux-yocto ??= "4.18%" |
20 | QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" | 20 | QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" |