diff options
9 files changed, 2 insertions, 97 deletions
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-host-start.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-host-start.bb index 0d7d534ed..9b5716bf6 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-host-start.bb +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-host-start.bb @@ -10,7 +10,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/op-host-control:" PROVIDES += 'virtual/obmc-host-ctl' RPROVIDES_${PN} += 'virtual-obmc-host-ctl' -RDEPENDS_${PN} += "p9-vcs-workaround op-proc-control" +RDEPENDS_${PN} += "op-proc-control" S = "${WORKDIR}" diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-vcs-workaround.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-vcs-workaround.bb deleted file mode 100644 index 11ad79cb1..000000000 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-vcs-workaround.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "POWER9 VCS workaround" -DESCRIPTION = "Apply fixes over FSI to POWER9 CPUs prior to host power on" -PR = "r1" - -inherit obmc-phosphor-systemd -inherit obmc-phosphor-license - -FILESEXTRAPATHS_prepend := "${THISDIR}/op-host-control:" -RDEPENDS_${PN} += "virtual-p9-vcs-workaround op-proc-control" - -S = "${WORKDIR}" - -TMPL = "vcs_workaround@.service" -INSTFMT = "vcs_workaround@{0}.service" -TGTFMT = "obmc-chassis-poweron@{0}.target" -FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}" - -SYSTEMD_SERVICE_${PN} += "${TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-openbmc-machines/meta-openpower/conf/machine/include/p9.inc b/meta-openbmc-machines/meta-openpower/conf/machine/include/p9.inc index b0e0bb95e..4c30aac18 100644 --- a/meta-openbmc-machines/meta-openpower/conf/machine/include/p9.inc +++ b/meta-openbmc-machines/meta-openpower/conf/machine/include/p9.inc @@ -1,2 +1,2 @@ -OBMC_MACHINE_FEATURES += 'p9-vcs-workaround op-fsi p9-cfam-override' +OBMC_MACHINE_FEATURES += 'op-fsi p9-cfam-override' PREFERRED_PROVIDER_virtual/obmc-host-ctl = "p9-host-start" diff --git a/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/conf/machine/talos.conf b/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/conf/machine/talos.conf index c49c85b42..0f82819b2 100644 --- a/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/conf/machine/talos.conf +++ b/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/conf/machine/talos.conf @@ -7,8 +7,6 @@ OBMC_MACHINE_FEATURES += "obmc-mrw" OBMC_POWER_SUPPLY_INSTANCES = "0 1" -PREFERRED_PROVIDER_virtual/p9-vcs-workaround = 'fpga-trigger' - require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/rcs.inc diff --git a/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/chassis/fpga-trigger.bb b/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/chassis/fpga-trigger.bb deleted file mode 100644 index caa0f5b75..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/chassis/fpga-trigger.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "Talos II FPGA Trigger" -DESCRIPTION = "Talos II power on workaround to trigger FPGA 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://fpga_trigger.sh \ - file://fpga_reset.sh" - -do_install() { - install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/fpga_trigger.sh ${D}${bindir}/fpga_trigger.sh - install -m 0755 ${WORKDIR}/fpga_reset.sh ${D}${bindir}/fpga_reset.sh -} - -TMPL = "fpga_trigger@.service" -TMPL_RESET = "fpga_reset@.service" -INSTFMT = "fpga_trigger@{0}.service" -INSTFMT_RESET = "fpga_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-rcs/meta-talos/recipes-phosphor/chassis/fpga-trigger/fpga_reset.sh b/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/chassis/fpga-trigger/fpga_reset.sh deleted file mode 100644 index 7cd6db730..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/chassis/fpga-trigger/fpga_reset.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -# Reset FPGA -gpioutil -p S7 -d out -v 1 diff --git a/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/chassis/fpga-trigger/fpga_reset@.service b/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/chassis/fpga-trigger/fpga_reset@.service deleted file mode 100644 index fbf01c0c7..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/chassis/fpga-trigger/fpga_reset@.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Reset FPGA 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 fpga_reset.sh -SyslogIdentifier=fpga_reset.sh -Type=oneshot -RemainAfterExit=yes - -[Install] -WantedBy=obmc-chassis-poweroff@%i.target diff --git a/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/chassis/fpga-trigger/fpga_trigger.sh b/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/chassis/fpga-trigger/fpga_trigger.sh deleted file mode 100644 index eb821caef..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/chassis/fpga-trigger/fpga_trigger.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -# Trigger FPGA to give pgood signal -gpioutil -p S7 -d out -v 0 diff --git a/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/chassis/fpga-trigger/fpga_trigger@.service b/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/chassis/fpga-trigger/fpga_trigger@.service deleted file mode 100644 index f949f175c..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/chassis/fpga-trigger/fpga_trigger@.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Trigger FPGA 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 fpga_trigger.sh -SyslogIdentifier=fpga_trigger.sh -Type=oneshot -RemainAfterExit=yes - -[Install] -WantedBy=obmc-chassis-poweron@%i.target |
