| commit | 7a612d4fa70fe6bfd39964c0191a82e6e4546188 | [log] [tgz] |
|---|---|---|
| author | Andrew Jeffery <andrew@aj.id.au> | Mon Jun 05 16:16:57 2023 +0930 |
| committer | Andrew Jeffery <andrew@aj.id.au> | Tue Jun 06 02:54:36 2023 +0000 |
| tree | 7e1f321d00309272f0b718fb58df510d3bb5bb3c | |
| parent | ced2bfd0ecf96fecfb4a1c946ce8465dd4c7524e [diff] |
obmc-console: Convert configs from socket-id to console-id
As of 9a8f30ec5b58 ("obmc-console: Introduce console-id, deprecate
socket-id") in obmc-console `console-id` is preferred over `socket-id`.
Convert all in-tree configurations to `console-id` to enable removal of
support for the deprecated `socket-id` configuration option.
Change-Id: Ifd50603c378cfed5eb793b829b8296b7964e4194
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/client.2200.conf b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/client.2200.conf index 901895b..ec15f2c 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/client.2200.conf +++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/client.2200.conf
@@ -1 +1 @@ -# socket-id is default to obmc-console +# console-id is default to obmc-console
diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/client.2201.conf b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/client.2201.conf index f06d9fc..36969ed 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/client.2201.conf +++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/client.2201.conf
@@ -1 +1 @@ -socket-id = ttyS1 +console-id = ttyS1
diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/client.2202.conf b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/client.2202.conf index dba9b8d..c030716 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/client.2202.conf +++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/client.2202.conf
@@ -1 +1 @@ -socket-id = ttyS2 +console-id = ttyS2
diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/client.2203.conf b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/client.2203.conf index 0047b89..52f65ca 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/client.2203.conf +++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/client.2203.conf
@@ -1 +1 @@ -socket-id = ttyS3 +console-id = ttyS3
diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS0.conf b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS0.conf index 2d80850..4cb90a7 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS0.conf +++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS0.conf
@@ -1,3 +1,3 @@ -# socket-id is default to obmc-console +# console-id is default to obmc-console local-tty = ttyS0 local-tty-baud = 115200
diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS1.conf b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS1.conf index 6421f93..4b0d093 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS1.conf +++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS1.conf
@@ -1,3 +1,3 @@ local-tty = ttyS1 local-tty-baud = 115200 -socket-id = ttyS1 +console-id = ttyS1
diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS2.conf b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS2.conf index f8be872..faf3906 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS2.conf +++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS2.conf
@@ -1,3 +1,3 @@ local-tty = ttyS2 local-tty-baud = 115200 -socket-id = ttyS2 +console-id = ttyS2
diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS3.conf b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS3.conf index 8f1ebba..9cda930 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS3.conf +++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS3.conf
@@ -1,3 +1,3 @@ local-tty = ttyS3 local-tty-baud = 115200 -socket-id = ttyS3 +console-id = ttyS3