diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2016-12-09 15:43:03 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-13 22:55:20 +0000 |
commit | 934afbbf90ed07aafdf62bfc01129442b77f4ca8 (patch) | |
tree | 0cee66eb5a49c39a768ecf6ea5db28f4a3933ee8 | |
parent | 113828ff861f4c2767d7265e88e432f427bba2cc (diff) | |
download | poky-934afbbf90ed07aafdf62bfc01129442b77f4ca8.tar.gz |
Use weak assignment for SERIAL_CONSOLES in qemu configuration files
Use weak assignment for SERIAL_CONSOLES in qemu configuration files so that
the value could serve as a default value and could be easily overridden in
configuration files like local.conf.
When using the default value for SERIAL_CONSOLES in qemux86-64,we would have
annoying messages on console complaining about respawning getty on ttyS1.
Although the value is set by purpose, at least we need to provide an easy way
to override it.
(From OE-Core rev: 5f060b66162c41a295995947b918253450870117)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/conf/machine/qemuarm.conf | 2 | ||||
-rw-r--r-- | meta/conf/machine/qemuarm64.conf | 2 | ||||
-rw-r--r-- | meta/conf/machine/qemumips.conf | 2 | ||||
-rw-r--r-- | meta/conf/machine/qemumips64.conf | 2 | ||||
-rw-r--r-- | meta/conf/machine/qemuppc.conf | 2 | ||||
-rw-r--r-- | meta/conf/machine/qemux86-64.conf | 2 | ||||
-rw-r--r-- | meta/conf/machine/qemux86.conf | 2 |
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 | ||
9 | KERNEL_IMAGETYPE = "zImage" | 9 | KERNEL_IMAGETYPE = "zImage" |
10 | 10 | ||
11 | SERIAL_CONSOLES = "115200;ttyAMA0 115200;ttyAMA1" | 11 | SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;ttyAMA1" |
12 | 12 | ||
13 | # For runqemu | 13 | # For runqemu |
14 | QB_SYSTEM_NAME = "qemu-system-arm" | 14 | QB_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 | ||
8 | KERNEL_IMAGETYPE = "Image" | 8 | KERNEL_IMAGETYPE = "Image" |
9 | 9 | ||
10 | SERIAL_CONSOLES = "38400;ttyAMA0 38400;hvc0" | 10 | SERIAL_CONSOLES ?= "38400;ttyAMA0 38400;hvc0" |
11 | 11 | ||
12 | # For runqemu | 12 | # For runqemu |
13 | QB_SYSTEM_NAME = "qemu-system-aarch64" | 13 | QB_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 | |||
9 | KERNEL_IMAGETYPE = "vmlinux" | 9 | KERNEL_IMAGETYPE = "vmlinux" |
10 | KERNEL_ALT_IMAGETYPE = "vmlinux.bin" | 10 | KERNEL_ALT_IMAGETYPE = "vmlinux.bin" |
11 | 11 | ||
12 | SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1" | 12 | SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1" |
13 | 13 | ||
14 | MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" | 14 | MACHINE_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 | |||
9 | KERNEL_IMAGETYPE = "vmlinux" | 9 | KERNEL_IMAGETYPE = "vmlinux" |
10 | KERNEL_ALT_IMAGETYPE = "vmlinux.bin" | 10 | KERNEL_ALT_IMAGETYPE = "vmlinux.bin" |
11 | 11 | ||
12 | SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1" | 12 | SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1" |
13 | 13 | ||
14 | MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" | 14 | MACHINE_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 | ||
10 | KERNEL_IMAGETYPE = "vmlinux" | 10 | KERNEL_IMAGETYPE = "vmlinux" |
11 | 11 | ||
12 | SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1" | 12 | SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1" |
13 | 13 | ||
14 | # For runqemu | 14 | # For runqemu |
15 | QB_SYSTEM_NAME = "qemu-system-ppc" | 15 | QB_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 | ||
15 | KERNEL_IMAGETYPE = "bzImage" | 15 | KERNEL_IMAGETYPE = "bzImage" |
16 | 16 | ||
17 | SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1" | 17 | SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1" |
18 | 18 | ||
19 | XSERVER = "xserver-xorg \ | 19 | XSERVER = "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 | ||
14 | KERNEL_IMAGETYPE = "bzImage" | 14 | KERNEL_IMAGETYPE = "bzImage" |
15 | 15 | ||
16 | SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1" | 16 | SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1" |
17 | 17 | ||
18 | XSERVER = "xserver-xorg \ | 18 | XSERVER = "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)} \ |