diff options
Diffstat (limited to 'meta/conf/machine/qemuarm.conf')
-rw-r--r-- | meta/conf/machine/qemuarm.conf | 14 |
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 | ||
5 | require conf/machine/include/tune-cortexa15.inc | 5 | require conf/machine/include/arm/armv7a/tune-cortexa15.inc |
6 | require conf/machine/include/qemu.inc | 6 | require conf/machine/include/qemu.inc |
7 | 7 | ||
8 | KERNEL_IMAGETYPE = "zImage" | 8 | KERNEL_IMAGETYPE = "zImage" |
@@ -10,17 +10,15 @@ KERNEL_IMAGETYPE = "zImage" | |||
10 | UBOOT_MACHINE ?= "qemu_arm_defconfig" | 10 | UBOOT_MACHINE ?= "qemu_arm_defconfig" |
11 | 11 | ||
12 | SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" | 12 | SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" |
13 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | ||
14 | 13 | ||
15 | # For runqemu | 14 | # For runqemu |
16 | QB_SYSTEM_NAME = "qemu-system-arm" | 15 | QB_SYSTEM_NAME = "qemu-system-arm" |
17 | QB_MACHINE = "-machine virt,highmem=off" | 16 | QB_MACHINE = "-machine virt,highmem=off" |
18 | QB_CPU = "-cpu cortex-a15" | 17 | QB_CPU = "-cpu cortex-a15" |
19 | # Standard Serial console | 18 | QB_SMP ?= "-smp 4" |
20 | QB_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 |
22 | QB_OPT_APPEND = "-device VGA,edid=on" | 20 | QB_GRAPHICS = "-device virtio-gpu-pci" |
23 | QB_OPT_APPEND += "-device qemu-xhci -device usb-tablet -device usb-kbd" | 21 | QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd" |
24 | # Virtio Networking support | 22 | # Virtio Networking support |
25 | 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" |
26 | QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@" | 24 | QB_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@" | |||
28 | 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" |
29 | # Virtio serial console | 27 | # Virtio serial console |
30 | 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" |
31 | 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,nodelay=on -device virtconsole,chardev=virtcon" |
32 | 30 | ||
33 | KMACHINE_qemuarm = "qemuarma15" | 31 | KMACHINE:qemuarm = "qemuarma15" |