From c9235698b948e6dd1209b34013436a14bd2b4dab Mon Sep 17 00:00:00 2001 From: Adriana Kobylak Date: Thu, 25 Mar 2021 16:36:59 +0000 Subject: ibm: obmc-console: Replace rainier with p10bmc The IBM rainier machine name is being replaced with the generic p10bmc. Tested: Built rainier and verified the console files were installed: rainier-openbmc-linux-gnueabi/obmc-phosphor-image/1.0-r0/rootfs/etc/obmc-console/ Change-Id: Ida1010ae6c6c0e1eecf2b62521c06bfe055b0d88 Signed-off-by: Adriana Kobylak --- .../console/obmc-console/p10bmc/client.2201.conf | 1 + .../console/obmc-console/p10bmc/server.ttyVUART0.conf | 5 +++++ .../console/obmc-console/p10bmc/server.ttyVUART1.conf | 3 +++ .../console/obmc-console/rainier/client.2201.conf | 1 - .../console/obmc-console/rainier/server.ttyVUART0.conf | 5 ----- .../console/obmc-console/rainier/server.ttyVUART1.conf | 3 --- .../recipes-phosphor/console/obmc-console_%.bbappend | 16 ++++++++-------- 7 files changed, 17 insertions(+), 17 deletions(-) create mode 100644 meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/client.2201.conf create mode 100644 meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/server.ttyVUART0.conf create mode 100644 meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/server.ttyVUART1.conf delete mode 100644 meta-ibm/recipes-phosphor/console/obmc-console/rainier/client.2201.conf delete mode 100644 meta-ibm/recipes-phosphor/console/obmc-console/rainier/server.ttyVUART0.conf delete mode 100644 meta-ibm/recipes-phosphor/console/obmc-console/rainier/server.ttyVUART1.conf (limited to 'meta-ibm/recipes-phosphor/console') diff --git a/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/client.2201.conf b/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/client.2201.conf new file mode 100644 index 000000000..7264e8278 --- /dev/null +++ b/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/client.2201.conf @@ -0,0 +1 @@ +socket-id = guests diff --git a/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/server.ttyVUART0.conf b/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/server.ttyVUART0.conf new file mode 100644 index 000000000..638ae7e5d --- /dev/null +++ b/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/server.ttyVUART0.conf @@ -0,0 +1,5 @@ +lpc-address = 0x3f8 +sirq = 4 +local-tty = ttyS0 +local-tty-baud = 115200 +logsize = 256k diff --git a/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/server.ttyVUART1.conf b/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/server.ttyVUART1.conf new file mode 100644 index 000000000..e98587f15 --- /dev/null +++ b/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/server.ttyVUART1.conf @@ -0,0 +1,3 @@ +lpc-address = 0x2f8 +sirq = 3 +socket-id = guests diff --git a/meta-ibm/recipes-phosphor/console/obmc-console/rainier/client.2201.conf b/meta-ibm/recipes-phosphor/console/obmc-console/rainier/client.2201.conf deleted file mode 100644 index 7264e8278..000000000 --- a/meta-ibm/recipes-phosphor/console/obmc-console/rainier/client.2201.conf +++ /dev/null @@ -1 +0,0 @@ -socket-id = guests diff --git a/meta-ibm/recipes-phosphor/console/obmc-console/rainier/server.ttyVUART0.conf b/meta-ibm/recipes-phosphor/console/obmc-console/rainier/server.ttyVUART0.conf deleted file mode 100644 index 638ae7e5d..000000000 --- a/meta-ibm/recipes-phosphor/console/obmc-console/rainier/server.ttyVUART0.conf +++ /dev/null @@ -1,5 +0,0 @@ -lpc-address = 0x3f8 -sirq = 4 -local-tty = ttyS0 -local-tty-baud = 115200 -logsize = 256k diff --git a/meta-ibm/recipes-phosphor/console/obmc-console/rainier/server.ttyVUART1.conf b/meta-ibm/recipes-phosphor/console/obmc-console/rainier/server.ttyVUART1.conf deleted file mode 100644 index e98587f15..000000000 --- a/meta-ibm/recipes-phosphor/console/obmc-console/rainier/server.ttyVUART1.conf +++ /dev/null @@ -1,3 +0,0 @@ -lpc-address = 0x2f8 -sirq = 3 -socket-id = guests diff --git a/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend b/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend index c10b7ce04..a35e6d4c7 100644 --- a/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend @@ -27,21 +27,21 @@ install_concurrent_console_config() { install -m 0644 ${WORKDIR}/server.ttyVUART1.conf ${D}${sysconfdir}/${BPN}/ } -SRC_URI_append_rainier = " file://client.2201.conf" -SRC_URI_append_rainier = " file://server.ttyVUART1.conf" +SRC_URI_append_p10bmc = " file://client.2201.conf" +SRC_URI_append_p10bmc = " file://server.ttyVUART1.conf" -REGISTERED_SERVICES_${PN}_append_rainier = " obmc_console_guests:tcp:2201:" +REGISTERED_SERVICES_${PN}_append_p10bmc = " obmc_console_guests:tcp:2201:" -SYSTEMD_SERVICE_${PN}_append_rainier = " obmc-console-ssh@2200.service \ +SYSTEMD_SERVICE_${PN}_append_p10bmc = " obmc-console-ssh@2200.service \ obmc-console-ssh@2201.service \ " -SYSTEMD_SERVICE_${PN}_remove_rainier = "obmc-console-ssh.socket" +SYSTEMD_SERVICE_${PN}_remove_p10bmc = "obmc-console-ssh.socket" -FILES_${PN}_remove_rainier = "/lib/systemd/system/obmc-console-ssh@.service.d/use-socket.conf" +FILES_${PN}_remove_p10bmc = "/lib/systemd/system/obmc-console-ssh@.service.d/use-socket.conf" -EXTRA_OECONF_append_rainier = " --enable-concurrent-servers" +EXTRA_OECONF_append_p10bmc = " --enable-concurrent-servers" -do_install_append_rainier() { +do_install_append_p10bmc() { install_concurrent_console_config } -- cgit v1.2.3