summaryrefslogtreecommitdiffstats
path: root/meta-openbmc-bsp/meta-aspeed
diff options
context:
space:
mode:
authorJosh King <joshdkingTX@gmail.com>2016-09-30 14:40:14 -0500
committerPatrick Williams <patrick@stwcx.xyz>2016-10-20 17:25:56 +0000
commit3d4470fa0312e30dd817241aa40ceb5b458797e6 (patch)
tree3702cbff85f459f9894d5a987222c999fb6d2f90 /meta-openbmc-bsp/meta-aspeed
parent385b537ef94c0d73b932d9d57afb9e2e0f08708e (diff)
downloadtalos-openbmc-3d4470fa0312e30dd817241aa40ceb5b458797e6.tar.gz
talos-openbmc-3d4470fa0312e30dd817241aa40ceb5b458797e6.zip
Fixed build problem by modifying CONSOLES variable
Modified SERIAL_CONSOLES variable in the hardware systems so that we can get rid of the hacks file. The hacks file was used to manually stop the issue but now that is taken out and the issue is handled in the include files so the process doesn't start in the first place. This fixes issue number 586. Resolves openbmc/openbmc#586 Change-Id: I1eb54dae6cbec661f4b8865875e0fe5bd734c70c Signed-off-by: Josh King <jdking@us.ibm.com>
Diffstat (limited to 'meta-openbmc-bsp/meta-aspeed')
-rw-r--r--meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/machine/include/ast2400.inc2
-rw-r--r--meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/machine/include/ast2500.inc3
2 files changed, 5 insertions, 0 deletions
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/machine/include/ast2400.inc b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/machine/include/ast2400.inc
index 6e022835b..54a2ad60e 100644
--- a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/machine/include/ast2400.inc
+++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/machine/include/ast2400.inc
@@ -12,4 +12,6 @@ UBOOT_LOADADDRESS ?= "0x40001000"
MACHINE_EXTRA_RDEPENDS += "udev-aspeed-vuart"
+SERIAL_CONSOLES = "115200;ttyS4"
+
require conf/machine/include/tune-arm926ejs.inc
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/machine/include/ast2500.inc b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/machine/include/ast2500.inc
index 6d2feb6da..c8fc6da50 100644
--- a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/machine/include/ast2500.inc
+++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/machine/include/ast2500.inc
@@ -14,4 +14,7 @@ INITRD_IMAGE_LOADADDRESS = "0x81000000"
MACHINE_EXTRA_RDEPENDS += "udev-aspeed-vuart"
DEFAULTTUNE = "armv6-novfp"
+
+SERIAL_CONSOLES = "115200;ttyS4"
+
require conf/machine/include/arm/arch-armv6.inc
OpenPOWER on IntegriCloud