From 274f96aa19d8a5b241c4676f223d4398e5fb3918 Mon Sep 17 00:00:00 2001 From: Andrew Jeffery Date: Fri, 3 Apr 2020 16:20:51 +1030 Subject: meta-witherspoon: Migrate console configuration to new layout The obmc-console has rearranged its configuration file layout to cater to concurrent console server instances. Make use of the new layout. (From meta-ibm rev: 43fb498820e2b21282197833ed52124792a472e5) Change-Id: I124fd5cf37047651bc1f046039ad4b776eb2ff62 Signed-off-by: Andrew Jeffery Signed-off-by: Andrew Geissler --- .../console/obmc-console/ibm-ac-server/obmc-console.conf | 5 ----- .../console/obmc-console/ibm-ac-server/server.ttyVUART0.conf | 5 +++++ .../recipes-phosphor/console/obmc-console/mihawk/obmc-console.conf | 4 ---- .../console/obmc-console/mihawk/server.ttyVUART0.conf | 4 ++++ .../recipes-phosphor/console/obmc-console_%.bbappend | 3 +++ 5 files changed, 12 insertions(+), 9 deletions(-) delete mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/ibm-ac-server/obmc-console.conf create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/ibm-ac-server/server.ttyVUART0.conf delete mode 100755 meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/mihawk/obmc-console.conf create mode 100755 meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/mihawk/server.ttyVUART0.conf (limited to 'meta-ibm/meta-witherspoon') diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/ibm-ac-server/obmc-console.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/ibm-ac-server/obmc-console.conf deleted file mode 100644 index 638ae7e5d9..0000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/ibm-ac-server/obmc-console.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/meta-witherspoon/recipes-phosphor/console/obmc-console/ibm-ac-server/server.ttyVUART0.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/ibm-ac-server/server.ttyVUART0.conf new file mode 100644 index 0000000000..638ae7e5d9 --- /dev/null +++ b/meta-ibm/meta-witherspoon/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/meta-witherspoon/recipes-phosphor/console/obmc-console/mihawk/obmc-console.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/mihawk/obmc-console.conf deleted file mode 100755 index a5ba3f3284..0000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/mihawk/obmc-console.conf +++ /dev/null @@ -1,4 +0,0 @@ -lpc-address = 0x3f8 -sirq = 4 -local-tty = ttyS0 -local-tty-baud = 115200 diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/mihawk/server.ttyVUART0.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/mihawk/server.ttyVUART0.conf new file mode 100755 index 0000000000..a5ba3f3284 --- /dev/null +++ b/meta-ibm/meta-witherspoon/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/meta-witherspoon/recipes-phosphor/console/obmc-console_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console_%.bbappend index 72d991c7e5..b121be7af2 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console_%.bbappend @@ -1 +1,4 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI_remove = "file://${BPN}.conf" +SRC_URI += "file://server.ttyVUART0.conf" -- cgit v1.2.3