diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2020-10-28 16:20:17 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2020-10-28 23:49:35 +0800 |
commit | 2e70694b20ca390e4c143da31ef192ecd5528665 (patch) | |
tree | bbff787887a71345ee8e0d2dc2aecde935b357e9 | |
parent | 9d3400dd7e4483abb84d068dc8480a34ffc2d75a (diff) | |
download | meta-intel-2e70694b20ca390e4c143da31ef192ecd5528665.tar.gz |
conf/machine: use a weaker operator to set SERIAL_CONSOLES
We should be able to over-ride this when appropriate in a layer or
local.conf.
Fixes [YOCTO #14109]
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-rw-r--r-- | conf/machine/intel-core2-32.conf | 2 | ||||
-rw-r--r-- | conf/machine/intel-corei7-64.conf | 2 | ||||
-rw-r--r-- | conf/machine/intel-skylake-64.conf | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf index 20c98726..384ad1e9 100644 --- a/conf/machine/intel-core2-32.conf +++ b/conf/machine/intel-core2-32.conf | |||
@@ -27,7 +27,7 @@ XSERVER ?= "${XSERVER_X86_BASE} \ | |||
27 | " | 27 | " |
28 | 28 | ||
29 | SYSLINUX_OPTS = "serial 0 115200" | 29 | SYSLINUX_OPTS = "serial 0 115200" |
30 | SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyPCH0" | 30 | SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyPCH0" |
31 | APPEND += "rootwait console=ttyS0,115200 console=ttyPCH0,115200 console=tty0" | 31 | APPEND += "rootwait console=ttyS0,115200 console=ttyPCH0,115200 console=tty0" |
32 | 32 | ||
33 | IMAGE_FSTYPES += "wic" | 33 | IMAGE_FSTYPES += "wic" |
diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf index 6164bf3e..20095379 100644 --- a/conf/machine/intel-corei7-64.conf +++ b/conf/machine/intel-corei7-64.conf | |||
@@ -32,7 +32,7 @@ XSERVER ?= "${XSERVER_X86_BASE} \ | |||
32 | " | 32 | " |
33 | 33 | ||
34 | SYSLINUX_OPTS = "serial 0 115200" | 34 | SYSLINUX_OPTS = "serial 0 115200" |
35 | SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyS2" | 35 | SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyS2" |
36 | APPEND += "rootwait console=ttyS0,115200 console=tty0" | 36 | APPEND += "rootwait console=ttyS0,115200 console=tty0" |
37 | 37 | ||
38 | IMAGE_FSTYPES += "wic" | 38 | IMAGE_FSTYPES += "wic" |
diff --git a/conf/machine/intel-skylake-64.conf b/conf/machine/intel-skylake-64.conf index 6ae80a5a..7cc93583 100644 --- a/conf/machine/intel-skylake-64.conf +++ b/conf/machine/intel-skylake-64.conf | |||
@@ -27,7 +27,7 @@ XSERVER ?= "${XSERVER_X86_BASE} \ | |||
27 | " | 27 | " |
28 | 28 | ||
29 | SYSLINUX_OPTS = "serial 0 115200" | 29 | SYSLINUX_OPTS = "serial 0 115200" |
30 | SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyS2" | 30 | SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyS2" |
31 | APPEND += "rootwait console=ttyS0,115200 console=tty0" | 31 | APPEND += "rootwait console=ttyS0,115200 console=tty0" |
32 | 32 | ||
33 | IMAGE_FSTYPES += "wic" | 33 | IMAGE_FSTYPES += "wic" |