diff options
| author | Michael Tritz <mtritz@us.ibm.com> | 2017-04-12 16:08:39 -0500 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-04-17 17:08:24 +0000 |
| commit | 330f996f2d6d735218424684e8f09ad8d6fa77e9 (patch) | |
| tree | f669bd3cee2d2026c22b3799a6cc6eb634d86e81 | |
| parent | a56f62512c9a96f23b713d503ea876395d1b57d7 (diff) | |
| download | talos-openbmc-330f996f2d6d735218424684e8f09ad8d6fa77e9.tar.gz talos-openbmc-330f996f2d6d735218424684e8f09ad8d6fa77e9.zip | |
Recipe for CFAM override procedure
This recipe will put the CFAM override procedure into the build.
Resolves openbmc/openbmc#1381
Change-Id: If805b6e947c6d9b09703cd6333df61f5fe61db54
Signed-off-by: Michael Tritz <mtritz@us.ibm.com>
3 files changed, 39 insertions, 1 deletions
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/cfam_override@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/cfam_override@.service new file mode 100644 index 000000000..c6ee4665d --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-host-control/cfam_override@.service @@ -0,0 +1,19 @@ +[Unit] +Description=Applies user CFAM register overrides from file +Wants=obmc-host-start-pre@%i.target +Before=obmc-host-start-pre@%i.target +Wants=obmc-power-on@%i.target +After=obmc-power-on@%i.target +Wants=fsi-scan@%i.service +After=fsi-scan@%i.service +Conflicts=obmc-power-chassis-off@%i.target +ConditionPathExists=!/run/openbmc/chassis@%i-on +ConditionFileExists=/var/lib/obmc/cfam_overrides + +[Service] +ExecStart={sbindir}/openpower-proc-control CFAMOverride +Type=oneshot +RemainAfterExit=yes + +[Install] +WantedBy=obmc-power-chassis-on@%i.target diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-cfam-override.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-cfam-override.bb new file mode 100644 index 000000000..b059ff4dd --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-cfam-override.bb @@ -0,0 +1,19 @@ +SUMMARY = "POWER9 CFAM override" +DESCRIPTION = "Applies user CFAM register overrides from file" +PR = "r1" + +inherit obmc-phosphor-systemd +inherit obmc-phosphor-license + +FILESEXTRAPATHS_prepend := "${THISDIR}/op-host-control:" +RDEPENDS_${PN} += "op-proc-control" + +S = "${WORKDIR}" + +TMPL = "cfam_override@.service" +INSTFMT = "cfam_override@{0}.service" +TGTFMT = "obmc-power-chassis-on@{0}.target" +FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}" + +SYSTEMD_SERVICE_${PN} += "${TMPL}" +SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-openbmc-machines/meta-openpower/conf/machine/include/p9.inc b/meta-openbmc-machines/meta-openpower/conf/machine/include/p9.inc index a58962351..b0e0bb95e 100644 --- a/meta-openbmc-machines/meta-openpower/conf/machine/include/p9.inc +++ b/meta-openbmc-machines/meta-openpower/conf/machine/include/p9.inc @@ -1,2 +1,2 @@ -OBMC_MACHINE_FEATURES += 'p9-vcs-workaround op-fsi' +OBMC_MACHINE_FEATURES += 'p9-vcs-workaround op-fsi p9-cfam-override' PREFERRED_PROVIDER_virtual/obmc-host-ctl = "p9-host-start" |
