From 35c33cc59e459409e6172bc2ba71adcb7e0ce6ff Mon Sep 17 00:00:00 2001 From: Andrew Jeffery Date: Thu, 2 Apr 2020 15:29:34 +1030 Subject: meta-witherspoon: tacoma: Enable concurrent console servers The design uses the same configuration as Rainier. (From meta-ibm rev: 499fc3dae676b969abe64ec58aaa3021910c7bfa) Change-Id: Id8520b86804d2495e37a1b092491ceeddc2b11a0 Signed-off-by: Andrew Jeffery Signed-off-by: Andrew Geissler --- .../obmc-console/witherspoon-tacoma/client.2201.conf | 1 + .../obmc-console/witherspoon-tacoma/obmc-console.conf | 3 --- .../witherspoon-tacoma/server.ttyVUART0.conf | 3 +++ .../witherspoon-tacoma/server.ttyVUART1.conf | 3 +++ .../recipes-phosphor/console/obmc-console_%.bbappend | 18 ++++++++++++++++++ 5 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/client.2201.conf delete mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/obmc-console.conf create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART0.conf create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART1.conf (limited to 'meta-ibm') diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/client.2201.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/client.2201.conf new file mode 100644 index 0000000000..7264e82784 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/client.2201.conf @@ -0,0 +1 @@ +socket-id = guests diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/obmc-console.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/obmc-console.conf deleted file mode 100644 index 010d824684..0000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/obmc-console.conf +++ /dev/null @@ -1,3 +0,0 @@ -lpc-address = 0x3f8 -sirq = 4 -logsize = 256k diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART0.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART0.conf new file mode 100644 index 0000000000..010d824684 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART0.conf @@ -0,0 +1,3 @@ +lpc-address = 0x3f8 +sirq = 4 +logsize = 256k diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART1.conf new file mode 100644 index 0000000000..e98587f151 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART1.conf @@ -0,0 +1,3 @@ +lpc-address = 0x2f8 +sirq = 3 +socket-id = guests diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console_%.bbappend index 75ec2e0ba9..c10b7ce049 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console_%.bbappend @@ -44,3 +44,21 @@ EXTRA_OECONF_append_rainier = " --enable-concurrent-servers" do_install_append_rainier() { install_concurrent_console_config } + +SRC_URI_append_witherspoon-tacoma = " file://client.2201.conf" +SRC_URI_append_witherspoon-tacoma = " file://server.ttyVUART1.conf" + +REGISTERED_SERVICES_${PN}_append_witherspoon-tacoma = " obmc_console_guests:tcp:2201:" + +SYSTEMD_SERVICE_${PN}_append_witherspoon-tacoma = " obmc-console-ssh@2200.service \ + obmc-console-ssh@2201.service \ + " +SYSTEMD_SERVICE_${PN}_remove_witherspoon-tacoma = "obmc-console-ssh.socket" + +FILES_${PN}_remove_witherspoon-tacoma = "/lib/systemd/system/obmc-console-ssh@.service.d/use-socket.conf" + +EXTRA_OECONF_append_witherspoon-tacoma = " --enable-concurrent-servers" + +do_install_append_witherspoon-tacoma() { + install_concurrent_console_config +} -- cgit v1.2.3