diff options
| author | Joel Stanley <joel@jms.id.au> | 2018-08-17 18:07:35 +0930 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-21 17:23:35 +0000 |
| commit | f569ebe74e7007ad45f7df7bd0196513d4c70f09 (patch) | |
| tree | 5ccb3c0650c70ea370eafe4fa5faa60724bcfe5f /meta-phosphor | |
| parent | a8af6e42e6a356c5324f7688c230520dc0293614 (diff) | |
| download | talos-openbmc-f569ebe74e7007ad45f7df7bd0196513d4c70f09.tar.gz talos-openbmc-f569ebe74e7007ad45f7df7bd0196513d4c70f09.zip | |
phosphor: Remove 'pflash -i' service
Once upon a time this service was added to initalise the host flash
before starting the host firmware, otherwise some systems would not
boot.
> commit 14f965d8dc806d710218de18357ba7f106484a8e
> Author: Andrew Geissler <andrewg@us.ibm.com>
> Date: Thu May 11 09:54:04 2017 -0500
>
> PNOR init workaround for P8 based systems
>
> The PNOR chip requires an init to be done to it prior
> to starting the host. This is a temporary fix to this
> issue until we get the mboxd function ported to P8.
Ever since e7b0fd568ae2 ("Switch userspace to use MTD access by
default", October 2017) running pflash hs not done this, as it
access the flash through the kernel mtd interface.
A machine could chose use mboxd and the mbox protocol on P8 but it is
not required to fix this issue.
Change-Id: I5c2400063bf776018ef60f2642fb2629c96af0a7
Resolves: openbmc/openbmc#1598
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'meta-phosphor')
| -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 |
