From 71660fa4df66f9189c9d3e085b2b2bf0c71e01de Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 4 Oct 2021 19:30:28 +0000 Subject: openpower-pnor-code-mgmt: srcrev bump 4c2386a575..a38f6e652e Adriana Kobylak (2): ubi: reset: Preserve the SECBOOT partition mmc: Handle missing pnor.toc file George Liu (1): Remove the last comma of the biosAttrStr value Change-Id: I1a5baa391993177b979218d92979d17af1c47050 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb') 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 820ebc222..1de0c55e1 100644 --- a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb +++ b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb @@ -61,7 +61,7 @@ S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/openpower-pnor-code-mgmt" -SRCREV = "4c2386a575c9bd2f69d73af131cd635cc3c09b04" +SRCREV = "a38f6e652e7da6fc29e71adeeacfa8ae02c46ab8" DBUS_SERVICE:${PN} += "org.open_power.Software.Host.Updater.service" -- cgit v1.2.3 From 1dc611fc34ccb5beba49d0e46e7479a1b729833e Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 6 Oct 2021 21:10:25 +0000 Subject: openpower-pnor-code-mgmt: srcrev bump a38f6e652e..97a709b0c5 Patrick Williams (1): catch exceptions as const Change-Id: Iead74671298ce9b790e776d1af6886b0116d5bdb Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb') 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 1de0c55e1..b16784e39 100644 --- a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb +++ b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb @@ -61,7 +61,7 @@ S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/openpower-pnor-code-mgmt" -SRCREV = "a38f6e652e7da6fc29e71adeeacfa8ae02c46ab8" +SRCREV = "97a709b0c572eb203b9f0954d884cf0e8551eef6" DBUS_SERVICE:${PN} += "org.open_power.Software.Host.Updater.service" -- cgit v1.2.3 From 22e52b4881649f302a29753dc9fdbde565b3a21a Mon Sep 17 00:00:00 2001 From: George Liu Date: Thu, 7 Oct 2021 14:24:19 +0800 Subject: openpower-software-manager: Add runtime dependencies It will build fail when enabled `vitrual_pnor` and compile with `bitbake openpower-software-manager`. error message: /usr/bin/obmc-vpnor-util contained in package openpower-software-manager requires /bin/bash, but no providers found in RDEPENDS:openpower-software-manager? [file-rdeps] Add the runtime dependency(bash) to the openpower-software-manager_git.bb file. Tested: enabled `vitrual_pnor` and built openpower-software-manager successfully. Signed-off-by: George Liu Change-Id: I215d4b215a205a492b4509bc6f208182f25ce1d2 --- meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb') 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 b16784e39..7c130f2c0 100644 --- a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb +++ b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb @@ -34,7 +34,7 @@ inherit ${@bb.utils.contains('DISTRO_FEATURES', 'openpower-virtual-pnor', \ 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" +PACKAGECONFIG[virtual_pnor] = "-Dvpnor=enabled, -Dvpnor=disabled,,bash" EXTRA_OEMESON += " \ -Dtests=disabled \ -- cgit v1.2.3 From 9dc88a088eb9d5d436591050aaf27935e63495d6 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 18 Oct 2021 15:30:24 +0000 Subject: openpower-pnor-code-mgmt: srcrev bump 97a709b0c5..9c2ef681e3 Adriana Kobylak (1): op-pnor-msl.service: Remove RemainAfterExit Change-Id: I024bb3f72cdfb5883fd7bb6883bf70c29f6ab3ce Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb') 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 7c130f2c0..dcf8715e1 100644 --- a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb +++ b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb @@ -61,7 +61,7 @@ S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/openpower-pnor-code-mgmt" -SRCREV = "97a709b0c572eb203b9f0954d884cf0e8551eef6" +SRCREV = "9c2ef681e33ef736e23ec9095bf6fa8d7eeb950e" DBUS_SERVICE:${PN} += "org.open_power.Software.Host.Updater.service" -- cgit v1.2.3 From 6d8b8fe79040fadf6ab48dd2aa7036fbe43f52e1 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 19 Oct 2021 15:40:27 +0000 Subject: 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 Signed-off-by: Adriana Kobylak --- meta-ibm/conf/machine/p10bmc.conf | 1 + meta-openpower/classes/openpower-software-manager-mmc.bbclass | 2 -- meta-openpower/classes/openpower-software-manager-pldm.bbclass | 6 ++++++ meta-openpower/conf/distro/include/openpower-hostfw-over-pldm.inc | 2 ++ .../recipes-phosphor/flash/openpower-software-manager_git.bb | 8 +++++++- 5 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 meta-openpower/classes/openpower-software-manager-pldm.bbclass create mode 100644 meta-openpower/conf/distro/include/openpower-hostfw-over-pldm.inc (limited to 'meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb') 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" -- cgit v1.2.3 From b6465fd9ebf26cf321b7e53711af3fdaf9159b26 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 25 Oct 2021 21:10:33 +0000 Subject: openpower-pnor-code-mgmt: srcrev bump 6fc7fcd6b1..514a094e90 meta-openpower: mmc: add reference to new bios reset service Isaac Kurth (2): item_updater_mmc: Add service calls to bios reset openpower: mmc: physical reset triggers bios reset Change-Id: I98a64189e3ce2da59f858e8f37bdb1363e50f6de Signed-off-by: Andrew Geissler Signed-off-by: Isaac Kurth --- meta-openpower/classes/openpower-software-manager-mmc.bbclass | 1 + meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb') diff --git a/meta-openpower/classes/openpower-software-manager-mmc.bbclass b/meta-openpower/classes/openpower-software-manager-mmc.bbclass index fbf7c3b8b..b106fdeba 100644 --- a/meta-openpower/classes/openpower-software-manager-mmc.bbclass +++ b/meta-openpower/classes/openpower-software-manager-mmc.bbclass @@ -3,4 +3,5 @@ PACKAGECONFIG:append = " mmc_layout" SYSTEMD_SERVICE:${PN} += " \ obmc-flash-bios-init.service \ obmc-flash-bios-patch.service \ + openpower-bios-factory-reset.service \ " 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 633e031fc..455d2c290 100644 --- a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb +++ b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb @@ -67,7 +67,7 @@ S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/openpower-pnor-code-mgmt" -SRCREV = "6fc7fcd6b12cdf11552468244ea4b61d0c339d11" +SRCREV = "514a094e90e7cfc47161aa59bba47c2b92bcf7c4" DBUS_SERVICE:${PN} += "org.open_power.Software.Host.Updater.service" -- cgit v1.2.3 From f521a25425104e83927a2406cfa36a4c6372d838 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 16 Nov 2021 21:10:20 +0000 Subject: openpower-pnor-code-mgmt: srcrev bump 514a094e90..9cbc06b10d Adriana Kobylak (1): functions: Add runtime entries to bios attr string Change-Id: I18e8400fe5f92cecb986348e96c01557e155c45d Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb') 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 455d2c290..7b44d7840 100644 --- a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb +++ b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb @@ -67,7 +67,7 @@ S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/openpower-pnor-code-mgmt" -SRCREV = "514a094e90e7cfc47161aa59bba47c2b92bcf7c4" +SRCREV = "9cbc06b10d2738f7c2e3472cd447612768739f1d" DBUS_SERVICE:${PN} += "org.open_power.Software.Host.Updater.service" -- cgit v1.2.3