meta-facebook: harma: revise uart udev setting
1.Revise the udev UART setting,
as it was removed in a previous ticket
https://gerrit.openbmc.org/c/openbmc/openbmc/+/74002
2.Add support for USB6 to enable the Aegis board's
BIC console for BIC debugging.
Change-Id: I650a798f6c899180455153999d4031023d712a91
Signed-off-by: Peter Yin <peter.yin@quantatw.com>
diff --git a/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console/plat-80-obmc-console-uart.rules b/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console/plat-80-obmc-console-uart.rules
index db7919d..588640b 100644
--- a/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console/plat-80-obmc-console-uart.rules
+++ b/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console/plat-80-obmc-console-uart.rules
@@ -1,2 +1,3 @@
SUBSYSTEM=="tty", ATTRS{iomem_base}=="0x1E78F000", ENV{SYSTEMD_WANTS}="obmc-console@ttyS2", TAG+="systemd"
SUBSYSTEM=="tty", KERNEL=="ttyUSB1", ENV{SYSTEMD_WANTS}="obmc-console@ttyUSB1", TAG+="systemd"
+SUBSYSTEM=="tty", KERNEL=="ttyUSB6", ENV{SYSTEMD_WANTS}="obmc-console@ttyUSB6", TAG+="systemd"
diff --git a/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console/server.ttyUSB6.conf b/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console/server.ttyUSB6.conf
new file mode 100644
index 0000000..e3121a7
--- /dev/null
+++ b/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console/server.ttyUSB6.conf
@@ -0,0 +1,3 @@
+baud = 57600
+console-id = usb6
+logfile = /var/log/obmc-console-usb6.log
diff --git a/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console_%.bbappend
index f85aac0..3d59428 100644
--- a/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console_%.bbappend
+++ b/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console_%.bbappend
@@ -5,12 +5,14 @@
SRC_URI:append = " \
file://server.ttyUSB1.conf \
+ file://server.ttyUSB6.conf \
file://plat-80-obmc-console-uart.rules \
"
-OBMC_CONSOLE_TTYS:append = " ttyUSB1"
+OBMC_CONSOLE_TTYS:append = " ttyUSB1 ttyUSB6"
OBMC_SOL_ROUTING = "uart1:uart4 uart4:uart1 io1:uart2 uart2:io1"
do_install:append() {
install -d ${D}${base_libdir}/udev/rules.d/
+ install -m 0644 ${WORKDIR}/plat-80-obmc-console-uart.rules ${D}${base_libdir}/udev/rules.d/80-obmc-console-uart.rules
}