diff options
-rw-r--r-- | meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host.bb | 6 | ||||
-rw-r--r-- | meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-init-pnor@.service | 16 |
2 files changed, 0 insertions, 22 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host.bb b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host.bb index 820779e94..627f75956 100644 --- a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host.bb +++ b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host.bb @@ -15,7 +15,6 @@ FMT = "org.openbmc.control.Host@{0}.service" DBUS_SERVICE_${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_INSTANCES')}" SYSTEMD_SERVICE_${PN} = " \ op-start-host@.service \ - op-init-pnor@.service \ " START_TMPL = "op-start-host@.service" @@ -23,9 +22,4 @@ START_TGTFMT = "obmc-host-startmin@{1}.target" START_INSTFMT = "op-start-host@{0}.service" START_FMT = "../${START_TMPL}:${START_TGTFMT}.requires/${START_INSTFMT}" -INIT_PNOR_TMPL = "op-init-pnor@.service" -INIT_PNOR_INSTFMT = "op-init-pnor@{0}.service" -INIT_PNOR_FMT = "../${INIT_PNOR_TMPL}:${START_TGTFMT}.requires/${INIT_PNOR_INSTFMT}" - SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'START_FMT', 'OBMC_HOST_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'INIT_PNOR_FMT', 'OBMC_HOST_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-init-pnor@.service b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-init-pnor@.service deleted file mode 100644 index 26a0343f1..000000000 --- a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-init-pnor@.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Init PNOR for Host%i -After=obmc-power-on@%i.target -Before=obmc-host-start-pre@%i.target -Conflicts=obmc-host-stop@%i.target -ConditionPathExists=!/run/openbmc/host@%i-on - -[Service] -Type=oneshot -RemainAfterExit=yes -# TODO openbmc/openbmc#1598 - Delete this service once available -ExecStart=/usr/bin/env pflash -i -SyslogIdentifier=pflash - -[Install] -WantedBy=obmc-host-start@%i.target |