diff options
5 files changed, 16 insertions, 3 deletions
diff --git a/meta-ibm/conf/machine/p10bmc.conf b/meta-ibm/conf/machine/p10bmc.conf index 4956f8772..1891129a4 100644 --- a/meta-ibm/conf/machine/p10bmc.conf +++ b/meta-ibm/conf/machine/p10bmc.conf @@ -10,6 +10,7 @@ require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/openpower.inc include conf/machine/include/ibm-power10-cpu.inc require conf/distro/include/openpower-virtual-pnor.inc +require conf/distro/include/openpower-hostfw-over-pldm.inc require conf/distro/include/phosphor-mmc.inc require conf/distro/include/ibm-mpreboot.inc require conf/distro/include/ibm-yaml.inc diff --git a/meta-openpower/classes/openpower-software-manager-mmc.bbclass b/meta-openpower/classes/openpower-software-manager-mmc.bbclass index afbee1a8f..fbf7c3b8b 100644 --- a/meta-openpower/classes/openpower-software-manager-mmc.bbclass +++ b/meta-openpower/classes/openpower-software-manager-mmc.bbclass @@ -3,6 +3,4 @@ PACKAGECONFIG:append = " mmc_layout" SYSTEMD_SERVICE:${PN} += " \ obmc-flash-bios-init.service \ obmc-flash-bios-patch.service \ - openpower-process-host-firmware.service \ - openpower-update-bios-attr-table.service \ " diff --git a/meta-openpower/classes/openpower-software-manager-pldm.bbclass b/meta-openpower/classes/openpower-software-manager-pldm.bbclass new file mode 100644 index 000000000..3cfa4a217 --- /dev/null +++ b/meta-openpower/classes/openpower-software-manager-pldm.bbclass @@ -0,0 +1,6 @@ +PACKAGECONFIG:append = " pldm" + +SYSTEMD_SERVICE:${PN} += " \ + openpower-process-host-firmware.service \ + openpower-update-bios-attr-table.service \ +" diff --git a/meta-openpower/conf/distro/include/openpower-hostfw-over-pldm.inc b/meta-openpower/conf/distro/include/openpower-hostfw-over-pldm.inc new file mode 100644 index 000000000..6c67b728b --- /dev/null +++ b/meta-openpower/conf/distro/include/openpower-hostfw-over-pldm.inc @@ -0,0 +1,2 @@ +DISTRO_FEATURES += "openpower-hostfw-over-pldm" +DISTROOVERRIDES .= ":df-openpower-hostfw-over-pldm" diff --git a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb index dcf8715e1..633e031fc 100644 --- a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb +++ b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb @@ -31,10 +31,16 @@ inherit ${@bb.utils.contains('DISTRO_FEATURES', 'openpower-virtual-pnor', \ 'openpower-software-manager-virtual-pnor', \ '', d)} +# PLDM Support +inherit ${@bb.utils.contains('DISTRO_FEATURES', 'openpower-hostfw-over-pldm', \ + 'openpower-software-manager-pldm', \ + '', d)} + PACKAGECONFIG[verify_pnor_signature] = "-Dverify-signature=enabled, -Dverify-signature=disabled" PACKAGECONFIG[ubifs_layout] = "-Ddevice-type=ubi,,,mtd-utils-ubifs" PACKAGECONFIG[mmc_layout] = "-Ddevice-type=mmc" PACKAGECONFIG[virtual_pnor] = "-Dvpnor=enabled, -Dvpnor=disabled,,bash" +PACKAGECONFIG[pldm] = "-Dpldm=enabled, -Dpldm=disabled" EXTRA_OEMESON += " \ -Dtests=disabled \ @@ -61,7 +67,7 @@ S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/openpower-pnor-code-mgmt" -SRCREV = "9c2ef681e33ef736e23ec9095bf6fa8d7eeb950e" +SRCREV = "6fc7fcd6b12cdf11552468244ea4b61d0c339d11" DBUS_SERVICE:${PN} += "org.open_power.Software.Host.Updater.service" |