summaryrefslogtreecommitdiffstats
path: root/meta-openbmc-machines
diff options
context:
space:
mode:
authorJoel Stanley <joel@jms.id.au>2018-06-27 15:10:27 +0930
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2018-06-29 17:21:37 +0000
commit4f3d4bc051d2adc6f29fee480ddbe2250eabe4f6 (patch)
tree7f5eb393dac80b3dda1a86d103ab6b3ba8832d76 /meta-openbmc-machines
parent6c78692689082ea563bd1829de4be7a226079d09 (diff)
downloadtalos-openbmc-4f3d4bc051d2adc6f29fee480ddbe2250eabe4f6.tar.gz
talos-openbmc-4f3d4bc051d2adc6f29fee480ddbe2250eabe4f6.zip
openpower: Remove fsi-bind service
A year ago I added support for the external mode sysfs file to use when using cronus. This meant we did not need to un-bind the FSI driver. When that change went in we also should have removed the now-unused fsi-bind service. Change-Id: Ief0c2362f30f4dd7c320bf904000fe11be6b4914 Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'meta-openbmc-machines')
-rw-r--r--meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi.bb7
-rw-r--r--meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-bind@.service19
2 files changed, 1 insertions, 25 deletions
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 5cb005347..840b649f6 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
@@ -13,11 +13,6 @@ TMPL_SCAN = "fsi-scan@.service"
INSTFMT_SCAN = "fsi-scan@{0}.service"
FMT_SCAN = "../${TMPL_SCAN}:${TGTFMT}.requires/${INSTFMT_SCAN}"
-TMPL_BIND = "fsi-bind@.service"
-INSTFMT_BIND = "fsi-bind@{0}.service"
-FMT_BIND = "../${TMPL_BIND}:${TGTFMT}.requires/${INSTFMT_BIND}"
-
-SYSTEMD_SERVICE_${PN} += "${TMPL_SCAN} ${TMPL_BIND} fsi-enable.service fsi-disable.service"
+SYSTEMD_SERVICE_${PN} += "${TMPL_SCAN} fsi-enable.service fsi-disable.service"
SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_SCAN', 'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_BIND', 'OBMC_CHASSIS_INSTANCES')}"
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
deleted file mode 100644
index 3e8564875..000000000
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-bind@.service
+++ /dev/null
@@ -1,19 +0,0 @@
-[Unit]
-Description=Bind FSI Driver
-Wants=obmc-power-on@%i.target
-After=obmc-power-on@%i.target
-Wants=obmc-host-start-pre@%i.target
-Before=obmc-host-start-pre@%i.target
-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 || echo gpio-fsi > /sys/bus/platform/drivers/fsi-master-gpio/bind"
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-RequiredBy=obmc-chassis-poweron@%i.target
OpenPOWER on IntegriCloud