diff options
| -rw-r--r-- | meta/conf/machine/qemuarm.conf | 2 | ||||
| -rw-r--r-- | meta/conf/machine/qemuarmv5.conf | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf index c5234231e2..aa9ce88203 100644 --- a/meta/conf/machine/qemuarm.conf +++ b/meta/conf/machine/qemuarm.conf | |||
| @@ -17,8 +17,6 @@ QB_SYSTEM_NAME = "qemu-system-arm" | |||
| 17 | QB_MACHINE = "-machine virt,highmem=off" | 17 | QB_MACHINE = "-machine virt,highmem=off" |
| 18 | QB_CPU = "-cpu cortex-a15" | 18 | QB_CPU = "-cpu cortex-a15" |
| 19 | QB_SMP ?= "-smp 4" | 19 | QB_SMP ?= "-smp 4" |
| 20 | # Standard Serial console | ||
| 21 | QB_KERNEL_CMDLINE_APPEND = "vmalloc=256" | ||
| 22 | # For graphics to work we need to define the VGA device as well as the necessary USB devices | 20 | # For graphics to work we need to define the VGA device as well as the necessary USB devices |
| 23 | QB_GRAPHICS = "-device virtio-gpu-pci" | 21 | QB_GRAPHICS = "-device virtio-gpu-pci" |
| 24 | QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd" | 22 | QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd" |
diff --git a/meta/conf/machine/qemuarmv5.conf b/meta/conf/machine/qemuarmv5.conf index 6e59e42c3a..ef1b4ece23 100644 --- a/meta/conf/machine/qemuarmv5.conf +++ b/meta/conf/machine/qemuarmv5.conf | |||
| @@ -12,7 +12,6 @@ SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;ttyAMA1" | |||
| 12 | # For runqemu | 12 | # For runqemu |
| 13 | QB_SYSTEM_NAME = "qemu-system-arm" | 13 | QB_SYSTEM_NAME = "qemu-system-arm" |
| 14 | QB_MACHINE = "-machine versatilepb" | 14 | QB_MACHINE = "-machine versatilepb" |
| 15 | QB_KERNEL_CMDLINE_APPEND = "vmalloc=256" | ||
| 16 | QB_GRAPHICS = "-device virtio-gpu-pci" | 15 | QB_GRAPHICS = "-device virtio-gpu-pci" |
| 17 | QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd" | 16 | QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd" |
| 18 | QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" | 17 | QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" |
