meta-phosphor: Move layer content from common/

Adopt a more conventional directory hierarchy.  meta-phosphor is still
a _long_ way from suitable for hosting on yoctoproject.org but things
like this don't help.

(From meta-phosphor rev: 471cfcefa74b8c7ceb704cb670e6d915cf27c63b)

Change-Id: I3f106b2f6cdc6cec734be28a6090800546f362eb
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

35 files changed, 0 insertions, 253 deletions

diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target
deleted file mode 100644
index 48fc44169..000000000
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Chassis%i (Hard Power Off)
-Wants={SYSTEMD_DEFAULT_TARGET}
-After={SYSTEMD_DEFAULT_TARGET}
-Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
-After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
-Conflicts=obmc-chassis-poweron@%i.target
-Conflicts=obmc-chassis-powerreset@%i.target
-Conflicts=obmc-host-shutdown@%i.target
-Conflicts=xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service
-RefuseManualStop=yes
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target
deleted file mode 100644
index 84c1ddab1..000000000
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Chassis%i (Powered Off)
-Wants={SYSTEMD_DEFAULT_TARGET}
-After={SYSTEMD_DEFAULT_TARGET}
-Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
-After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
-Conflicts=obmc-chassis-poweron@%i.target
-Conflicts=obmc-chassis-powerreset@%i.target
-RefuseManualStop=yes
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target
deleted file mode 100644
index 080d72456..000000000
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Chassis%i (Power Off)
-Wants={SYSTEMD_DEFAULT_TARGET}
-After={SYSTEMD_DEFAULT_TARGET}
-Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
-After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
-Conflicts=obmc-chassis-poweron@%i.target
-Conflicts=obmc-chassis-powerreset@%i.target
-RefuseManualStop=yes
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target
deleted file mode 100644
index 55f6d919b..000000000
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Chassis%i (Power On)
-Wants={SYSTEMD_DEFAULT_TARGET}
-After={SYSTEMD_DEFAULT_TARGET}
-Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
-After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
-Wants=mapper-subtree-remove@-xyz-openbmc\x5fproject-software\x3Axyz.openbmc_project.Software.ActivationBlocksTransition.service
-After=mapper-subtree-remove@-xyz-openbmc\x5fproject-software\x3Axyz.openbmc_project.Software.ActivationBlocksTransition.service
-Conflicts=obmc-chassis-poweroff@%i.target
-RefuseManualStop=yes
-OnFailure=obmc-chassis-poweroff@%i.target
-OnFailureJobMode=flush
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target
deleted file mode 100644
index 8d7c47e6b..000000000
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Chassis%i (Reset Check)
-Conflicts=obmc-chassis-poweroff@%i.target
-RefuseManualStop=yes
-
-[Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fan-control-ready@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fan-control-ready@.target
deleted file mode 100644
index e041a5508..000000000
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fan-control-ready@.target
+++ /dev/null
@@ -1,4 +0,0 @@
-[Unit]
-Description=Fan Control Ready
-RefuseManualStop=yes
-Conflicts=obmc-chassis-powered-off@%i.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fan-control.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fan-control.target
deleted file mode 100644
index 50665db4a..000000000
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fan-control.target
+++ /dev/null
@@ -1,4 +0,0 @@
-[Unit]
-Description=Fan Control
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fan-watchdog-takeover.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fan-watchdog-takeover.target
deleted file mode 100644
index 803408334..000000000
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fan-watchdog-takeover.target
+++ /dev/null
@@ -1,6 +0,0 @@
-#The system implementation should start this target when dynamic fan control
-#is no longer desired or possible.  It should also add units to this target
-#that enabled continued operation after dynamic fan control is no longer
-#desired or possible.
-[Unit]
-Description=Fan watchdog takeover target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fans-ready.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fans-ready.target
deleted file mode 100644
index 59e61c626..000000000
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fans-ready.target
+++ /dev/null
@@ -1,4 +0,0 @@
-[Unit]
-Description=Fans Ready
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-crash@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-crash@.target
deleted file mode 100644
index ea3798b52..000000000
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-crash@.target
+++ /dev/null
@@ -1,4 +0,0 @@
-[Unit]
-Description=Host instance %i crashed
-Conflicts=obmc-chassis-poweroff@%i.target
-RefuseManualStop=yes
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-quiesce@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-quiesce@.target
deleted file mode 100644
index 4f10419ab..000000000
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-quiesce@.target
+++ /dev/null
@@ -1,6 +0,0 @@
-[Unit]
-Description=Quiesce Target
-Wants={SYSTEMD_DEFAULT_TARGET}
-After={SYSTEMD_DEFAULT_TARGET}
-RefuseManualStop=yes
-Conflicts=obmc-chassis-poweroff@%i.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target
deleted file mode 100644
index dc280ea65..000000000
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Reboot Host%i
-Wants={SYSTEMD_DEFAULT_TARGET}
-After={SYSTEMD_DEFAULT_TARGET}
-Wants=mapper-wait@-org-openbmc-control-chassis%i.service
-After=mapper-wait@-org-openbmc-control-chassis%i.service
-Conflicts=obmc-host-startmin@%i.target
-RefuseManualStop=yes
-OnFailure=obmc-chassis-poweroff@%i.target
-OnFailureJobMode=flush
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset-running@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset-running@.target
deleted file mode 100644
index 94bb2b130..000000000
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset-running@.target
+++ /dev/null
@@ -1,5 +0,0 @@
-[Unit]
-Description=Host%i running after reset
-Conflicts=obmc-host-stop@%i.target
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset@.target
deleted file mode 100644
index ca95d843c..000000000
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset@.target
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Host%i (Reset Check)
-Conflicts=obmc-host-stop@%i.target
-RefuseManualStop=yes
-
-[Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-shutdown@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-shutdown@.target
deleted file mode 100644
index 4768a567f..000000000
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-shutdown@.target
+++ /dev/null
@@ -1,6 +0,0 @@
-[Unit]
-Description=Power%i Host Off
-Wants={SYSTEMD_DEFAULT_TARGET}
-RefuseManualStop=yes
-OnFailure=obmc-chassis-poweroff@%i.target
-OnFailureJobMode=flush
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target
deleted file mode 100644
index 2bc270c14..000000000
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Start Host%i (Pre)
-Wants={SYSTEMD_DEFAULT_TARGET}
-After={SYSTEMD_DEFAULT_TARGET}
-Conflicts=obmc-host-stop@%i.target
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start@.target
deleted file mode 100644
index 144b63387..000000000
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start@.target
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Start Host%i
-Wants={SYSTEMD_DEFAULT_TARGET}
-After={SYSTEMD_DEFAULT_TARGET}
-Wants=mapper-wait@-org-openbmc-control-chassis%i.service
-After=mapper-wait@-org-openbmc-control-chassis%i.service
-Conflicts=obmc-host-stop@%i.target
-RefuseManualStop=yes
-OnFailure=obmc-host-quiesce@%i.target
-OnFailureJobMode=flush
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target
deleted file mode 100644
index eb0a9383b..000000000
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Host%i (Started)
-Wants={SYSTEMD_DEFAULT_TARGET}
-After=obmc-host-starting@%i.target
-Conflicts=obmc-host-stop@%i.target
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-starting@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-starting@.target
deleted file mode 100644
index 408139dd4..000000000
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-starting@.target
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Host%i (Starting)
-Wants={SYSTEMD_DEFAULT_TARGET}
-After=obmc-host-start-pre@%i.target
-Conflicts=obmc-host-stop@%i.target
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-startmin@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-startmin@.target
deleted file mode 100644
index 6e924adcd..000000000
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-startmin@.target
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Start Host%i Minimum
-Wants={SYSTEMD_DEFAULT_TARGET}
-After={SYSTEMD_DEFAULT_TARGET}
-Wants=mapper-wait@-org-openbmc-control-chassis%i.service
-After=mapper-wait@-org-openbmc-control-chassis%i.service
-Conflicts=obmc-host-stop@%i.target
-RefuseManualStop=yes
-OnFailure=obmc-host-quiesce@%i.target
-OnFailureJobMode=flush
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target
deleted file mode 100644
index e88d3ea58..000000000
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Stop Host%i (Pre)
-Wants={SYSTEMD_DEFAULT_TARGET}
-After={SYSTEMD_DEFAULT_TARGET}
-Before=obmc-host-stopping@%i.target
-Conflicts=obmc-host-startmin@%i.target
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop@.target
deleted file mode 100644
index 8e99bccdb..000000000
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop@.target
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Stop Host%i
-Wants={SYSTEMD_DEFAULT_TARGET}
-After={SYSTEMD_DEFAULT_TARGET}
-Wants=mapper-wait@-org-openbmc-control-chassis%i.service
-After=mapper-wait@-org-openbmc-control-chassis%i.service
-After=obmc-chassis-poweroff@%i.target
-Conflicts=obmc-host-startmin@%i.target
-RefuseManualStop=yes
-OnFailure=obmc-chassis-poweroff@%i.target
-OnFailureJobMode=flush
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target
deleted file mode 100644
index 74039fc25..000000000
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Host%i (Stopped)
-Wants={SYSTEMD_DEFAULT_TARGET}
-Wants=obmc-host-stopping@%i.target
-After=obmc-host-stopping@%i.target
-Before=obmc-power-stop-pre@%i.target
-Conflicts=obmc-host-startmin@%i.target
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target
deleted file mode 100644
index f087dea72..000000000
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Host%i (Stopping)
-Wants={SYSTEMD_DEFAULT_TARGET}
-Wants=obmc-host-stop-pre@%i.target
-After=obmc-host-stop-pre@%i.target
-Before=obmc-host-stopped@%i.target
-Conflicts=obmc-host-startmin@%i.target
-Conflicts=obmc-host-starting@%i.target
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-timeout@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-timeout@.target
deleted file mode 100644
index b87507bf1..000000000
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-timeout@.target
+++ /dev/null
@@ -1,4 +0,0 @@
-[Unit]
-Description=Host instance %i timed out refreshing Watchdog
-Conflicts=obmc-chassis-poweroff@%i.target
-RefuseManualStop=yes
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-mapper.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-mapper.target
deleted file mode 100644
index 5e52f4cd5..000000000
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-mapper.target
+++ /dev/null
@@ -1,4 +0,0 @@
-[Unit]
-Description=Phosphor Object Mapper
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-off@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-off@.target
deleted file mode 100644
index c47b21e47..000000000
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-off@.target
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Power%i (Off)
-Wants={SYSTEMD_DEFAULT_TARGET}
-After=obmc-power-stop@%i.target
-Conflicts=obmc-chassis-poweron@%i.target
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-on@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-on@.target
deleted file mode 100644
index 52135ffc9..000000000
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-on@.target
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Power%i (On)
-Wants={SYSTEMD_DEFAULT_TARGET}
-After=obmc-power-start@%i.target
-Conflicts=obmc-chassis-poweroff@%i.target
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-reset-on@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-reset-on@.target
deleted file mode 100644
index d24d401bf..000000000
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-reset-on@.target
+++ /dev/null
@@ -1,5 +0,0 @@
-[Unit]
-Description=Chassis%i power on after reset
-Conflicts=obmc-chassis-poweroff@%i.target
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target
deleted file mode 100644
index 1a1ea6319..000000000
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Power%i On (Pre)
-Wants={SYSTEMD_DEFAULT_TARGET}
-After={SYSTEMD_DEFAULT_TARGET}
-Conflicts=obmc-chassis-poweroff@%i.target
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-start@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-start@.target
deleted file mode 100644
index a977d5ad3..000000000
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-start@.target
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Power%i On
-After=obmc-power-start-pre@%i.target
-Wants={SYSTEMD_DEFAULT_TARGET}
-Conflicts=obmc-chassis-poweroff@%i.target
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target
deleted file mode 100644
index 50d5050bb..000000000
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Power%i Off (Pre)
-Wants={SYSTEMD_DEFAULT_TARGET}
-After={SYSTEMD_DEFAULT_TARGET}
-Wants=obmc-host-stopped@%i.target
-After=obmc-host-stopped@%i.target
-Conflicts=obmc-chassis-poweron@%i.target
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-stop@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-stop@.target
deleted file mode 100644
index f0429d786..000000000
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-stop@.target
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Power%i Off
-Wants=obmc-power-stop-pre@%i.target
-After=obmc-power-stop-pre@%i.target
-Wants={SYSTEMD_DEFAULT_TARGET}
-Conflicts=obmc-chassis-poweron@%i.target
-Conflicts=fsi-disable.service
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-standby.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-standby.target
deleted file mode 100644
index 95044a404..000000000
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-standby.target
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Phosphor System - Standby
-Requires=multi-user.target
-RefuseManualStart=yes
-RefuseManualStop=yes
-AllowIsolate=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-webserver-pre.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-webserver-pre.target
deleted file mode 100644
index ea5200c00..000000000
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-webserver-pre.target
+++ /dev/null
@@ -1,2 +0,0 @@
-[Unit]
-Description=Webserver (pre)