summaryrefslogtreecommitdiffstats
path: root/meta-openbmc-machines/meta-openpower
diff options
context:
space:
mode:
authorAndrew Geissler <andrewg@us.ibm.com>2017-01-30 11:19:55 -0600
committerPatrick Williams <patrick@stwcx.xyz>2017-02-01 19:45:14 +0000
commitbd06071884fa3568b9de7561ab471d255bc6fdb7 (patch)
treef053860310a7369a2fee9535bba699aacd8022ac /meta-openbmc-machines/meta-openpower
parent2478d3773170bcabcd342a3daf6d4184ad8cd238 (diff)
downloadtalos-openbmc-bd06071884fa3568b9de7561ab471d255bc6fdb7.tar.gz
talos-openbmc-bd06071884fa3568b9de7561ab471d255bc6fdb7.zip
Move AVS workarounds into new obmc-power-chassis targets
Change-Id: I49c9ce703673e18ef17684f0b3e02626ddb091af Signed-off-by: Andrew Geissler <andrewg@us.ibm.com>
Diffstat (limited to 'meta-openbmc-machines/meta-openpower')
-rw-r--r--meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb2
-rw-r--r--meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service4
-rw-r--r--meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service4
-rw-r--r--meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service4
4 files changed, 7 insertions, 7 deletions
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb
index 4430429a4..daca634f6 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb
@@ -27,7 +27,7 @@ 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-start@{0}.target"
+TGTFMT = "obmc-power-chassis-on@{0}.target"
FMT_EN = "../${TMPL_EN}:${TGTFMT}.wants/${INSTFMT_EN}"
FMT_DIS = "../${TMPL_DIS}:${TGTFMT}.wants/${INSTFMT_DIS}"
FMT_WA = "../${TMPL_WA}:${TGTFMT}.wants/${INSTFMT_WA}"
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
index 1970f00b4..55957f39f 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
@@ -3,7 +3,7 @@ Description=Disable the AVS bus on the VRMs
Wants=avsbus-workaround@%i.service
After=avsbus-workaround@%i.service
Before=vrm-control@%i.service
-Conflicts=obmc-chassis-stop@%i.target
+Conflicts=obmc-power-chassis-off@%i.target
[Service]
ExecStart={bindir}/avsbus-disable.sh
@@ -11,4 +11,4 @@ Type=oneshot
RemainAfterExit=yes
[Install]
-WantedBy=obmc-chassis-start@%i.target
+WantedBy=obmc-power-chassis-on@%i.target
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
index 9032f68df..e7d3fe157 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
@@ -3,7 +3,7 @@ Description=Enable the AVS bus on VRMs
Wants=vrm-control@%i.service
After=vrm-control@%i.service
Before=vcs_off@%i.service
-Conflicts=obmc-chassis-stop@%i.target
+Conflicts=obmc-power-chassis-off@%i.target
[Service]
ExecStart={bindir}/avsbus-enable.sh
@@ -11,4 +11,4 @@ Type=oneshot
RemainAfterExit=yes
[Install]
-WantedBy=obmc-chassis-start@%i.target
+WantedBy=obmc-power-chassis-on@%i.target
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service
index 566237140..ac1c6c0de 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service
@@ -3,7 +3,7 @@ Description=Perform AVS bus workaround on VRMs
Wants=ucd_disable_vcs@%i.service
After=ucd_disable_vcs@%i.service
Before=avsbus-disable@%i.service
-Conflicts=obmc-chassis-stop@%i.target
+Conflicts=obmc-power-chassis-off@%i.target
[Service]
ExecStart={bindir}/avsbus-workaround.sh
@@ -11,4 +11,4 @@ Type=oneshot
RemainAfterExit=yes
[Install]
-WantedBy=obmc-chassis-start@%i.target
+WantedBy=obmc-power-chassis-on@%i.target
OpenPOWER on IntegriCloud