summaryrefslogtreecommitdiff
path: root/meta-aspeed/conf/machine/include
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2019-08-08 22:32:29 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2019-08-16 03:38:50 +0300
commitcebd819f2515d84d18642e672c86efb9876a8d6f (patch)
treeb0d246d51a16549fcdba9b503fd6124f458e341c /meta-aspeed/conf/machine/include
parent14d0a067a45fdaeb48adfbe8b596dd07cbc847fb (diff)
downloadopenbmc-cebd819f2515d84d18642e672c86efb9876a8d6f.tar.xz
aspeed: set SERIAL_CONSOLES correctly
Provide a default setting for SERIAL_CONSOLES for all Aspeed SOCs. Set the SERIAL_CONSOLE for the g5 and g6 evb explicitly, in case the default changes. (From meta-aspeed rev: b539e873a7731bad9eee83e17838a78f281d7b4b) Change-Id: I1ee9f44535cd009de25baccacada36cd58ad4f10 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-aspeed/conf/machine/include')
-rw-r--r--meta-aspeed/conf/machine/include/aspeed.inc2
-rw-r--r--meta-aspeed/conf/machine/include/ast2400.inc2
-rw-r--r--meta-aspeed/conf/machine/include/ast2500.inc2
3 files changed, 2 insertions, 4 deletions
diff --git a/meta-aspeed/conf/machine/include/aspeed.inc b/meta-aspeed/conf/machine/include/aspeed.inc
index 384ff4809..4bed9e3bd 100644
--- a/meta-aspeed/conf/machine/include/aspeed.inc
+++ b/meta-aspeed/conf/machine/include/aspeed.inc
@@ -15,3 +15,5 @@ INITRAMFS_IMAGE ?= "aspeed-image-initramfs"
INITRAMFS_FSTYPES ?= "cpio.xz"
MACHINEOVERRIDES =. "aspeed:"
+
+SERIAL_CONSOLES ?= "115200;ttyS4"
diff --git a/meta-aspeed/conf/machine/include/ast2400.inc b/meta-aspeed/conf/machine/include/ast2400.inc
index a7c900aa7..547a3c075 100644
--- a/meta-aspeed/conf/machine/include/ast2400.inc
+++ b/meta-aspeed/conf/machine/include/ast2400.inc
@@ -12,5 +12,3 @@ UBOOT_ENTRYPOINT ?= "0x40001000"
UBOOT_LOADADDRESS ?= "0x40001000"
MACHINE_EXTRA_RDEPENDS += "udev-aspeed-vuart"
-
-SERIAL_CONSOLES = "115200;ttyS4"
diff --git a/meta-aspeed/conf/machine/include/ast2500.inc b/meta-aspeed/conf/machine/include/ast2500.inc
index 49a62110a..34039b4cb 100644
--- a/meta-aspeed/conf/machine/include/ast2500.inc
+++ b/meta-aspeed/conf/machine/include/ast2500.inc
@@ -14,5 +14,3 @@ UBOOT_ENTRYPOINT ?= "0x80001000"
UBOOT_LOADADDRESS ?= "0x80001000"
MACHINE_EXTRA_RDEPENDS += "udev-aspeed-vuart"
-
-SERIAL_CONSOLES = "115200;ttyS4"