Revert "Add service to monitor the UCD90160 at runtime"
This reverts commit 8dac5fdbe854a5684664cd54f450094de0606a88.
It went in a little early. Will put back in later.
Resolves openbmc/openbmc#2235
Change-Id: Ia6d6e34460b668d2134f678c4a32d853bbf2f19d
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
diff --git a/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis-error-native.bb b/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis-error-native.bb
index 0ee635c..068d792 100644
--- a/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis-error-native.bb
+++ b/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis-error-native.bb
@@ -15,5 +15,4 @@
DEST=${yaml_dir}/xyz/openbmc_project/Power
install -d ${DEST}
install ${SRC}/Fault.errors.yaml ${DEST}
- install ${SRC}/Fault.metadata.yaml ${DEST}
}
diff --git a/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.bb b/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.bb
index f9b0e2a..57ee0fe 100644
--- a/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.bb
+++ b/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.bb
@@ -24,11 +24,8 @@
"
CHASSIS_ON_TGT = "obmc-chassis-poweron@0.target"
-SEQ_MONITOR_SVC = "witherspoon-pseq-monitor.service"
-SEQ_MONITOR_FMT = "../${SEQ_MONITOR_SVC}:${CHASSIS_ON_TGT}.wants/${SEQ_MONITOR_SVC}"
-
SEQ_PGOOD_SVC = "witherspoon-pseq-monitor-pgood.service"
SEQ_PGOOD_FMT = "../${SEQ_PGOOD_SVC}:${CHASSIS_ON_TGT}.wants/${SEQ_PGOOD_SVC}"
-SYSTEMD_SERVICE_${PN} += "${SEQ_MONITOR_SVC} ${SEQ_PGOOD_SVC}"
-SYSTEMD_LINK_${PN} += "${SEQ_MONITOR_FMT} ${SEQ_PGOOD_FMT}"
+SYSTEMD_SERVICE_${PN} += "${SEQ_PGOOD_SVC}"
+SYSTEMD_LINK_${PN} += "${SEQ_PGOOD_FMT}"
diff --git a/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-pseq-monitor.service b/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-pseq-monitor.service
deleted file mode 100644
index d0ba9a9..0000000
--- a/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-pseq-monitor.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Witherspoon Power Sequencer Runtime Monitor
-Wants=obmc-host-start-pre@0.target
-Before=obmc-host-start-pre@0.target
-Wants=vcs_on@0.service
-After=vcs_on@0.service
-Conflicts=obmc-chassis-poweroff@0.target
-
-[Service]
-ExecStart=/usr/bin/env witherspoon-pseq-monitor -a runtime-monitor -i 1
-SyslogIdentifier=witherspoon-pseq-monitor