From d97f2cb302f209e79ba2f8cd5ef807269f6d146d Mon Sep 17 00:00:00 2001 From: Lei YU Date: Tue, 14 Feb 2017 16:47:45 +0800 Subject: meta-romulus: Update power on sequence with new obmc-power-chassis targets Change-Id: I12da1cd3d5514ff6c9deea1cef922686cdb39dc5 Signed-off-by: Lei YU --- .../meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control.bb | 2 +- .../recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service | 4 ++-- .../recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service | 4 ++-- .../chassis/avsbus-control/avsbus-workaround@.service | 4 ++-- .../meta-ibm/meta-romulus/recipes-phosphor/chassis/cpld-trigger.bb | 2 +- .../recipes-phosphor/chassis/cpld-trigger/cpld_trigger@.service | 4 ++-- .../meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control.bb | 2 +- .../recipes-phosphor/chassis/vrm-control/vrm-control@.service | 4 ++-- .../host/op-pdbg-host-control/vcs_workaround@.service | 4 ++-- 9 files changed, 15 insertions(+), 15 deletions(-) (limited to 'meta-openbmc-machines/meta-openpower') diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control.bb index f13bf113f..20ecedade 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control.bb +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/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-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service index 1970f00b4..55957f39f 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/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-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service index 464287bb9..c31d389c3 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service @@ -4,7 +4,7 @@ Wants=vrm-control@%i.service After=vrm-control@%i.service Wants=obmc-power-start-pre@%i.target Before=obmc-power-start-pre@%i.target -Conflicts=obmc-chassis-stop@%i.target +Conflicts=obmc-power-chassis-off@%i.target [Service] ExecStart={bindir}/avsbus-enable.sh @@ -12,4 +12,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-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service index 92d1c9f80..c98e7587a 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service @@ -3,7 +3,7 @@ Description=Perform AVS bus workaround on VRMs Wants=obmc-power-start-pre@%i.target Before=obmc-power-start-pre@%i.target 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 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 index 4fb9e2090..542bd9431 100644 --- 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 @@ -20,7 +20,7 @@ do_install() { TMPL = "cpld_trigger@.service" INSTFMT = "cpld_trigger@{0}.service" -TGTFMT = "obmc-chassis-start@{0}.target" +TGTFMT = "obmc-power-chassis-on@{0}.target" FMT = "../${TMPL}:${TGTFMT}.wants/${INSTFMT}" SYSTEMD_SERVICE_${PN} += "${TMPL}" 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 index e96141891..b1b7e313a 100644 --- 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 @@ -4,7 +4,7 @@ Wants=vcs_workaround@%i.service After=vcs_workaround@%i.service Wants=obmc-host-start-pre@%i.target Before=obmc-host-start-pre@%i.target -Conflicts=obmc-chassis-stop@%i.target +Conflicts=obmc-power-chassis-off@%i.target [Service] ExecStart={bindir}/cpld_trigger.sh @@ -12,4 +12,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-romulus/recipes-phosphor/chassis/vrm-control.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control.bb index 049fabe11..5adffe71a 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control.bb +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control.bb @@ -19,7 +19,7 @@ do_install() { TMPL = "vrm-control@.service" INSTFMT = "vrm-control@{0}.service" -TGTFMT = "obmc-chassis-start@{0}.target" +TGTFMT = "obmc-power-chassis-on@{0}.target" FMT = "../${TMPL}:${TGTFMT}.wants/${INSTFMT}" SYSTEMD_SERVICE_${PN} += "${TMPL}" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control/vrm-control@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control/vrm-control@.service index 75c0067a0..0b772f2d9 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control/vrm-control@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control/vrm-control@.service @@ -3,7 +3,7 @@ Description=Apply voltage overrides to VRMs Wants=avsbus-disable@%i.service After=avsbus-disable@%i.service Before=avsbus-enable@%i.service -Conflicts=obmc-chassis-stop@%i.target +Conflicts=obmc-power-chassis-off@%i.target [Service] ExecStart={bindir}/vrm.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-romulus/recipes-phosphor/host/op-pdbg-host-control/vcs_workaround@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/host/op-pdbg-host-control/vcs_workaround@.service index cf02d2519..bc7e5a5a8 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/host/op-pdbg-host-control/vcs_workaround@.service +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/host/op-pdbg-host-control/vcs_workaround@.service @@ -4,7 +4,7 @@ Wants=obmc-host-start-pre@%i.target Before=obmc-host-start-pre@%i.target Wants=avsbus-enable@%i.service After=avsbus-enable@%i.service -Conflicts=obmc-chassis-stop@%i.target +Conflicts=obmc-power-chassis-off@%i.target [Service] ExecStart={bindir}/vcs_workaround.sh {MACHINE} @@ -12,4 +12,4 @@ Type=oneshot RemainAfterExit=yes [Install] -WantedBy=obmc-chassis-start@%i.target +WantedBy=obmc-power-chassis-on@%i.target -- cgit v1.2.1