diff options
author | Edward A. James <eajames@us.ibm.com> | 2017-04-26 00:20:23 +0300 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2017-05-26 07:57:25 +0300 |
commit | 45745f565a4bf2437579c37ac98d502204cdcfff (patch) | |
tree | f727e830f705c82734a8936b86219cee46e0a60e /meta-openbmc-machines | |
parent | 6f1166239b73b8439bdad16003d0064ec2a4126d (diff) | |
download | openbmc-45745f565a4bf2437579c37ac98d502204cdcfff.tar.xz |
Change FSI service files for 4.10
Latest FSI code changes paths, so we need to update the bind/unbind/scan
paths.
Change-Id: Ia1d8c5f31a8f0c8a69ca03121741a3ba35761c3a
Signed-off-by: Edward A. James <eajames@us.ibm.com>
Diffstat (limited to 'meta-openbmc-machines')
4 files changed, 7 insertions, 5 deletions
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-bind@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-bind@.service index 82399aee0..3e8564875 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-bind@.service +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-bind@.service @@ -8,9 +8,10 @@ Wants=fsi-scan@%i.service Before=fsi-scan@%i.service Conflicts=obmc-chassis-poweroff@%i.target ConditionDirectoryNotEmpty=!/sys/bus/platform/drivers/fsi-master-gpio/fsi-master +ConditionDirectoryNotEmpty=!/sys/bus/platform/drivers/fsi-master-gpio/gpio-fsi [Service] -ExecStart=/bin/sh -c "echo fsi-master > /sys/bus/platform/drivers/fsi-master-gpio/bind" +ExecStart=/bin/sh -c "echo fsi-master > /sys/bus/platform/drivers/fsi-master-gpio/bind || echo gpio-fsi > /sys/bus/platform/drivers/fsi-master-gpio/bind" Type=oneshot RemainAfterExit=yes diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-disable.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-disable.service index aa0b2e33e..5b353cc6f 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-disable.service +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-disable.service @@ -4,6 +4,6 @@ Conflicts=fsi-enable.service [Service] ExecStart=/usr/sbin/openpower-proc-control setSyncFSIClock -ExecStart=/bin/sh -c "echo fsi-master > /sys/bus/platform/drivers/fsi-master-gpio/unbind" +ExecStart=/bin/sh -c "echo fsi-master > /sys/bus/platform/drivers/fsi-master-gpio/unbind || echo gpio-fsi > /sys/bus/platform/drivers/fsi-master-gpio/unbind" Type=oneshot RemainAfterExit=yes diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-enable.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-enable.service index c5b1ea139..3dd068efc 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-enable.service +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-enable.service @@ -2,9 +2,10 @@ Description=Enable FSI Conflicts=fsi-disable.service ConditionDirectoryNotEmpty=!/sys/bus/platform/drivers/fsi-master-gpio/fsi-master +ConditionDirectoryNotEmpty=!/sys/bus/platform/drivers/fsi-master-gpio/gpio-fsi [Service] -ExecStart=/bin/sh -c "echo fsi-master > /sys/bus/platform/drivers/fsi-master-gpio/bind" -ExecStart=/bin/sh -c "echo 1 > /sys/bus/platform/devices/fsi-master/scan" +ExecStart=/bin/sh -c "echo fsi-master > /sys/bus/platform/drivers/fsi-master-gpio/bind || echo gpio-fsi > /sys/bus/platform/drivers/fsi-master-gpio/bind" +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" Type=oneshot RemainAfterExit=yes 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 4321422fd..c8db153ef 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,7 @@ Before=obmc-host-start-pre@%i.target Conflicts=obmc-chassis-poweroff@%i.target [Service] -ExecStart=/bin/sh -c "echo 1 > /sys/bus/platform/devices/fsi-master/scan" +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" Type=oneshot RemainAfterExit=yes |