summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/machine/qemuarm.conf34
-rw-r--r--meta/conf/machine/qemuarmv5.conf23
2 files changed, 46 insertions, 11 deletions
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
index a544312627..9555046189 100644
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/conf/machine/qemuarm.conf
@@ -1,21 +1,33 @@
1#@TYPE: Machine 1#@TYPE: Machine
2#@NAME: arm_versatile_926ejs 2#@NAME: generic Arm Cortex-A15 machine
3#@DESCRIPTION: arm_versatile_926ejs 3#@DESCRIPTION: Machine configuration for running a generic armv7
4 4
5require conf/machine/include/tune-cortexa15.inc
5require conf/machine/include/qemu.inc 6require conf/machine/include/qemu.inc
6require conf/machine/include/tune-arm926ejs.inc
7#require conf/machine/include/tune-arm1136jf-s.inc
8 7
9KERNEL_IMAGETYPE = "zImage" 8KERNEL_IMAGETYPE = "zImage"
10 9
11SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;ttyAMA1" 10SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0"
12 11
13# For runqemu 12# For runqemu
14QB_SYSTEM_NAME = "qemu-system-arm" 13QB_SYSTEM_NAME = "qemu-system-arm"
15QB_MACHINE = "-machine versatilepb" 14QB_MEM = "-m 512"
16QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty" 15QB_MACHINE = "-machine virt"
17QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" 16QB_CPU = "-cpu cortex-a15"
18# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy 17# Standard Serial console
18QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0"
19# For graphics to work we need to define the VGA device as well as the necessary USB devices
20QB_OPT_APPEND = "-show-cursor -device VGA,edid=on"
21QB_OPT_APPEND += "-device qemu-xhci -device usb-tablet -device usb-kbd"
22# Add the virtio RNG
19QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" 23QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0"
20PREFERRED_VERSION_linux-yocto ??= "4.18%" 24# Virtio Networking support
21QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" 25QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no"
26QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@"
27# Virtio block device
28QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=none,format=raw -device virtio-blk-device,drive=disk0"
29# Virtio serial console
30QB_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"
32
33KMACHINE_qemuarm = "qemuarma15"
diff --git a/meta/conf/machine/qemuarmv5.conf b/meta/conf/machine/qemuarmv5.conf
new file mode 100644
index 0000000000..5f90accc24
--- /dev/null
+++ b/meta/conf/machine/qemuarmv5.conf
@@ -0,0 +1,23 @@
1#@TYPE: Machine
2#@NAME: arm_versatile_926ejs
3#@DESCRIPTION: arm_versatile_926ejs
4
5require conf/machine/include/qemu.inc
6require conf/machine/include/tune-arm926ejs.inc
7#require conf/machine/include/tune-arm1136jf-s.inc
8
9KERNEL_IMAGETYPE = "zImage"
10
11SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;ttyAMA1"
12
13# For runqemu
14QB_SYSTEM_NAME = "qemu-system-arm"
15QB_MACHINE = "-machine versatilepb"
16QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty"
17QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet"
18# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
19QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0"
20PREFERRED_VERSION_linux-yocto ??= "4.18%"
21QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}"
22
23KMACHINE_qemuarmv5 = "qemuarm" \ No newline at end of file