| commit | 499fc3dae676b969abe64ec58aaa3021910c7bfa | [log] [tgz] |
|---|---|---|
| author | Andrew Jeffery <andrew@aj.id.au> | Thu Apr 02 15:29:34 2020 +1030 |
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | Tue Apr 14 17:08:30 2020 +0000 |
| tree | b4f33ef023f4aaa02ad5bff692a3d7addd4f17fd | |
| parent | 9c0807e8741e95b33cad604d62138650ac2143ea [diff] |
meta-witherspoon: tacoma: Enable concurrent console servers The design uses the same configuration as Rainier. Change-Id: Ia24efe212388e554bb56dd53fb764d39036c8244 Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
diff --git a/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/client.2201.conf b/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/client.2201.conf new file mode 100644 index 0000000..7264e82 --- /dev/null +++ b/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/client.2201.conf
@@ -0,0 +1 @@ +socket-id = guests
diff --git a/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/obmc-console.conf b/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART0.conf similarity index 100% rename from meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/obmc-console.conf rename to meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART0.conf
diff --git a/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART1.conf b/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART1.conf new file mode 100644 index 0000000..e98587f --- /dev/null +++ b/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-witherspoon/recipes-phosphor/console/obmc-console_%.bbappend b/meta-witherspoon/recipes-phosphor/console/obmc-console_%.bbappend index 75ec2e0..c10b7ce 100644 --- a/meta-witherspoon/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-witherspoon/recipes-phosphor/console/obmc-console_%.bbappend
@@ -44,3 +44,21 @@ 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 +}