From cebd819f2515d84d18642e672c86efb9876a8d6f Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Thu, 8 Aug 2019 15:32:29 -0400 Subject: 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 --- meta-aspeed/conf/machine/evb-ast2500.conf | 2 ++ meta-aspeed/conf/machine/evb-ast2600.conf | 2 ++ meta-aspeed/conf/machine/include/aspeed.inc | 2 ++ meta-aspeed/conf/machine/include/ast2400.inc | 2 -- meta-aspeed/conf/machine/include/ast2500.inc | 2 -- 5 files changed, 6 insertions(+), 4 deletions(-) (limited to 'meta-aspeed/conf/machine') diff --git a/meta-aspeed/conf/machine/evb-ast2500.conf b/meta-aspeed/conf/machine/evb-ast2500.conf index 2689d3796..e8aebd18f 100644 --- a/meta-aspeed/conf/machine/evb-ast2500.conf +++ b/meta-aspeed/conf/machine/evb-ast2500.conf @@ -2,3 +2,5 @@ KERNEL_DEVICETREE = "aspeed-ast2500-evb.dtb" 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 fd72baa17..9c8c64963 100644 --- a/meta-aspeed/conf/machine/evb-ast2600.conf +++ b/meta-aspeed/conf/machine/evb-ast2600.conf @@ -2,3 +2,5 @@ KERNEL_DEVICETREE = "aspeed-ast2600-evb.dtb" 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 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" -- cgit v1.2.3