| commit | 65edf7d796c34012982632d0a724d80ff44c9e4a | [log] [tgz] |
|---|---|---|
| author | Matt Spinler <spinler@us.ibm.com> | Mon Sep 18 15:50:53 2017 -0500 |
| committer | Matt Spinler <spinler@us.ibm.com> | Thu Oct 05 14:59:45 2017 -0500 |
| tree | df1a7d865c77ebfaa0fad633e1713567d74eb80d | |
| parent | 20c9cd06682face965c33c3e65a73951d9f4ef0f [diff] |
Use openpower-proc-control for fsi-scan This will do both the master and hub scans. Resolves openbmc/openbmc#2278 Change-Id: I6dac03f4c7db397b5b25922df46a11e065d2b254 Signed-off-by: Matt Spinler <spinler@us.ibm.com>
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi.bb index 26cab2c..5cb0053 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi.bb +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi.bb
@@ -5,6 +5,8 @@ inherit obmc-phosphor-systemd inherit obmc-phosphor-license +RDEPENDS_${PN} += "op-proc-control" + TGTFMT = "obmc-chassis-poweron@{0}.target" TMPL_SCAN = "fsi-scan@.service"
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-scan@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-scan@.service index c8db153..d8f2888 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-scan@.service +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-scan@.service
@@ -7,7 +7,9 @@ Conflicts=obmc-chassis-poweroff@%i.target [Service] -ExecStart=/bin/sh -c "if [ -f /sys/bus/platform/devices/gpio-fsi/fsi0/rescan ]; then echo 1 > /sys/bus/platform/devices/gpio-fsi/fsi0/rescan; else echo 1 > /sys/bus/platform/devices/fsi-master/scan; fi" +ExecStart=/usr/bin/env openpower-proc-control scanFSI +SyslogIdentifier=openpower-proc-control + Type=oneshot RemainAfterExit=yes