summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/machine/qemuarm.conf2
-rw-r--r--meta/conf/machine/qemuarm64.conf2
-rw-r--r--meta/conf/machine/qemumips.conf2
-rw-r--r--meta/conf/machine/qemumips64.conf2
-rw-r--r--meta/conf/machine/qemuppc.conf2
-rw-r--r--meta/conf/machine/qemux86-64.conf2
-rw-r--r--meta/conf/machine/qemux86.conf2
7 files changed, 7 insertions, 7 deletions
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
index 17402ef3b3..f9d6dd7e36 100644
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/conf/machine/qemuarm.conf
@@ -8,7 +8,7 @@ require conf/machine/include/tune-arm926ejs.inc
8 8
9KERNEL_IMAGETYPE = "zImage" 9KERNEL_IMAGETYPE = "zImage"
10 10
11SERIAL_CONSOLES = "115200;ttyAMA0 115200;ttyAMA1" 11SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;ttyAMA1"
12 12
13# For runqemu 13# For runqemu
14QB_SYSTEM_NAME = "qemu-system-arm" 14QB_SYSTEM_NAME = "qemu-system-arm"
diff --git a/meta/conf/machine/qemuarm64.conf b/meta/conf/machine/qemuarm64.conf
index df2010cb85..e70538aac6 100644
--- a/meta/conf/machine/qemuarm64.conf
+++ b/meta/conf/machine/qemuarm64.conf
@@ -7,7 +7,7 @@ require conf/machine/include/qemu.inc
7 7
8KERNEL_IMAGETYPE = "Image" 8KERNEL_IMAGETYPE = "Image"
9 9
10SERIAL_CONSOLES = "38400;ttyAMA0 38400;hvc0" 10SERIAL_CONSOLES ?= "38400;ttyAMA0 38400;hvc0"
11 11
12# For runqemu 12# For runqemu
13QB_SYSTEM_NAME = "qemu-system-aarch64" 13QB_SYSTEM_NAME = "qemu-system-aarch64"
diff --git a/meta/conf/machine/qemumips.conf b/meta/conf/machine/qemumips.conf
index 3182ea1b54..986315a64a 100644
--- a/meta/conf/machine/qemumips.conf
+++ b/meta/conf/machine/qemumips.conf
@@ -9,6 +9,6 @@ require conf/machine/include/qemuboot-mips.inc
9KERNEL_IMAGETYPE = "vmlinux" 9KERNEL_IMAGETYPE = "vmlinux"
10KERNEL_ALT_IMAGETYPE = "vmlinux.bin" 10KERNEL_ALT_IMAGETYPE = "vmlinux.bin"
11 11
12SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1" 12SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1"
13 13
14MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" 14MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
diff --git a/meta/conf/machine/qemumips64.conf b/meta/conf/machine/qemumips64.conf
index 9529f4c4f3..3f91cbe177 100644
--- a/meta/conf/machine/qemumips64.conf
+++ b/meta/conf/machine/qemumips64.conf
@@ -9,6 +9,6 @@ require conf/machine/include/qemuboot-mips.inc
9KERNEL_IMAGETYPE = "vmlinux" 9KERNEL_IMAGETYPE = "vmlinux"
10KERNEL_ALT_IMAGETYPE = "vmlinux.bin" 10KERNEL_ALT_IMAGETYPE = "vmlinux.bin"
11 11
12SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1" 12SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1"
13 13
14MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" 14MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
diff --git a/meta/conf/machine/qemuppc.conf b/meta/conf/machine/qemuppc.conf
index 8703c2086a..9d174bc439 100644
--- a/meta/conf/machine/qemuppc.conf
+++ b/meta/conf/machine/qemuppc.conf
@@ -9,7 +9,7 @@ TARGET_CC_KERNEL_ARCH = "-mno-spe"
9 9
10KERNEL_IMAGETYPE = "vmlinux" 10KERNEL_IMAGETYPE = "vmlinux"
11 11
12SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1" 12SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1"
13 13
14# For runqemu 14# For runqemu
15QB_SYSTEM_NAME = "qemu-system-ppc" 15QB_SYSTEM_NAME = "qemu-system-ppc"
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index 3117ca1a5b..150d745436 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -14,7 +14,7 @@ require conf/machine/include/qemuboot-x86.inc
14 14
15KERNEL_IMAGETYPE = "bzImage" 15KERNEL_IMAGETYPE = "bzImage"
16 16
17SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1" 17SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1"
18 18
19XSERVER = "xserver-xorg \ 19XSERVER = "xserver-xorg \
20 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ 20 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 77859994c9..8997f6ba70 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -13,7 +13,7 @@ require conf/machine/include/qemuboot-x86.inc
13 13
14KERNEL_IMAGETYPE = "bzImage" 14KERNEL_IMAGETYPE = "bzImage"
15 15
16SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1" 16SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1"
17 17
18XSERVER = "xserver-xorg \ 18XSERVER = "xserver-xorg \
19 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ 19 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \