From d1071579e3896f68b1e4970c1fc9a97b043091e9 Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Tue, 5 Mar 2019 17:32:17 -0500 Subject: qemuarm64: config cleanups Add comments describing what is going on, remove an unnecessary space, remove a duplicate comment, and increase the serial speed. Signed-off-by: Jon Mason Signed-off-by: Richard Purdie --- meta/conf/machine/qemuarm64.conf | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'meta/conf') diff --git a/meta/conf/machine/qemuarm64.conf b/meta/conf/machine/qemuarm64.conf index ee19385eaf..43078588a8 100644 --- a/meta/conf/machine/qemuarm64.conf +++ b/meta/conf/machine/qemuarm64.conf @@ -7,20 +7,23 @@ require conf/machine/include/qemu.inc KERNEL_IMAGETYPE = "Image" -SERIAL_CONSOLES ?= "38400;ttyAMA0 38400;hvc0" +SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" # For runqemu QB_SYSTEM_NAME = "qemu-system-aarch64" QB_MEM = "-m 512" QB_MACHINE = "-machine virt" QB_CPU = "-cpu cortex-a57" -QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,38400" -# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy +# Standard Serial console and graphics (or lack thereof in this instance) +QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0" QB_OPT_APPEND = "-show-cursor -monitor null" # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" +# Virtio Networking support QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@" +# Virtio block device QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=none,format=raw -device virtio-blk-device,drive=disk0" +# Virtio serial console QB_SERIAL_OPT = "-device virtio-serial-device -chardev null,id=virtcon -device virtconsole,chardev=virtcon" -QB_TCPSERIAL_OPT = " -device virtio-serial-device -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1 -device virtconsole,chardev=virtcon" +QB_TCPSERIAL_OPT = "-device virtio-serial-device -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1 -device virtconsole,chardev=virtcon" -- cgit 1.2.3-korg