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/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 d07084bcf3..cdad03fc4d 100644
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/conf/machine/qemuarm.conf
@@ -8,5 +8,5 @@ require conf/machine/include/tune-arm926ejs.inc
8 8
9KERNEL_IMAGETYPE = "zImage" 9KERNEL_IMAGETYPE = "zImage"
10 10
11SERIAL_CONSOLE = "115200 ttyAMA0" 11SERIAL_CONSOLES = "115200;ttyAMA0 115200;ttyAMA1"
12 12
diff --git a/meta/conf/machine/qemuarm64.conf b/meta/conf/machine/qemuarm64.conf
index 20bcfbac99..7bbdad74a3 100644
--- a/meta/conf/machine/qemuarm64.conf
+++ b/meta/conf/machine/qemuarm64.conf
@@ -9,4 +9,4 @@ MACHINE_FEATURES = ""
9 9
10KERNEL_IMAGETYPE = "Image" 10KERNEL_IMAGETYPE = "Image"
11 11
12SERIAL_CONSOLE = "38400 ttyAMA0" 12SERIAL_CONSOLES = "38400;ttyAMA0 38400;ttyAMA1"
diff --git a/meta/conf/machine/qemumips.conf b/meta/conf/machine/qemumips.conf
index d9d2421616..fbf813740b 100644
--- a/meta/conf/machine/qemumips.conf
+++ b/meta/conf/machine/qemumips.conf
@@ -8,6 +8,6 @@ require conf/machine/include/tune-mips32r2.inc
8KERNEL_IMAGETYPE = "vmlinux" 8KERNEL_IMAGETYPE = "vmlinux"
9KERNEL_ALT_IMAGETYPE = "vmlinux.bin" 9KERNEL_ALT_IMAGETYPE = "vmlinux.bin"
10 10
11SERIAL_CONSOLE = "115200 ttyS0" 11SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1"
12 12
13MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" 13MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
diff --git a/meta/conf/machine/qemumips64.conf b/meta/conf/machine/qemumips64.conf
index b2c7998a66..8c3f1fe283 100644
--- a/meta/conf/machine/qemumips64.conf
+++ b/meta/conf/machine/qemumips64.conf
@@ -8,6 +8,6 @@ require conf/machine/include/tune-mips64.inc
8KERNEL_IMAGETYPE = "vmlinux" 8KERNEL_IMAGETYPE = "vmlinux"
9KERNEL_ALT_IMAGETYPE = "vmlinux.bin" 9KERNEL_ALT_IMAGETYPE = "vmlinux.bin"
10 10
11SERIAL_CONSOLE = "115200 ttyS0" 11SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1"
12 12
13MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" 13MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
diff --git a/meta/conf/machine/qemuppc.conf b/meta/conf/machine/qemuppc.conf
index 93145a1e2f..85cbbf798d 100644
--- a/meta/conf/machine/qemuppc.conf
+++ b/meta/conf/machine/qemuppc.conf
@@ -7,5 +7,5 @@ require conf/machine/include/tune-ppc7400.inc
7 7
8KERNEL_IMAGETYPE = "vmlinux" 8KERNEL_IMAGETYPE = "vmlinux"
9 9
10SERIAL_CONSOLE = "115200 ttyS0" 10SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1"
11 11
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index 837f9f4ab0..a4fd43ce1a 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -13,7 +13,7 @@ require conf/machine/include/tune-core2.inc
13 13
14KERNEL_IMAGETYPE = "bzImage" 14KERNEL_IMAGETYPE = "bzImage"
15 15
16SERIAL_CONSOLE = "115200 ttyS0" 16SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1"
17 17
18XSERVER = "xserver-xorg \ 18XSERVER = "xserver-xorg \
19 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \ 19 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 3562276932..96cea66b49 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -12,7 +12,7 @@ require conf/machine/include/tune-i586.inc
12 12
13KERNEL_IMAGETYPE = "bzImage" 13KERNEL_IMAGETYPE = "bzImage"
14 14
15SERIAL_CONSOLE = "115200 ttyS0" 15SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1"
16 16
17XSERVER = "xserver-xorg \ 17XSERVER = "xserver-xorg \
18 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \ 18 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \