openpower-software-manager: Add PLDM option to p10bmc
openpower-pnor-code-mgmt: srcrev bump 9c2ef681e3..6fc7fcd6b1
Adriana Kobylak (2):
Add a new pldm feature option
Add support for the host PLDM transport that takes place of hiomap
(mboxd). Add this new feature to p10bmc.
Tested: Verified that tacoma (that doesn't support pldm) and p10bmc
(supports pldm) reached runtime.
Change-Id: I31e8beba5ff8a413b7b7fa7476f5f2403d3781dd
Signed-off-by: Andrew Geissler <openbmcbump-github@yahoo.com>
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
diff --git a/meta-ibm/conf/machine/p10bmc.conf b/meta-ibm/conf/machine/p10bmc.conf
index 4956f87..1891129 100644
--- a/meta-ibm/conf/machine/p10bmc.conf
+++ b/meta-ibm/conf/machine/p10bmc.conf
@@ -10,6 +10,7 @@
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 afbee1a..fbf7c3b 100644
--- a/meta-openpower/classes/openpower-software-manager-mmc.bbclass
+++ b/meta-openpower/classes/openpower-software-manager-mmc.bbclass
@@ -3,6 +3,4 @@
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 0000000..3cfa4a2
--- /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 0000000..6c67b72
--- /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 dcf8715..633e031 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 @@
'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 @@
SRC_URI += "git://github.com/openbmc/openpower-pnor-code-mgmt"
-SRCREV = "9c2ef681e33ef736e23ec9095bf6fa8d7eeb950e"
+SRCREV = "6fc7fcd6b12cdf11552468244ea4b61d0c339d11"
DBUS_SERVICE:${PN} += "org.open_power.Software.Host.Updater.service"