diff options
| author | Jon Mason <jdmason@kudzu.us> | 2019-03-05 17:32:17 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-03-06 16:26:47 +0000 |
| commit | bc87fbb0a53e4953605e378e14cfe47f9a944a3d (patch) | |
| tree | 65d849aed533aad616eaaa9dec357b2a204026c6 | |
| parent | a02a05c59cddae7e4148eeb087c9722b125e5151 (diff) | |
| download | poky-bc87fbb0a53e4953605e378e14cfe47f9a944a3d.tar.gz | |
qemuarm64: config cleanups
Add comments describing what is going on, remove an unnecessary space,
remove a duplicate comment, and increase the serial speed.
(From OE-Core rev: d1071579e3896f68b1e4970c1fc9a97b043091e9)
Signed-off-by: Jon Mason <jdmason@kudzu.us>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/conf/machine/qemuarm64.conf | 11 |
1 files changed, 7 insertions, 4 deletions
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 | |||
| 7 | 7 | ||
| 8 | KERNEL_IMAGETYPE = "Image" | 8 | KERNEL_IMAGETYPE = "Image" |
| 9 | 9 | ||
| 10 | SERIAL_CONSOLES ?= "38400;ttyAMA0 38400;hvc0" | 10 | SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" |
| 11 | 11 | ||
| 12 | # For runqemu | 12 | # For runqemu |
| 13 | QB_SYSTEM_NAME = "qemu-system-aarch64" | 13 | QB_SYSTEM_NAME = "qemu-system-aarch64" |
| 14 | QB_MEM = "-m 512" | 14 | QB_MEM = "-m 512" |
| 15 | QB_MACHINE = "-machine virt" | 15 | QB_MACHINE = "-machine virt" |
| 16 | QB_CPU = "-cpu cortex-a57" | 16 | QB_CPU = "-cpu cortex-a57" |
| 17 | QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,38400" | 17 | # Standard Serial console and graphics (or lack thereof in this instance) |
| 18 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy | 18 | QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0" |
| 19 | QB_OPT_APPEND = "-show-cursor -monitor null" | 19 | QB_OPT_APPEND = "-show-cursor -monitor null" |
| 20 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy | 20 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy |
| 21 | QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" | 21 | QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" |
| 22 | # Virtio Networking support | ||
| 22 | QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" | 23 | QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" |
| 23 | QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@" | 24 | QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@" |
| 25 | # Virtio block device | ||
| 24 | QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=none,format=raw -device virtio-blk-device,drive=disk0" | 26 | QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=none,format=raw -device virtio-blk-device,drive=disk0" |
| 27 | # Virtio serial console | ||
| 25 | QB_SERIAL_OPT = "-device virtio-serial-device -chardev null,id=virtcon -device virtconsole,chardev=virtcon" | 28 | QB_SERIAL_OPT = "-device virtio-serial-device -chardev null,id=virtcon -device virtconsole,chardev=virtcon" |
| 26 | QB_TCPSERIAL_OPT = " -device virtio-serial-device -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1 -device virtconsole,chardev=virtcon" | 29 | QB_TCPSERIAL_OPT = "-device virtio-serial-device -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1 -device virtconsole,chardev=virtcon" |