From f158d90b4351725c4bb87d2aec064a34ea14d044 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 8 Apr 2022 16:24:35 -0500 Subject: meta-openpower: support enabling and disabling sys dump active See the following for more details: https://gerrit.openbmc-project.xyz/c/openbmc/pldm/+/52268 This commit ties all the function together, ensuring the new BIOS is enabled and disabled appropriately openpower-proc-control: srcrev bump 69708fbb4b..9ca8a11763 Andrew Geissler (1): update host bios to indicate mpreboot Signed-off-by: Andrew Geissler Change-Id: Ib03cf0190f8d69e7200e4f95b43680da2149b6a2 --- .../recipes-phosphor/host/op-proc-control-systemd-links.bb | 10 +++++++++- meta-openpower/recipes-phosphor/host/op-proc-control_git.bb | 3 ++- 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'meta-openpower') diff --git a/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb b/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb index a9c329a216..8dce7b0e61 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb @@ -49,6 +49,15 @@ pkg_postinst:${PN}() { # Only install certain units if phal enabled if [ "${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" = phal ]; then + LINK="$D$systemd_system_unitdir/obmc-host-stop@0.target.wants/op-clear-sys-dump-active@0.service" + TARGET="../op-clear-sys-dump-active@.service" + ln -s $TARGET $LINK + + mkdir -p $D$systemd_system_unitdir/multi-user.target.wants + LINK="$D$systemd_system_unitdir/multi-user.target.wants/op-clear-sys-dump-active@0.service" + TARGET="../op-clear-sys-dump-active@.service" + ln -s $TARGET $LINK + mkdir -p $D$systemd_system_unitdir/obmc-host-start@0.target.requires LINK="$D$systemd_system_unitdir/obmc-host-start@0.target.requires/phal-reinit-devtree.service" TARGET="../phal-reinit-devtree.service" @@ -62,7 +71,6 @@ pkg_postinst:${PN}() { TARGET="../op-reset-host-check@.service" ln -s $TARGET $LINK - mkdir -p $D$systemd_system_unitdir/multi-user.target.wants LINK="$D$systemd_system_unitdir/multi-user.target.wants/phal-import-devtree@0.service" TARGET="../phal-import-devtree@.service" ln -s $TARGET $LINK diff --git a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb index 93e82a92bb..18896b6a01 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb @@ -11,7 +11,7 @@ inherit meson obmc-phosphor-utils pkgconfig inherit systemd SRC_URI += "git://github.com/openbmc/openpower-proc-control;branch=master;protocol=https" -SRCREV = "69708fbb4be11e132b72a2ca6807abc24b01e9f6" +SRCREV = "9ca8a11763733746fa408cc56f5b6f7900fc6771" DEPENDS += " \ phosphor-logging \ @@ -44,4 +44,5 @@ SYSTEMD_SERVICE:${PN} += " \ ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'proc-pre-poweroff@.service', '', d)} \ ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'set-spi-mux.service', '', d)} \ ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'phal-create-boottime-guard-indicator.service', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'op-clear-sys-dump-active@.service', '', d)} \ " -- cgit v1.2.3