meta-facebook: simplify SERIAL_CONSOLES
The majority of our hardware uses ttyS4 and 57600. Rather than have
each machine specify this, put it into a generic "facebook" override
as the default for all our machines. Assuming OVERRIDES is set
correctly, machines can still make specific overrides as alternatives.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Id8b704163dc57d94e27481dba7aef1bdf66aeee5
diff --git a/meta-facebook/conf/machine/include/facebook.inc b/meta-facebook/conf/machine/include/facebook.inc
index 4951a60..47b641d 100644
--- a/meta-facebook/conf/machine/include/facebook.inc
+++ b/meta-facebook/conf/machine/include/facebook.inc
@@ -16,3 +16,5 @@
IMAGE_FEATURES:remove = "obmc-ikvm"
+# Most of our hardware uses the default ttyS4 but at 57600.
+SERIAL_CONSOLES:facebook = "57600;ttyS4"
diff --git a/meta-facebook/meta-bletchley/conf/machine/bletchley.conf b/meta-facebook/meta-bletchley/conf/machine/bletchley.conf
index 03af910..9427df2 100644
--- a/meta-facebook/meta-bletchley/conf/machine/bletchley.conf
+++ b/meta-facebook/meta-bletchley/conf/machine/bletchley.conf
@@ -11,6 +11,4 @@
require conf/machine/include/obmc-bsp-common.inc
require conf/machine/include/facebook-tpm2.inc
-SERIAL_CONSOLES = "57600;ttyS4"
-
FLASH_SIZE = "131072"
diff --git a/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf b/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf
index 1e6ee08..fce4b93 100644
--- a/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf
+++ b/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf
@@ -7,7 +7,5 @@
require conf/machine/include/ast2500.inc
require conf/machine/include/obmc-bsp-common.inc
-SERIAL_CONSOLES = "57600;ttyS4"
-
PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= ""
FLASH_SIZE = "32768"
diff --git a/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf b/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf
index d246cc9..f57383b 100644
--- a/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf
+++ b/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf
@@ -7,8 +7,6 @@
require conf/machine/include/ast2500.inc
require conf/machine/include/obmc-bsp-common.inc
-SERIAL_CONSOLES = "57600;ttyS4"
-
PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= ""
FLASH_SIZE = "32768"
OBMC_HOST_INSTANCES = "1 2 3 4"