From e161514219e0dc8a957dabbb8529fb9fcac4e115 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Wed, 22 Apr 2020 14:06:02 -0400 Subject: meta-ibm: move all meta-witherspoon metadata The metadata common to all IBM systems is confusingly split between meta-ibm and meta-witherspoon. Move everything to meta-ibm. The meta-ibm README is re-written to more accurately reflect the scope of the layer. Allow the configuration samples (bblayers.conf.sample, local.conf.sample) to be sourced from either meta-ibm or meta-witherspoon until such a time that any workflows and tooling have had the opportunity to move to meta-ibm. (From meta-ibm rev: 6e05ef2e90b214eaf4e43ee7027bbbb1d8d09442) Change-Id: I3ec890d5300f9649c974ea6b9dca93a2e8a889ab Signed-off-by: Brad Bishop Signed-off-by: Andrew Geissler --- .../ibm-ac-server/server.ttyVUART0.conf | 5 ++ .../obmc-console/mihawk/server.ttyVUART0.conf | 4 ++ .../console/obmc-console/rainier/client.2201.conf | 1 + .../obmc-console/rainier/server.ttyVUART0.conf | 5 ++ .../obmc-console/rainier/server.ttyVUART1.conf | 3 + .../witherspoon-tacoma/client.2201.conf | 1 + .../witherspoon-tacoma/server.ttyVUART0.conf | 3 + .../witherspoon-tacoma/server.ttyVUART1.conf | 3 + .../console/obmc-console_%.bbappend | 64 ++++++++++++++++++++++ 9 files changed, 89 insertions(+) create mode 100644 meta-ibm/recipes-phosphor/console/obmc-console/ibm-ac-server/server.ttyVUART0.conf create mode 100755 meta-ibm/recipes-phosphor/console/obmc-console/mihawk/server.ttyVUART0.conf create mode 100644 meta-ibm/recipes-phosphor/console/obmc-console/rainier/client.2201.conf create mode 100644 meta-ibm/recipes-phosphor/console/obmc-console/rainier/server.ttyVUART0.conf create mode 100644 meta-ibm/recipes-phosphor/console/obmc-console/rainier/server.ttyVUART1.conf create mode 100644 meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/client.2201.conf create mode 100644 meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART0.conf create mode 100644 meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART1.conf create mode 100644 meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend (limited to 'meta-ibm/recipes-phosphor/console') diff --git a/meta-ibm/recipes-phosphor/console/obmc-console/ibm-ac-server/server.ttyVUART0.conf b/meta-ibm/recipes-phosphor/console/obmc-console/ibm-ac-server/server.ttyVUART0.conf new file mode 100644 index 000000000..638ae7e5d --- /dev/null +++ b/meta-ibm/recipes-phosphor/console/obmc-console/ibm-ac-server/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/mihawk/server.ttyVUART0.conf b/meta-ibm/recipes-phosphor/console/obmc-console/mihawk/server.ttyVUART0.conf new file mode 100755 index 000000000..a5ba3f328 --- /dev/null +++ b/meta-ibm/recipes-phosphor/console/obmc-console/mihawk/server.ttyVUART0.conf @@ -0,0 +1,4 @@ +lpc-address = 0x3f8 +sirq = 4 +local-tty = ttyS0 +local-tty-baud = 115200 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 new file mode 100644 index 000000000..7264e8278 --- /dev/null +++ b/meta-ibm/recipes-phosphor/console/obmc-console/rainier/client.2201.conf @@ -0,0 +1 @@ +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 new file mode 100644 index 000000000..638ae7e5d --- /dev/null +++ b/meta-ibm/recipes-phosphor/console/obmc-console/rainier/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/rainier/server.ttyVUART1.conf b/meta-ibm/recipes-phosphor/console/obmc-console/rainier/server.ttyVUART1.conf new file mode 100644 index 000000000..e98587f15 --- /dev/null +++ b/meta-ibm/recipes-phosphor/console/obmc-console/rainier/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/witherspoon-tacoma/client.2201.conf b/meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/client.2201.conf new file mode 100644 index 000000000..7264e8278 --- /dev/null +++ b/meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/client.2201.conf @@ -0,0 +1 @@ +socket-id = guests diff --git a/meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART0.conf b/meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART0.conf new file mode 100644 index 000000000..010d82468 --- /dev/null +++ b/meta-ibm/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/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART1.conf b/meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART1.conf new file mode 100644 index 000000000..e98587f15 --- /dev/null +++ b/meta-ibm/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/recipes-phosphor/console/obmc-console_%.bbappend b/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend new file mode 100644 index 000000000..c10b7ce04 --- /dev/null +++ b/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend @@ -0,0 +1,64 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI_remove = "file://${BPN}.conf" +SRC_URI += "file://server.ttyVUART0.conf" + +install_concurrent_console_config() { + # Install configuration for the servers and clients. Keep commandline + # compatibility with previous configurations by defaulting to not + # specifying a socket-id for VUART0/2200 + install -m 0755 -d ${D}${sysconfdir}/${BPN} + + # Remove the default client configuration as we don't to define a + # socket-id for the 2200 console + rm -f ${D}${sysconfdir}/${BPN}/client.2200.conf + + # However, now link to /dev/null as a way of not specifying a + # socket-id while having a configuration file present. We need to + # provide a configuration path to meet the requirements of the packaged + # unit file. + ln -sr ${D}/dev/null ${D}${sysconfdir}/${BPN}/client.2200.conf + + # We need to populate socket-id for remaining consoles + install -m 0644 ${WORKDIR}/client.2201.conf ${D}${sysconfdir}/${BPN}/ + + # Install configuration for remaining servers - the base recipe + # installs the configuration for the first. + 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" + +REGISTERED_SERVICES_${PN}_append_rainier = " obmc_console_guests:tcp:2201:" + +SYSTEMD_SERVICE_${PN}_append_rainier = " obmc-console-ssh@2200.service \ + obmc-console-ssh@2201.service \ + " +SYSTEMD_SERVICE_${PN}_remove_rainier = "obmc-console-ssh.socket" + +FILES_${PN}_remove_rainier = "/lib/systemd/system/obmc-console-ssh@.service.d/use-socket.conf" + +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