diff options
Diffstat (limited to 'meta-ibm/meta-romulus/recipes-phosphor')
4 files changed, 3 insertions, 34 deletions
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control.bb b/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control.bb index e014da2e6c..252d2cbfcc 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control.bb +++ b/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control.bb @@ -7,14 +7,11 @@ inherit obmc-phosphor-license RDEPENDS_${PN} += "i2c-tools bash" S = "${WORKDIR}" -SRC_URI += "file://avsbus-workaround.sh \ - file://avsbus-enable.sh \ +SRC_URI += "file://avsbus-enable.sh \ file://avsbus-disable.sh" do_install() { install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/avsbus-workaround.sh \ - ${D}${bindir}/avsbus-workaround.sh install -m 0755 ${WORKDIR}/avsbus-disable.sh \ ${D}${bindir}/avsbus-disable.sh install -m 0755 ${WORKDIR}/avsbus-enable.sh \ @@ -23,18 +20,13 @@ do_install() { TMPL_EN= "avsbus-enable@.service" TMPL_DIS= "avsbus-disable@.service" -TMPL_WA= "avsbus-workaround@.service" INSTFMT_EN= "avsbus-enable@{0}.service" INSTFMT_DIS= "avsbus-disable@{0}.service" -INSTFMT_WA= "avsbus-workaround@{0}.service" TGTFMT = "obmc-chassis-poweron@{0}.target" FMT_EN = "../${TMPL_EN}:${TGTFMT}.requires/${INSTFMT_EN}" FMT_DIS = "../${TMPL_DIS}:${TGTFMT}.requires/${INSTFMT_DIS}" -FMT_WA = "../${TMPL_WA}:${TGTFMT}.requires/${INSTFMT_WA}" SYSTEMD_SERVICE_${PN} += "${TMPL_EN}" SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_EN', 'OBMC_CHASSIS_INSTANCES')}" SYSTEMD_SERVICE_${PN} += "${TMPL_DIS}" SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_DIS', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_SERVICE_${PN} += "${TMPL_WA}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_WA', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service b/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service index 424aa2394e..38c1e850b0 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service +++ b/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service @@ -1,7 +1,7 @@ [Unit] Description=Disable the AVS bus on the VRMs -Wants=avsbus-workaround@%i.service -After=avsbus-workaround@%i.service +Wants=op-power-start@.service +After=op-power-start@.service Before=vrm-control@%i.service Conflicts=obmc-chassis-poweroff@%i.target ConditionPathExists=!/run/openbmc/chassis@%i-on diff --git a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround.sh b/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround.sh deleted file mode 100644 index 75ec8caed5..0000000000 --- a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -i2cset -y 4 0x28 0x2E 0x23 b # VDD/VCS 0 -i2cset -y 4 0x2B 0x2E 0x23 b # VDN 0 -i2cset -y 5 0x28 0x2E 0x23 b # VDD/VCS 1 -i2cset -y 5 0x2B 0x2E 0x23 b # VDN 1 - diff --git a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service b/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service deleted file mode 100644 index 156ef03c71..0000000000 --- a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Perform AVS bus workaround on VRMs -Wants=op-power-start@.service -After=op-power-start@.service -Before=avsbus-disable@%i.service -Conflicts=obmc-chassis-poweroff@%i.target -ConditionPathExists=!/run/openbmc/chassis@%i-on - -[Service] -ExecStart=/usr/bin/env avsbus-workaround.sh -SyslogIdentifier=avsbus-workaround.sh -Type=oneshot -RemainAfterExit=yes - -[Install] -WantedBy=obmc-chassis-poweron@%i.target |