meta-romulus: Re-order service units for power on
After OpenFSI driver is integrated, vcs_workaround now depends on
fsi_scan service, which depends on PGOOD.
Romulus previous vcs_workaround is run after CPLD gives power and
before PGOOD is asserted, and thus causes issue openbmc/openbmc#1420.
The fix is to move cpld_trigger before vcs_workaround, which will make
CPLD to assert PGOOD before it, and thus before fsi_scan.
Then Romulus is able to use the common vcs_workaround service, so
p9-vcs-workaround.bbappend is deleted.
Fixes openbmc/openbmc#1420
Change-Id: Ia6dee472185c74f382c15acf0e1f2ccb7ad288a2
Signed-off-by: Lei YU <mine260309@gmail.com>
diff --git a/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_trigger@.service b/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_trigger@.service
index b1b7e31..68c8ed9 100644
--- a/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_trigger@.service
+++ b/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_trigger@.service
@@ -1,7 +1,7 @@
[Unit]
Description=Trigger CPLD to give pgood
Wants=vcs_workaround@%i.service
-After=vcs_workaround@%i.service
+Before=vcs_workaround@%i.service
Wants=obmc-host-start-pre@%i.target
Before=obmc-host-start-pre@%i.target
Conflicts=obmc-power-chassis-off@%i.target
diff --git a/meta-romulus/recipes-phosphor/host/op-host-control/vcs_workaround@.service b/meta-romulus/recipes-phosphor/host/op-host-control/vcs_workaround@.service
deleted file mode 100644
index fa414b9..0000000
--- a/meta-romulus/recipes-phosphor/host/op-host-control/vcs_workaround@.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Run VCS workaround on host%i
-Wants=avsbus-enable@%i.service
-After=avsbus-enable@%i.service
-Conflicts=obmc-power-chassis-off@%i.target
-
-[Service]
-ExecStart={sbindir}/openpower-proc-control vcsWorkaround
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-WantedBy=obmc-power-chassis-on@%i.target
diff --git a/meta-romulus/recipes-phosphor/host/p9-vcs-workaround.bbappend b/meta-romulus/recipes-phosphor/host/p9-vcs-workaround.bbappend
deleted file mode 100644
index d1d952e..0000000
--- a/meta-romulus/recipes-phosphor/host/p9-vcs-workaround.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/op-host-control:"