meta-quanta: gbs: update the GBS console redirect setting
Commit the GBS console redirect setting for obmc-console
Signed-off-by: George Hung <george.hung@quantatw.com>
Change-Id: If4b39537bc71a00def2d788a24ab06bd1f40a6ad
diff --git a/meta-quanta/meta-gbs/conf/machine/gbs.conf b/meta-quanta/meta-gbs/conf/machine/gbs.conf
index 9a99b5b..6814e02 100644
--- a/meta-quanta/meta-gbs/conf/machine/gbs.conf
+++ b/meta-quanta/meta-gbs/conf/machine/gbs.conf
@@ -10,6 +10,7 @@
require conf/machine/include/npcm7xx.inc
require conf/machine/include/obmc-bsp-common.inc
+SERIAL_CONSOLES = "115200;ttyS0"
GBMC_NCSI_IF_NAME = "eth0"
GBMC_KCS_DEV = "ipmi-kcs1"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/console/files/80-gbs-nuvoton-sol.rules b/meta-quanta/meta-gbs/recipes-phosphor/console/files/80-gbs-nuvoton-sol.rules
deleted file mode 100644
index 3d0670b..0000000
--- a/meta-quanta/meta-gbs/recipes-phosphor/console/files/80-gbs-nuvoton-sol.rules
+++ /dev/null
@@ -1 +0,0 @@
-SUBSYSTEM=="tty", ATTRS{iomem_base}=="0xF0002000", ENV{SYSTEMD_WANTS}="obmc-console@ttyS1" SYMLINK+="ttyS1", TAG+="systemd"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/console/obmc-console_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/console/obmc-console_%.bbappend
index f78e3c2..1426610 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/console/obmc-console_%.bbappend
+++ b/meta-quanta/meta-gbs/recipes-phosphor/console/obmc-console_%.bbappend
@@ -1,13 +1,4 @@
FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/files:"
-SRC_URI_append_gbs = " file://80-gbs-nuvoton-sol.rules"
-do_install_append_gbs() {
- install -m 0755 -d ${D}${sysconfdir}/${BPN}
- rm -f ${D}${sysconfdir}/${BPN}/server.ttyVUART0.conf
- install -m 0644 ${WORKDIR}/${BPN}.conf ${D}${sysconfdir}/
- ln -sr ${D}${sysconfdir}/${BPN}.conf ${D}${sysconfdir}/${BPN}/server.ttyS1.conf
-
- install -d ${D}/lib/udev/rules.d
- rm -f ${D}/lib/udev/rules.d/80-obmc-console-uart.rules
- install -m 0644 ${WORKDIR}/80-gbs-nuvoton-sol.rules ${D}/lib/udev/rules.d
-}
+OBMC_CONSOLE_FRONT_TTY_gbs = "ttyS3"
+OBMC_CONSOLE_HOST_TTY_gbs = "ttyS1"