| commit | f1cc98c91f06c57d39785bed8268a75a43999430 | [log] [tgz] |
|---|---|---|
| author | Patrick Williams <patrick@stwcx.xyz> | Thu Aug 25 14:34:50 2016 -0500 |
| committer | Patrick Williams <patrick@stwcx.xyz> | Mon Aug 29 16:00:10 2016 +0000 |
| tree | 0ae899d3895944cdd8812cd1b38e20c43b85923b | |
| parent | 5b348caf5c45d875cbf077c4d54e9312abf72330 [diff] |
obmc-console: Move dev to ttyS0 and fix invocation The latest kernel moved the VUART from ttyS5 to ttyS0, so perform coresponding change in obmc-console. Also, the latest version of obmc-console expects the device to be passed as a parameter instead of coming from the config file, so do that as well. Fixes openbmc/openbmc#523 Change-Id: I139dbb67165aa85d7d0465fd78bcdfeed0c3f8da Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-console/obmc-console/obmc-console.conf b/meta-phosphor/common/recipes-phosphor/obmc-console/obmc-console/obmc-console.conf index d324efc..d42caa9 100644 --- a/meta-phosphor/common/recipes-phosphor/obmc-console/obmc-console/obmc-console.conf +++ b/meta-phosphor/common/recipes-phosphor/obmc-console/obmc-console/obmc-console.conf
@@ -1,3 +1,2 @@ -device = ttyS5 lpc-address = 0x3f8 sirq = 4
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-console/obmc-console/obmc-console.service b/meta-phosphor/common/recipes-phosphor/obmc-console/obmc-console/obmc-console.service index 4e08541..2f540ea 100644 --- a/meta-phosphor/common/recipes-phosphor/obmc-console/obmc-console/obmc-console.service +++ b/meta-phosphor/common/recipes-phosphor/obmc-console/obmc-console/obmc-console.service
@@ -2,7 +2,7 @@ Description=OpenBMC console daemon [Service] -ExecStart=/usr/sbin/obmc-console-server +ExecStart=/usr/sbin/obmc-console-server ttyS0 Restart=always [Install]