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>

12 files changed, 12 insertions, 12 deletions

diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2200.conf b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2200.conf
index 901895bedb..ec15f2c99c 100644
--- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2200.conf
+++ b/meta-ampere/meta-mitchell/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-mitchell/recipes-phosphor/console/obmc-console/client.2201.conf b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2201.conf
index f06d9fccd6..36969eda7a 100644
--- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2201.conf
+++ b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2201.conf
@@ -1 +1 @@
-socket-id = ttyS1
+console-id = ttyS1
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2202.conf b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2202.conf
index dba9b8d836..c03071662e 100644
--- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2202.conf
+++ b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2202.conf
@@ -1 +1 @@
-socket-id = ttyS2
+console-id = ttyS2
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2203.conf b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2203.conf
index 0047b898fa..52f65caf45 100644
--- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2203.conf
+++ b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2203.conf
@@ -1 +1 @@
-socket-id = ttyS3
+console-id = ttyS3
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2204.conf b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2204.conf
index 2b99388ffb..4753bde09a 100644
--- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2204.conf
+++ b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2204.conf
@@ -1 +1 @@
-socket-id = ttyS7
+console-id = ttyS7
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2205.conf b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2205.conf
index 407f84cb9f..295dd14d2e 100644
--- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2205.conf
+++ b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2205.conf
@@ -1 +1 @@
-socket-id = ttyS8
+console-id = ttyS8
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS0.conf b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS0.conf
index 2d80850416..4cb90a73c6 100644
--- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS0.conf
+++ b/meta-ampere/meta-mitchell/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-mitchell/recipes-phosphor/console/obmc-console/server.ttyS1.conf b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS1.conf
index 6421f93397..4b0d09356f 100644
--- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS1.conf
+++ b/meta-ampere/meta-mitchell/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-mitchell/recipes-phosphor/console/obmc-console/server.ttyS2.conf b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS2.conf
index f8be872f25..faf3906553 100644
--- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS2.conf
+++ b/meta-ampere/meta-mitchell/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-mitchell/recipes-phosphor/console/obmc-console/server.ttyS3.conf b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS3.conf
index 8f1ebbac73..9cda930549 100644
--- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS3.conf
+++ b/meta-ampere/meta-mitchell/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
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS7.conf b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS7.conf
index decc72f293..11595e5b14 100644
--- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS7.conf
+++ b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS7.conf
@@ -1,3 +1,3 @@
 local-tty = ttyS7
 local-tty-baud = 115200
-socket-id = ttyS7
+console-id = ttyS7
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS8.conf b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS8.conf
index df56992ad9..ec2f9f32a0 100644
--- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS8.conf
+++ b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS8.conf
@@ -1,3 +1,3 @@
 local-tty = ttyS8
 local-tty-baud = 115200
-socket-id = ttyS8
+console-id = ttyS8