summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2020-10-28 08:20:17 (GMT)
committerAnuj Mittal <anuj.mittal@intel.com>2020-10-28 15:49:35 (GMT)
commit2e70694b20ca390e4c143da31ef192ecd5528665 (patch)
treebbff787887a71345ee8e0d2dc2aecde935b357e9
parent9d3400dd7e4483abb84d068dc8480a34ffc2d75a (diff)
downloadmeta-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.conf2
-rw-r--r--conf/machine/intel-corei7-64.conf2
-rw-r--r--conf/machine/intel-skylake-64.conf2
3 files changed, 3 insertions, 3 deletions
diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf
index 20c9872..384ad1e 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
29SYSLINUX_OPTS = "serial 0 115200" 29SYSLINUX_OPTS = "serial 0 115200"
30SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyPCH0" 30SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyPCH0"
31APPEND += "rootwait console=ttyS0,115200 console=ttyPCH0,115200 console=tty0" 31APPEND += "rootwait console=ttyS0,115200 console=ttyPCH0,115200 console=tty0"
32 32
33IMAGE_FSTYPES += "wic" 33IMAGE_FSTYPES += "wic"
diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf
index 6164bf3..2009537 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
34SYSLINUX_OPTS = "serial 0 115200" 34SYSLINUX_OPTS = "serial 0 115200"
35SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyS2" 35SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyS2"
36APPEND += "rootwait console=ttyS0,115200 console=tty0" 36APPEND += "rootwait console=ttyS0,115200 console=tty0"
37 37
38IMAGE_FSTYPES += "wic" 38IMAGE_FSTYPES += "wic"
diff --git a/conf/machine/intel-skylake-64.conf b/conf/machine/intel-skylake-64.conf
index 6ae80a5..7cc9358 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
29SYSLINUX_OPTS = "serial 0 115200" 29SYSLINUX_OPTS = "serial 0 115200"
30SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyS2" 30SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyS2"
31APPEND += "rootwait console=ttyS0,115200 console=tty0" 31APPEND += "rootwait console=ttyS0,115200 console=tty0"
32 32
33IMAGE_FSTYPES += "wic" 33IMAGE_FSTYPES += "wic"