summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine
diff options
context:
space:
mode:
Diffstat (limited to 'meta/conf/machine')
-rw-r--r--meta/conf/machine/qemuarm.conf2
-rw-r--r--meta/conf/machine/qemuarm64.conf2
-rw-r--r--meta/conf/machine/qemuarmv5.conf2
3 files changed, 2 insertions, 4 deletions
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
index 37dae8c863..e5ec4cc065 100644
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/conf/machine/qemuarm.conf
@@ -17,7 +17,7 @@ QB_SYSTEM_NAME = "qemu-system-arm"
17QB_MACHINE = "-machine virt,highmem=off" 17QB_MACHINE = "-machine virt,highmem=off"
18QB_CPU = "-cpu cortex-a15" 18QB_CPU = "-cpu cortex-a15"
19# Standard Serial console 19# Standard Serial console
20QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0 vmalloc=256" 20QB_KERNEL_CMDLINE_APPEND = "vmalloc=256"
21# For graphics to work we need to define the VGA device as well as the necessary USB devices 21# For graphics to work we need to define the VGA device as well as the necessary USB devices
22QB_GRAPHICS = "-device VGA,edid=on" 22QB_GRAPHICS = "-device VGA,edid=on"
23QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd" 23QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd"
diff --git a/meta/conf/machine/qemuarm64.conf b/meta/conf/machine/qemuarm64.conf
index 05fd1f749b..51f7ecdcfd 100644
--- a/meta/conf/machine/qemuarm64.conf
+++ b/meta/conf/machine/qemuarm64.conf
@@ -17,8 +17,6 @@ QB_SYSTEM_NAME = "qemu-system-aarch64"
17QB_MACHINE = "-machine virt" 17QB_MACHINE = "-machine virt"
18QB_CPU = "-cpu cortex-a57" 18QB_CPU = "-cpu cortex-a57"
19QB_CPU_KVM = "-cpu host -machine gic-version=3" 19QB_CPU_KVM = "-cpu host -machine gic-version=3"
20# Standard Serial console
21QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0"
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
23QB_GRAPHICS = "-device VGA,edid=on" 21QB_GRAPHICS = "-device VGA,edid=on"
24QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd" 22QB_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 dfe2a89573..7050bae088 100644
--- a/meta/conf/machine/qemuarmv5.conf
+++ b/meta/conf/machine/qemuarmv5.conf
@@ -12,7 +12,7 @@ SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;ttyAMA1"
12# For runqemu 12# For runqemu
13QB_SYSTEM_NAME = "qemu-system-arm" 13QB_SYSTEM_NAME = "qemu-system-arm"
14QB_MACHINE = "-machine versatilepb" 14QB_MACHINE = "-machine versatilepb"
15QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty vmalloc=256" 15QB_KERNEL_CMDLINE_APPEND = "vmalloc=256"
16QB_OPT_APPEND = "-usb -device usb-tablet" 16QB_OPT_APPEND = "-usb -device usb-tablet"
17PREFERRED_VERSION_linux-yocto ??= "5.10%" 17PREFERRED_VERSION_linux-yocto ??= "5.10%"
18QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" 18QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}"