summaryrefslogtreecommitdiff
path: root/meta-aspeed/conf/machine
diff options
context:
space:
mode:
Diffstat (limited to 'meta-aspeed/conf/machine')
-rw-r--r--meta-aspeed/conf/machine/evb-ast2500.conf2
-rw-r--r--meta-aspeed/conf/machine/evb-ast2600.conf2
-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
5 files changed, 6 insertions, 4 deletions
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"