meta-romulus: Remove vcs workaround
Romulus uses CPLD trigger for vcs workaround and it is not needed
anymore for DD2.0 CPU.
Change-Id: I21b3c15f81b1b7be9aaab03f5f951731fc686c38
Signed-off-by: Lei YU <mine260309@gmail.com>
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/machine/romulus.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/machine/romulus.conf
index 06572a8..eabb756 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/machine/romulus.conf
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/machine/romulus.conf
@@ -3,7 +3,7 @@
UBOOT_MACHINE = "ast_g5_ncsi_config"
-PREFERRED_PROVIDER_virtual/p9-vcs-workaround = 'cpld-trigger'
+PREFERRED_PROVIDER_virtual/p9-vcs-workaround = ''
require conf/machine/include/ast2500.inc
require conf/machine/include/obmc-bsp-common.inc
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/cpld-trigger.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/cpld-trigger.bb
deleted file mode 100644
index 6236116..0000000
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/cpld-trigger.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-SUMMARY = "Romulus CPLD Trigger"
-DESCRIPTION = "Romulus power on workaround to trigger CPLD to continue power sequence"
-PR = "r0"
-
-inherit obmc-phosphor-systemd
-inherit obmc-phosphor-license
-
-RDEPENDS_${PN} += "obmc-pydevtools"
-
-PROVIDES += 'virtual/p9-vcs-workaround'
-RPROVIDES_${PN} += 'virtual-p9-vcs-workaround'
-
-S = "${WORKDIR}"
-SRC_URI += "file://cpld_trigger.sh \
- file://cpld_reset.sh"
-
-do_install() {
- install -d ${D}${bindir}
- install -m 0755 ${WORKDIR}/cpld_trigger.sh ${D}${bindir}/cpld_trigger.sh
- install -m 0755 ${WORKDIR}/cpld_reset.sh ${D}${bindir}/cpld_reset.sh
-}
-
-TMPL = "cpld_trigger@.service"
-TMPL_RESET = "cpld_reset@.service"
-INSTFMT = "cpld_trigger@{0}.service"
-INSTFMT_RESET = "cpld_reset@{0}.service"
-TGTFMT = "obmc-chassis-poweron@{0}.target"
-TGTFMT_RESET = "obmc-chassis-poweroff@{0}.target"
-FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}"
-FMT_RESET = "../${TMPL_RESET}:${TGTFMT_RESET}.requires/${INSTFMT_RESET}"
-
-SYSTEMD_SERVICE_${PN} += "${TMPL}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}"
-
-SYSTEMD_SERVICE_${PN} += "${TMPL_RESET}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_RESET', 'OBMC_CHASSIS_INSTANCES')}"
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_reset.sh b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_reset.sh
deleted file mode 100644
index f6f06ee..0000000
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_reset.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# Reset CPLD
-gpioutil -p S7 -d out -v 1
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_reset@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_reset@.service
deleted file mode 100644
index c59461e..0000000
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_reset@.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Reset CPLD to wait after VDD is powered up
-Wants=op-wait-power-off@%i.service
-After=op-wait-power-off@%i.service
-Conflicts=obmc-chassis-poweron@%i.target
-
-[Service]
-ExecStart=/usr/bin/env cpld_reset.sh
-SyslogIdentifier=cpld_reset.sh
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-WantedBy=obmc-chassis-poweroff@%i.target
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_trigger.sh b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_trigger.sh
deleted file mode 100644
index 9c7bf9a..0000000
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_trigger.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# Trigger CPLD to give pgood signal
-gpioutil -p S7 -d out -v 0
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_trigger@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_trigger@.service
deleted file mode 100644
index b240b3e..0000000
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_trigger@.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Trigger CPLD to give pgood
-Wants=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-chassis-poweroff@%i.target
-
-[Service]
-ExecStart=/usr/bin/env cpld_trigger.sh
-SyslogIdentifier=cpld_trigger.sh
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-WantedBy=obmc-chassis-poweron@%i.target
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/host/p9-host-start.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/host/p9-host-start.bbappend
index ac2013f..4cac490 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/host/p9-host-start.bbappend
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/host/p9-host-start.bbappend
@@ -1,2 +1,3 @@
RDEPENDS_${PN} += 'avsbus-control'
RDEPENDS_${PN} += 'vrm-control'
+RDEPENDS_${PN}_remove += "p9-vcs-workaround"