summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine/qemuarm.conf
diff options
context:
space:
mode:
Diffstat (limited to 'meta/conf/machine/qemuarm.conf')
-rw-r--r--meta/conf/machine/qemuarm.conf14
1 files changed, 6 insertions, 8 deletions
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
index 257cfa3e63..943ce7c16a 100644
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/conf/machine/qemuarm.conf
@@ -2,7 +2,7 @@
2#@NAME: QEMU Arm Cortex-A15 machine 2#@NAME: QEMU Arm Cortex-A15 machine
3#@DESCRIPTION: Machine configuration for running an ARMv7 system on QEMU 3#@DESCRIPTION: Machine configuration for running an ARMv7 system on QEMU
4 4
5require conf/machine/include/tune-cortexa15.inc 5require conf/machine/include/arm/armv7a/tune-cortexa15.inc
6require conf/machine/include/qemu.inc 6require conf/machine/include/qemu.inc
7 7
8KERNEL_IMAGETYPE = "zImage" 8KERNEL_IMAGETYPE = "zImage"
@@ -10,17 +10,15 @@ KERNEL_IMAGETYPE = "zImage"
10UBOOT_MACHINE ?= "qemu_arm_defconfig" 10UBOOT_MACHINE ?= "qemu_arm_defconfig"
11 11
12SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" 12SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0"
13SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
14 13
15# For runqemu 14# For runqemu
16QB_SYSTEM_NAME = "qemu-system-arm" 15QB_SYSTEM_NAME = "qemu-system-arm"
17QB_MACHINE = "-machine virt,highmem=off" 16QB_MACHINE = "-machine virt,highmem=off"
18QB_CPU = "-cpu cortex-a15" 17QB_CPU = "-cpu cortex-a15"
19# Standard Serial console 18QB_SMP ?= "-smp 4"
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 19# 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" 20QB_GRAPHICS = "-device virtio-gpu-pci"
23QB_OPT_APPEND += "-device qemu-xhci -device usb-tablet -device usb-kbd" 21QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd"
24# Virtio Networking support 22# Virtio Networking support
25QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" 23QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no"
26QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@" 24QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@"
@@ -28,6 +26,6 @@ QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@"
28QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=none,format=raw -device virtio-blk-device,drive=disk0" 26QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=none,format=raw -device virtio-blk-device,drive=disk0"
29# Virtio serial console 27# Virtio serial console
30QB_SERIAL_OPT = "-device virtio-serial-device -chardev null,id=virtcon -device virtconsole,chardev=virtcon" 28QB_SERIAL_OPT = "-device virtio-serial-device -chardev null,id=virtcon -device virtconsole,chardev=virtcon"
31QB_TCPSERIAL_OPT = "-device virtio-serial-device -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1 -device virtconsole,chardev=virtcon" 29QB_TCPSERIAL_OPT = "-device virtio-serial-device -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1,nodelay=on -device virtconsole,chardev=virtcon"
32 30
33KMACHINE_qemuarm = "qemuarma15" 31KMACHINE:qemuarm = "qemuarma15"