diff options
Diffstat (limited to 'meta/conf/machine/qemuarm.conf')
-rw-r--r-- | meta/conf/machine/qemuarm.conf | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf index 26f40b1419..943ce7c16a 100644 --- a/meta/conf/machine/qemuarm.conf +++ b/meta/conf/machine/qemuarm.conf @@ -2,24 +2,23 @@ #@NAME: QEMU Arm Cortex-A15 machine #@DESCRIPTION: Machine configuration for running an ARMv7 system on QEMU -require conf/machine/include/tune-cortexa15.inc +require conf/machine/include/arm/armv7a/tune-cortexa15.inc require conf/machine/include/qemu.inc KERNEL_IMAGETYPE = "zImage" +UBOOT_MACHINE ?= "qemu_arm_defconfig" + SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" # For runqemu QB_SYSTEM_NAME = "qemu-system-arm" -QB_MACHINE = "-machine virt" +QB_MACHINE = "-machine virt,highmem=off" QB_CPU = "-cpu cortex-a15" -# Standard Serial console -QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0" +QB_SMP ?= "-smp 4" # For graphics to work we need to define the VGA device as well as the necessary USB devices -QB_OPT_APPEND = "-show-cursor -device VGA,edid=on" -QB_OPT_APPEND += "-device qemu-xhci -device usb-tablet -device usb-kbd" -# Add the virtio RNG -QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" +QB_GRAPHICS = "-device virtio-gpu-pci" +QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd" # 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@" @@ -27,6 +26,6 @@ QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@" 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,nodelay=on -device virtconsole,chardev=virtcon" -KMACHINE_qemuarm = "qemuarma15" +KMACHINE:qemuarm = "qemuarma15" |