summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2020-12-28 17:31:10 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-01-05 13:48:41 +0000
commite40068655827745d73111a57a8b659252d98dca8 (patch)
tree3a379ad76eeccb5382cc9dabb8dfc2b15539921c /meta
parent21707e9e28b0dc3fafc71458d77cc5a3b68c1f94 (diff)
downloadpoky-e40068655827745d73111a57a8b659252d98dca8.tar.gz
machine/qemuarm*: add vmalloc kernel parameter
On kernel's v5.11+, we get the following warning after boot: [ 47.287826] vmap allocation for size 3149824 failed: use vmalloc=<size> to increase size It can be fixed by passing the vmalloc page size explicitly for our ARM machines. (From OE-Core rev: 5c6064e1a38f4dbb1ab3fa04adb1c772817826af) 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/qemuarm.conf2
-rw-r--r--meta/conf/machine/qemuarmv5.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
index 702b850cbb..257cfa3e63 100644
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/conf/machine/qemuarm.conf
@@ -17,7 +17,7 @@ QB_SYSTEM_NAME = "qemu-system-arm"
17QB_MACHINE = "-machine virt,highmem=off" 17QB_MACHINE = "-machine virt,highmem=off"
18QB_CPU = "-cpu cortex-a15" 18QB_CPU = "-cpu cortex-a15"
19# Standard Serial console 19# Standard Serial console
20QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0" 20QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0 vmalloc=256"
21# For graphics to work we need to define the VGA device as well as the necessary USB devices 21# For graphics to work we need to define the VGA device as well as the necessary USB devices
22QB_OPT_APPEND = "-device VGA,edid=on" 22QB_OPT_APPEND = "-device VGA,edid=on"
23QB_OPT_APPEND += "-device qemu-xhci -device usb-tablet -device usb-kbd" 23QB_OPT_APPEND += "-device qemu-xhci -device usb-tablet -device usb-kbd"
diff --git a/meta/conf/machine/qemuarmv5.conf b/meta/conf/machine/qemuarmv5.conf
index 7e8c9e1fa6..89328977b0 100644
--- a/meta/conf/machine/qemuarmv5.conf
+++ b/meta/conf/machine/qemuarmv5.conf
@@ -12,7 +12,7 @@ SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;ttyAMA1"
12# For runqemu 12# For runqemu
13QB_SYSTEM_NAME = "qemu-system-arm" 13QB_SYSTEM_NAME = "qemu-system-arm"
14QB_MACHINE = "-machine versatilepb" 14QB_MACHINE = "-machine versatilepb"
15QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty" 15QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty vmalloc=256"
16QB_OPT_APPEND = "-usb -device usb-tablet" 16QB_OPT_APPEND = "-usb -device usb-tablet"
17PREFERRED_VERSION_linux-yocto ??= "5.8%" 17PREFERRED_VERSION_linux-yocto ??= "5.8%"
18QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" 18QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}"