From 4a78d5543967f66f3de99b073aef2d95cf543be0 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 14 Jul 2020 13:10:51 +0000 Subject: openpower-pnor-code-mgmt: srcrev bump 573552ae8e..bbb5e3bec1 Adriana Kobylak (1): vpnor: Move clearvolatile services to vpnor Andrew Geissler (2): ensure volatile clear waits on dependency ensure volatile clear occurs after reset check Also added to this commit is the movement of the service files from ubi to vpnor (required with the above commits) (From meta-openpower rev: 8b70bb894a3c16d10bf5d11fd26bbc9ea6c3bae1) Change-Id: Ie464de2d4f7abad6e0a3ae2edc1df1b7c740e559 Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- .../classes/openpower-software-manager-ubi.bbclass | 31 ---------------------- 1 file changed, 31 deletions(-) (limited to 'meta-openpower/classes/openpower-software-manager-ubi.bbclass') diff --git a/meta-openpower/classes/openpower-software-manager-ubi.bbclass b/meta-openpower/classes/openpower-software-manager-ubi.bbclass index dc20d5d09..6fd6b68e9 100644 --- a/meta-openpower/classes/openpower-software-manager-ubi.bbclass +++ b/meta-openpower/classes/openpower-software-manager-ubi.bbclass @@ -8,35 +8,4 @@ SYSTEMD_SERVICE_${PN} += " \ obmc-flash-bios-ubipatch.service \ obmc-flash-bios-ubiremount.service \ obmc-flash-bios-cleanup.service \ - obmc-flash-bios-enable-clearvolatile@.service \ - obmc-flash-bios-check-clearvolatile@.service \ " - -# To handle warm reboot scenarios, the checking and clearing of -# the volatile section must occur in both the chassis and host -# targets - -# Host target installation - only clear if going through -# full host start target -ENABLE_CLEAR_VOLATILE_TMPL = "obmc-flash-bios-enable-clearvolatile@.service" -HOST_START_TGTFMT = "obmc-host-start@{0}.target" -ENABLE_CLEAR_VOLATILE_INSTFMT = "obmc-flash-bios-enable-clearvolatile@{0}.service" -ENABLE_CLEAR_VOLATILE_START_FMT = "../${ENABLE_CLEAR_VOLATILE_TMPL}:${HOST_START_TGTFMT}.requires/${ENABLE_CLEAR_VOLATILE_INSTFMT}" - -CHECK_CLEAR_VOLATILE_TMPL = "obmc-flash-bios-check-clearvolatile@.service" -HOST_STARTMIN_TGTFMT = "obmc-host-startmin@{0}.target" -CHECK_CLEAR_VOLATILE_INSTFMT = "obmc-flash-bios-check-clearvolatile@{0}.service" -CHECK_CLEAR_VOLATILE_START_FMT = "../${CHECK_CLEAR_VOLATILE_TMPL}:${HOST_STARTMIN_TGTFMT}.requires/${CHECK_CLEAR_VOLATILE_INSTFMT}" - -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'ENABLE_CLEAR_VOLATILE_START_FMT', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHECK_CLEAR_VOLATILE_START_FMT', 'OBMC_HOST_INSTANCES')}" - -# Chassis target installation - always enable and clear in chassis -# power on -CHASSIS_PON_TGTFMT = "obmc-chassis-poweron@{0}.target" -ENABLE_CLEAR_VOLATILE_PON_FMT = "../${ENABLE_CLEAR_VOLATILE_TMPL}:${CHASSIS_PON_TGTFMT}.requires/${ENABLE_CLEAR_VOLATILE_INSTFMT}" - -CHECK_CLEAR_VOLATILE_PON_FMT = "../${CHECK_CLEAR_VOLATILE_TMPL}:${CHASSIS_PON_TGTFMT}.requires/${CHECK_CLEAR_VOLATILE_INSTFMT}" - -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'ENABLE_CLEAR_VOLATILE_PON_FMT', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHECK_CLEAR_VOLATILE_PON_FMT', 'OBMC_CHASSIS_INSTANCES')}" -- cgit v1.2.3