From 65edf7d796c34012982632d0a724d80ff44c9e4a Mon Sep 17 00:00:00 2001 From: Matt Spinler Date: Mon, 18 Sep 2017 15:50:53 -0500 Subject: 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 --- .../meta-openpower/common/recipes-phosphor/fsi/op-fsi.bb | 2 ++ .../common/recipes-phosphor/fsi/op-fsi/fsi-scan@.service | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) 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 26cab2c07..5cb005347 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 @@ PR = "r1" 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 c8db153ef..d8f28882a 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 @@ Before=obmc-host-start-pre@%i.target 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 -- cgit v1.2.1