From cde8c4ee1cca1a064b84f201706abe47639623a0 Mon Sep 17 00:00:00 2001
From: Patrick Williams <patrick@stwcx.xyz>
Date: Mon, 5 Feb 2024 08:45:49 -0600
Subject: meta-phosphor: eliminate OBMC_POWER_INSTANCES

In no currently available systems is there an instance where the "power
instance" is separate from the "chassis instance".  Simplify the
systemd target linkages by removing this variable.

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I847804e2328cc20c228f05895448ef3170dfbc8a
---
 meta-phosphor/conf/distro/include/phosphor-defaults.inc             | 1 -
 .../recipes-phosphor/chassis/phosphor-skeleton-control-power_git.bb | 6 +++---
 meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb  | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc
index ebd31322ba..2dcbd9ae8d 100644
--- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc
+++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc
@@ -1,7 +1,6 @@
 OBMC_BMC_INSTANCES ??= "0"
 OBMC_CHASSIS_INSTANCES ??= "0"
 OBMC_HOST_INSTANCES ??= "0"
-OBMC_POWER_INSTANCES ??= "0"
 
 # obmc-bmc-state-manager
 #
diff --git a/meta-phosphor/recipes-phosphor/chassis/phosphor-skeleton-control-power_git.bb b/meta-phosphor/recipes-phosphor/chassis/phosphor-skeleton-control-power_git.bb
index aae0480941..1912c571f7 100644
--- a/meta-phosphor/recipes-phosphor/chassis/phosphor-skeleton-control-power_git.bb
+++ b/meta-phosphor/recipes-phosphor/chassis/phosphor-skeleton-control-power_git.bb
@@ -15,7 +15,7 @@ DBUS_SERVICE:${PN} += "org.openbmc.control.Power@.service"
 OBMC_CONTROL_INST = "org.openbmc.control.Power@{0}.service"
 OBMC_CONTROL_SVC = "org.openbmc.control.Power@.service"
 OBMC_CONTROL_FMT = "../${OBMC_CONTROL_SVC}:multi-user.target.wants/${OBMC_CONTROL_INST}"
-SYSTEMD_LINK:${PN} += "${@compose_list(d, 'OBMC_CONTROL_FMT', 'OBMC_POWER_INSTANCES')}"
+SYSTEMD_LINK:${PN} += "${@compose_list(d, 'OBMC_CONTROL_FMT', 'OBMC_CHASSIS_INSTANCES')}"
 
 SYSTEMD_SERVICE:${PN} += " \
         phosphor-wait-power-on@.service \
@@ -35,5 +35,5 @@ OFF_INSTFMT = "phosphor-wait-power-off@{0}.service"
 OFF_FMT = "../${OFF_TMPL}:${STOP_TGTFMT}.requires/${OFF_INSTFMT}"
 
 # Build up requires relationship for START_TGTFMT and STOP_TGTFMT
-SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'ON_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'OFF_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}"
+SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'ON_FMT', 'OBMC_CHASSIS_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}"
+SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'OFF_FMT', 'OBMC_CHASSIS_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}"
diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb
index be94e2d87c..fce5fdd551 100644
--- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb
+++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb
@@ -234,7 +234,7 @@ START_TMPL_CTRL = "obmc-chassis-poweron@.target"
 START_TGTFMT_CTRL = "obmc-host-startmin@{1}.target"
 START_INSTFMT_CTRL = "obmc-chassis-poweron@{0}.target"
 START_FMT_CTRL = "../${START_TMPL_CTRL}:${START_TGTFMT_CTRL}.requires/${START_INSTFMT_CTRL}"
-SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list_zip(d, 'START_FMT_CTRL', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}"
+SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list_zip(d, 'START_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}"
 
 # Chassis off requires host off
 STOP_TMPL_CTRL = "obmc-host-stop@.target"
-- 
cgit v1.2.3