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>
diff --git a/meta-aspeed/conf/machine/evb-ast2500.conf b/meta-aspeed/conf/machine/evb-ast2500.conf
index 2689d37..e8aebd1 100644
--- a/meta-aspeed/conf/machine/evb-ast2500.conf
+++ b/meta-aspeed/conf/machine/evb-ast2500.conf
@@ -2,3 +2,5 @@
UBOOT_MACHINE = "ast_g5_phy_config"
require conf/machine/include/ast2500.inc
+
+SERIAL_CONSOLES = "115200;ttyS4"
diff --git a/meta-aspeed/conf/machine/evb-ast2600.conf b/meta-aspeed/conf/machine/evb-ast2600.conf
index fd72baa..9c8c649 100644
--- a/meta-aspeed/conf/machine/evb-ast2600.conf
+++ b/meta-aspeed/conf/machine/evb-ast2600.conf
@@ -2,3 +2,5 @@
UBOOT_MACHINE = "evb-ast2600_defconfig"
require conf/machine/include/ast2600.inc
+
+SERIAL_CONSOLES = "115200;ttyS4"
diff --git a/meta-aspeed/conf/machine/include/aspeed.inc b/meta-aspeed/conf/machine/include/aspeed.inc
index 384ff48..4bed9e3 100644
--- a/meta-aspeed/conf/machine/include/aspeed.inc
+++ b/meta-aspeed/conf/machine/include/aspeed.inc
@@ -15,3 +15,5 @@
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 a7c900a..547a3c0 100644
--- a/meta-aspeed/conf/machine/include/ast2400.inc
+++ b/meta-aspeed/conf/machine/include/ast2400.inc
@@ -12,5 +12,3 @@
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 49a6211..34039b4 100644
--- a/meta-aspeed/conf/machine/include/ast2500.inc
+++ b/meta-aspeed/conf/machine/include/ast2500.inc
@@ -14,5 +14,3 @@
UBOOT_LOADADDRESS ?= "0x80001000"
MACHINE_EXTRA_RDEPENDS += "udev-aspeed-vuart"
-
-SERIAL_CONSOLES = "115200;ttyS4"