commit 84bf73106b95a0409eb8dc3ecc3275849379d702
author Jayanth Othayoth <ojayanth@gmail.com> Mon Jan 01 06:43:03 2024 -0600
committer Jayanth Othayoth <ojayanth@gmail.com> Tue Apr 02 03:01:45 2024 +0000
tree fe3a8b082f2bb666f88e76481ea840389ff3a58e
parent 1d8698ebff31b92b2fff7f83dcbfc618575fddd9

meta-amd: console: code restructure

Added additional configuration files to support obmc-console
for all AMD CRB's.

Tested: verified build

Change-Id: Id31ec4e9953df32d5dc8468aafedbfa014f087f4
Signed-off-by: Jayanth Othayoth <ojayanth@gmail.com>

meta-amd/meta-common/recipes-phosphor/console/obmc-console_%.bbappend

diff --git a/meta-amd/meta-common/recipes-phosphor/console/obmc-console_%.bbappend b/meta-amd/meta-common/recipes-phosphor/console/obmc-console_%.bbappend
index 8ffa93b..ae8b4dc 100644
--- a/meta-amd/meta-common/recipes-phosphor/console/obmc-console_%.bbappend
+++ b/meta-amd/meta-common/recipes-phosphor/console/obmc-console_%.bbappend
@@ -1,10 +1,15 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}/${MACHINE}:"
-OBMC_CONSOLE_HOST_TTY:ethanolx = "ttyS0"
-OBMC_CONSOLE_HOST_TTY:daytonax = "ttyVUART0"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+OBMC_CONSOLE_HOST_TTY = "ttyS0"
 
 SRC_URI:remove = "file://${BPN}.conf"
-SRC_URI:append:ethanolx = " file://server.ttyS0.conf"
-SRC_URI:append:daytonax = " file://server.ttyVUART0.conf"
+
+SRC_URI:append = "\
+        file://server.ttyS0.conf \
+        file://server.ttyVUART0.conf \
+        file://client.2200.conf \
+        file://client.2201.conf \
+"
 
 do_install:append() {
         # Remove upstream-provided configuration
@@ -13,5 +18,18 @@
         # Install the server configuration
         install -m 0755 -d ${D}${sysconfdir}/${BPN}
         install -m 0644 ${WORKDIR}/*.conf ${D}${sysconfdir}/${BPN}/
-
 }
+
+EXTRA_OECONF:append = " --enable-concurrent-servers"
+
+SYSTEMD_SERVICE_${PN}:remove = "obmc-console-ssh.socket"
+
+SYSTEMD_SERVICE_${PN}:append = " obmc-console-ssh@2200.service \
+        obmc-console-ssh@2201.service \
+"
+
+REGISTERED_SERVICES_${PN}:append = " obmc_console_host0:tcp:2200: \
+        obmc_console_host1:tcp:2201: \
+"
+
+FILES_${PN}:remove = "${systemd_system_unitdir}/obmc-console-ssh@.service.d/use-socket.conf"