witherspoon:Rename avsbus-workaround to power-workarounds
This service/script will now be used for all required
power workarounds that the BMC needs to apply during
boot. Renaming to support this more generic purpose
of this script.
Change-Id: I9b0fbdff37f6ddc169391f95497d2d69620e552c
Signed-off-by: Andrew Geissler <andrewg@us.ibm.com>
diff --git a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb
index 454601e..a09cdc7 100644
--- a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb
+++ b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb
@@ -7,14 +7,14 @@
RDEPENDS_${PN} += "i2c-tools"
S = "${WORKDIR}"
-SRC_URI += "file://avsbus-workaround.sh \
+SRC_URI += "file://power-workarounds.sh \
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}/power-workarounds.sh \
+ ${D}${bindir}/power-workarounds.sh
install -m 0755 ${WORKDIR}/avsbus-disable.sh \
${D}${bindir}/avsbus-disable.sh
install -m 0755 ${WORKDIR}/avsbus-enable.sh \
@@ -23,10 +23,10 @@
TMPL_EN= "avsbus-enable@.service"
TMPL_DIS= "avsbus-disable@.service"
-TMPL_WA= "avsbus-workaround@.service"
+TMPL_WA= "power-workarounds@.service"
INSTFMT_EN= "avsbus-enable@{0}.service"
INSTFMT_DIS= "avsbus-disable@{0}.service"
-INSTFMT_WA= "avsbus-workaround@{0}.service"
+INSTFMT_WA= "power-workarounds@{0}.service"
TGTFMT = "obmc-chassis-poweron@{0}.target"
FMT_EN = "../${TMPL_EN}:${TGTFMT}.requires/${INSTFMT_EN}"
FMT_DIS = "../${TMPL_DIS}:${TGTFMT}.requires/${INSTFMT_DIS}"
diff --git a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
index ca92562..90e8b03 100644
--- a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
+++ b/meta-witherspoon/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=power-workarounds@%i.service
+After=power-workarounds@%i.service
Before=vrm-control@%i.service
Conflicts=obmc-chassis-poweroff@%i.target
ConditionPathExists=!/run/openbmc/chassis@%i-on
diff --git a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-workaround.sh b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/power-workarounds.sh
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-workaround.sh
rename to meta-witherspoon/recipes-phosphor/chassis/avsbus-control/power-workarounds.sh
diff --git a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/power-workarounds@.service
similarity index 76%
rename from meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service
rename to meta-witherspoon/recipes-phosphor/chassis/avsbus-control/power-workarounds@.service
index a8bebc5..ec3017c 100644
--- a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service
+++ b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/power-workarounds@.service
@@ -1,5 +1,5 @@
[Unit]
-Description=Perform AVS bus workaround on VRMs
+Description=Perform power workarounds on VRMs
Wants=ucd_disable_vcs@%i.service
After=ucd_disable_vcs@%i.service
Before=avsbus-disable@%i.service
@@ -7,7 +7,7 @@
ConditionPathExists=!/run/openbmc/chassis@%i-on
[Service]
-ExecStart={bindir}/avsbus-workaround.sh
+ExecStart={bindir}/power-workarounds.sh
Type=oneshot
RemainAfterExit=yes