From 1de5d0fed32fdc705e074c119630cbab10f0daf0 Mon Sep 17 00:00:00 2001 From: Vijay Khemka Date: Mon, 13 Apr 2020 13:51:18 -0700 Subject: meta-facebook: obmc-console: Fix SoL with new design With new design changes in obmc-console, config file needed changes to follow design. Also created separate directorey for machine to have machine specific config file. Tested: Verified this with tiogapass and see ttyS2 service is launching. (From meta-facebook rev: fc641dad18c84b391ce27da202a417f28d4da00b) Change-Id: I811e8241fd40fa503aa9861894602344c85eba5f Signed-off-by: Vijay Khemka Signed-off-by: Andrew Geissler --- meta-facebook/recipes-phosphor/console/obmc-console/obmc-console.conf | 2 -- .../recipes-phosphor/console/obmc-console/tiogapass/obmc-console.conf | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 meta-facebook/recipes-phosphor/console/obmc-console/obmc-console.conf create mode 100644 meta-facebook/recipes-phosphor/console/obmc-console/tiogapass/obmc-console.conf (limited to 'meta-facebook/recipes-phosphor/console/obmc-console') diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-facebook/recipes-phosphor/console/obmc-console/obmc-console.conf deleted file mode 100644 index 94f1dff85..000000000 --- a/meta-facebook/recipes-phosphor/console/obmc-console/obmc-console.conf +++ /dev/null @@ -1,2 +0,0 @@ -local-tty = ttyS2 -baud = 57600 diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/tiogapass/obmc-console.conf b/meta-facebook/recipes-phosphor/console/obmc-console/tiogapass/obmc-console.conf new file mode 100644 index 000000000..94f1dff85 --- /dev/null +++ b/meta-facebook/recipes-phosphor/console/obmc-console/tiogapass/obmc-console.conf @@ -0,0 +1,2 @@ +local-tty = ttyS2 +baud = 57600 -- cgit v1.2.3 From 923b2488a0fab2fcea18c30a4012f7f62d2ff3ce Mon Sep 17 00:00:00 2001 From: Vijay Khemka Date: Mon, 13 Apr 2020 15:46:36 -0700 Subject: meta-facebook: console: Add support for YV2 platform. Added obmc-console multi host support for yosemiteV2 platform. Tested : Verified this on Yosemite V2 platform by launching all 4 server instance and verified SoL output from hosts. (From meta-facebook rev: c5c27cab30c0110f801ce3cbdb3b2f50a2a87ab2) Change-Id: I56fb843b8b8c3f86982d46fe1913c444b8db608a Signed-off-by: Vijay Khemka Signed-off-by: Andrew Geissler --- .../recipes-phosphor/console/obmc-console/yosemitev2/client.2200.conf | 1 + .../recipes-phosphor/console/obmc-console/yosemitev2/client.2201.conf | 1 + .../recipes-phosphor/console/obmc-console/yosemitev2/client.2202.conf | 1 + .../recipes-phosphor/console/obmc-console/yosemitev2/client.2203.conf | 1 + .../recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS0.conf | 3 +++ .../recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS1.conf | 3 +++ .../recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS2.conf | 3 +++ .../recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS3.conf | 3 +++ meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend | 3 +++ 9 files changed, 19 insertions(+) create mode 100644 meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2200.conf create mode 100644 meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2201.conf create mode 100644 meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2202.conf create mode 100644 meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2203.conf create mode 100644 meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS0.conf create mode 100644 meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS1.conf create mode 100644 meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS2.conf create mode 100644 meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS3.conf (limited to 'meta-facebook/recipes-phosphor/console/obmc-console') diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2200.conf b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2200.conf new file mode 100644 index 000000000..88aa57cff --- /dev/null +++ b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2200.conf @@ -0,0 +1 @@ +socket-id = host0 diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2201.conf b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2201.conf new file mode 100644 index 000000000..22273d4f3 --- /dev/null +++ b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2201.conf @@ -0,0 +1 @@ +socket-id = host1 diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2202.conf b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2202.conf new file mode 100644 index 000000000..0eeb5b785 --- /dev/null +++ b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2202.conf @@ -0,0 +1 @@ +socket-id = host2 diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2203.conf b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2203.conf new file mode 100644 index 000000000..be8e82e23 --- /dev/null +++ b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2203.conf @@ -0,0 +1 @@ +socket-id = host3 diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS0.conf b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS0.conf new file mode 100644 index 000000000..f800b35a7 --- /dev/null +++ b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS0.conf @@ -0,0 +1,3 @@ +local-tty = ttyS0 +baud = 57600 +socket-id = host0 diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS1.conf b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS1.conf new file mode 100644 index 000000000..4a605424b --- /dev/null +++ b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS1.conf @@ -0,0 +1,3 @@ +local-tty = ttyS1 +baud = 57600 +socket-id = host1 diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS2.conf b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS2.conf new file mode 100644 index 000000000..bf37ca363 --- /dev/null +++ b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS2.conf @@ -0,0 +1,3 @@ +local-tty = ttyS2 +baud = 57600 +socket-id = host2 diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS3.conf b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS3.conf new file mode 100644 index 000000000..d8c3ebfc5 --- /dev/null +++ b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS3.conf @@ -0,0 +1,3 @@ +local-tty = ttyS3 +baud = 57600 +socket-id = host3 diff --git a/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend b/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend index 06a91ceb8..ab61422cb 100644 --- a/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend @@ -4,6 +4,9 @@ OBMC_CONSOLE_HOST_TTY = "ttyS2" SRC_URI += "file://*.conf" SRC_URI_remove = "file://${BPN}.conf" +SYSTEMD_SERVICE_${PN}_remove_yosemitev2 = "obmc-console-ssh.socket" +EXTRA_OECONF_append_yosemitev2 = " --enable-concurrent-servers" + do_install_append() { # Install the server configuration install -m 0755 -d ${D}${sysconfdir}/${BPN} -- cgit v1.2.3