diff options
| author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2021-09-06 17:19:13 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2021-09-06 17:26:50 +0200 |
| commit | d4546d69fbceb08d1c05828ce2a156d939799a93 (patch) | |
| tree | 6d1194e04d353a2a896e3f3e1361e383caeb457c | |
| parent | b9a2f4277ea8f76d844ce2f9c80ffd1cc980d1e9 (diff) | |
| download | meta-nfv-access-bsp-x86-d4546d69fbceb08d1c05828ce2a156d939799a93.tar.gz | |
Revert "machine conf: extend serials for VGA"feature_CPDX-3627feature_CPDX-3605feature_CPDX-3562feature_CPDX-3552feature_CPDX-3263
Adding tty0 conflicts with systemd's harcoded tty1, so revert the
machine configuration in favor of fixing the installer script that
was supposed to start agetty on tty0 explicitly.
This reverts commit b9a2f4277ea8f76d844ce2f9c80ffd1cc980d1e9.
Change-Id: I19eb8aa7d134a9d4a768127c869e0f664f1ae4f5
Depends-On: I2c384101ee07e16cad0807c715174baf2be56301
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
| -rw-r--r-- | conf/machine/atom-c3000.conf | 2 | ||||
| -rw-r--r-- | conf/machine/xeon-d.conf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/atom-c3000.conf b/conf/machine/atom-c3000.conf index d525595..766809d 100644 --- a/conf/machine/atom-c3000.conf +++ b/conf/machine/atom-c3000.conf | |||
| @@ -42,6 +42,6 @@ XSERVER ?= "${XSERVER_X86_BASE} \ | |||
| 42 | " | 42 | " |
| 43 | 43 | ||
| 44 | SYSLINUX_OPTS = "serial 0 115200" | 44 | SYSLINUX_OPTS = "serial 0 115200" |
| 45 | SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyS2 tty0" | 45 | SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyS2" |
| 46 | 46 | ||
| 47 | SOTA_MACHINE ?= "${MACHINE}" | 47 | SOTA_MACHINE ?= "${MACHINE}" |
diff --git a/conf/machine/xeon-d.conf b/conf/machine/xeon-d.conf index 02bd19b..42e1843 100644 --- a/conf/machine/xeon-d.conf +++ b/conf/machine/xeon-d.conf | |||
| @@ -40,7 +40,7 @@ XSERVER ?= "${XSERVER_X86_BASE} \ | |||
| 40 | " | 40 | " |
| 41 | 41 | ||
| 42 | SYSLINUX_OPTS = "serial 0 115200" | 42 | SYSLINUX_OPTS = "serial 0 115200" |
| 43 | SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyS2 tty0" | 43 | SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyS2" |
| 44 | APPEND += "rootwait console=ttyS0,115200 console=tty0" | 44 | APPEND += "rootwait console=ttyS0,115200 console=tty0" |
| 45 | 45 | ||
| 46 | SOTA_MACHINE ?= "${MACHINE}" | 46 | SOTA_MACHINE ?= "${MACHINE}" |