From e493792ecd6710f821e505facc1fe3e24f765979 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Fri, 5 Nov 2021 10:04:42 -0500 Subject: 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 Change-Id: Id8b704163dc57d94e27481dba7aef1bdf66aeee5 --- meta-facebook/conf/machine/include/facebook.inc | 2 ++ meta-facebook/meta-bletchley/conf/machine/bletchley.conf | 2 -- meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf | 2 -- meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf | 2 -- 4 files changed, 2 insertions(+), 6 deletions(-) (limited to 'meta-facebook') diff --git a/meta-facebook/conf/machine/include/facebook.inc b/meta-facebook/conf/machine/include/facebook.inc index 4951a60cf..47b641dfc 100644 --- a/meta-facebook/conf/machine/include/facebook.inc +++ b/meta-facebook/conf/machine/include/facebook.inc @@ -16,3 +16,5 @@ PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-fb-apps" 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 03af91001..9427df28a 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/ast2600.inc 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 1e6ee084b..fce4b93f2 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/facebook-compute-singlehost.inc 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 d246cc9b3..f57383b8c 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/facebook-compute-multihost.inc 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" -- cgit v1.2.3