From 830b10a82cd089ef144de7684c47540bb08b06e2 Mon Sep 17 00:00:00 2001 From: Jayanth Othayoth Date: Wed, 29 Sep 2021 01:44:48 -0500 Subject: openpower: ipl version bump ..2af23633e2 Changes: Jayanth Othayoth (17): libipl: fix sbe_start error handling issues libphal: initial commit libphal: Create TemporaryFile class libphal: exception based error handling infrastructure libphal: error log infrastructure support for SBE utils libphal: Add buffer management support libphal: initial commit for pdbg utility functions libphal: validateSBEState api support libphal: captureFFDC api support libphal: mpiplContinue api support libphal: getTiInfo api support libphal: mpiplEnter api support libphal: update on pdbg_target type declaration syntax libipl: Add helper function to support SBE state management libipl: Step 0 SBE state management updates libipl: pre-poweroff path SBE state management updates libipl: rename IPL_ERR_CFAM to IPL_ERR_FSI_REG Signed-off-by: Jayanth Othayoth Change-Id: I2fbfadbc2a965e9d54eea238436d1e98670a981d --- meta-openpower/recipes-bsp/ipl/ipl_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-bsp') diff --git a/meta-openpower/recipes-bsp/ipl/ipl_git.bb b/meta-openpower/recipes-bsp/ipl/ipl_git.bb index 3e49bbd14..7d6163dc8 100644 --- a/meta-openpower/recipes-bsp/ipl/ipl_git.bb +++ b/meta-openpower/recipes-bsp/ipl/ipl_git.bb @@ -12,7 +12,7 @@ inherit autotools S = "${WORKDIR}/git" SRC_URI = "git://git@github.com/open-power/ipl;branch="main"" -SRCREV = "5edb65ddf5820579179d51bfc859fcd973aaac0d" +SRCREV = "2af23633e266a6513124fce995e07c121c5cf3df" DEPENDS = " \ libekb pdbg autoconf-archive guard \ -- cgit v1.2.3 From 934d28d603988c0e55771d1cb4574384ee86f17f Mon Sep 17 00:00:00 2001 From: Jayanth Othayoth Date: Wed, 29 Sep 2021 01:53:36 -0500 Subject: openpower: phal utility library support phal(power hardware abstraction layer) utility library Utility library functions for PHAL repository provided APIs. This is mainly intended for advanced RAS support for phal provided APIs in a common place. Also provides c++ wrapper around some of libpdbg functionality. This commit enabled build support for libphal libarary source code is available here https://github.com/open-power/ipl/blob/main/libphal/ Signed-off-by: Jayanth Othayoth Change-Id: I976133727ae7b632baf5d1a38c6c433b9c8b641c --- meta-openpower/recipes-bsp/ipl/ipl_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-bsp') diff --git a/meta-openpower/recipes-bsp/ipl/ipl_git.bb b/meta-openpower/recipes-bsp/ipl/ipl_git.bb index 7d6163dc8..61e32e9a4 100644 --- a/meta-openpower/recipes-bsp/ipl/ipl_git.bb +++ b/meta-openpower/recipes-bsp/ipl/ipl_git.bb @@ -20,4 +20,4 @@ DEPENDS = " \ RDEPENDS:${PN} = "phal-devtree" -EXTRA_OECONF = "CHIP=p10" +EXTRA_OECONF = "CHIP=p10 --enable-libphal" -- cgit v1.2.3 From dc924a75cfa3c49d5caf54881a9d5928e33364cb Mon Sep 17 00:00:00 2001 From: Jayanth Othayoth Date: Tue, 5 Oct 2021 01:58:11 -0500 Subject: ekb: srcrev bump c14cb37697..eba08e93a7 Commits included - RAS Review updates - fix build issues related to xml syntax - Release tag & head commit information updated for hw093021a.opmst10 - SBE Dump procedure updates. Signed-off-by: Jayanth Othayoth Change-Id: I53873c603c0441a11611eec057392854075a5eba --- meta-openpower/recipes-bsp/ekb/ekb.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-bsp') diff --git a/meta-openpower/recipes-bsp/ekb/ekb.inc b/meta-openpower/recipes-bsp/ekb/ekb.inc index 678675071..3c882f1d1 100644 --- a/meta-openpower/recipes-bsp/ekb/ekb.inc +++ b/meta-openpower/recipes-bsp/ekb/ekb.inc @@ -1,6 +1,6 @@ EKB_BRANCH = "main-p10" EKB_URI = "git://git@github.com/open-power/pub-ekb;branch=${EKB_BRANCH}" -EKB_REV = "c14cb37697636c15742efe1c0318d01da2f82902" +EKB_REV = "eba08e93a78a9085b55a945a4e16d99d693a304d" REQ_ATTRS_XMLS = "hwpf/fapi2/xml/attribute_info/chip_attributes.xml \ hwpf/fapi2/xml/attribute_info/common_attributes.xml \ -- cgit v1.2.3 From 247ce8f3b9022b95929dfb5a87d6cf1839eb4be4 Mon Sep 17 00:00:00 2001 From: Jayanth Othayoth Date: Tue, 5 Oct 2021 02:06:33 -0500 Subject: libekb: srcrev bump a68c2f6102..742ec3d703 Commits included Dhruvaraj Subhashchandran (1): libekb: Add support for SBE dump HWPs Jayanth Othayoth (1): ekb: Update EKB to hw093021a.opmst10 Signed-off-by: Jayanth Othayoth Change-Id: I71b95167c67ca55affb30a9316eecb6b1a2d3c4e --- meta-openpower/recipes-bsp/libekb/libekb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-bsp') diff --git a/meta-openpower/recipes-bsp/libekb/libekb_git.bb b/meta-openpower/recipes-bsp/libekb/libekb_git.bb index ac650a4a8..63a52aa97 100644 --- a/meta-openpower/recipes-bsp/libekb/libekb_git.bb +++ b/meta-openpower/recipes-bsp/libekb/libekb_git.bb @@ -17,7 +17,7 @@ inherit autotools \ SRCREV_FORMAT = "libekb_ekb" -SRCREV_libekb = "a68c2f610243d3f128f561c4451135241aedbf6b" +SRCREV_libekb = "742ec3d7035be9396d324df597f48ab7d749f3dd" SRCREV_ekb = "${EKB_REV}" SRC_URI = "git://git@github.com/open-power/libekb_p10;branch="main";name=libekb \ -- cgit v1.2.3 From 7cf2f6c819fd46d698c1d5ce3058ca3bae4db412 Mon Sep 17 00:00:00 2001 From: Jayanth Othayoth Date: Tue, 12 Oct 2021 05:18:02 -0500 Subject: openpower: ipl version bump ..ea1162e71b Dhruvaraj Subhashchandran (1): libphal: Add support for SBE dump collection Jayanth Othayoth (4): libphal: SbeError class updates libphal: pdbg init api support libipl: MPIPL skip sbe state updates in updatehwmdel step libipl: refactor mpipl_continue chip-op Signed-off-by: Jayanth Othayoth Change-Id: Ic4a7bc5cf74d54c05ced2707ac9ee10e126c9c00 --- meta-openpower/recipes-bsp/ipl/ipl_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-bsp') diff --git a/meta-openpower/recipes-bsp/ipl/ipl_git.bb b/meta-openpower/recipes-bsp/ipl/ipl_git.bb index 61e32e9a4..485b5178b 100644 --- a/meta-openpower/recipes-bsp/ipl/ipl_git.bb +++ b/meta-openpower/recipes-bsp/ipl/ipl_git.bb @@ -12,7 +12,7 @@ inherit autotools S = "${WORKDIR}/git" SRC_URI = "git://git@github.com/open-power/ipl;branch="main"" -SRCREV = "2af23633e266a6513124fce995e07c121c5cf3df" +SRCREV = "ea1162e71b10e3979fdad64c32f95d1f69362de2" DEPENDS = " \ libekb pdbg autoconf-archive guard \ -- cgit v1.2.3 From d7830ee51690545b19f487dbbdd498a6bdd51a9a Mon Sep 17 00:00:00 2001 From: Jayanth Othayoth Date: Fri, 15 Oct 2021 01:53:01 -0500 Subject: openpower: ipl version bump ..d3d5471263 Jayanth Othayoth (15): libphal: Add exception class support for pdbg utils libphal: isTgtPresent API support libphal: isTgtFunctional API support libphal: isPrimary processor API support libphal: getPrimaryProc API support libphal: getCFAM API support libphal: putCFAM API support libphal: sbe setState API support libphal: sbe getState API support libphal: sbe isPrimaryIplDone API support libphal: sbe isDumpAllowed API support libphal: sbe getDump API support libphal: isSbeVitalAttnActive API support libphal: update in pdbg init function libphal: fix validateSBEState function build issue Added pdata dependencies to enable phal devtree custom api's Signed-off-by: Jayanth Othayoth Change-Id: Ibb4d487989ba0c2c2edd965f5bf88bc8f060e017 --- meta-openpower/recipes-bsp/ipl/ipl_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta-openpower/recipes-bsp') diff --git a/meta-openpower/recipes-bsp/ipl/ipl_git.bb b/meta-openpower/recipes-bsp/ipl/ipl_git.bb index 485b5178b..4c6f827cc 100644 --- a/meta-openpower/recipes-bsp/ipl/ipl_git.bb +++ b/meta-openpower/recipes-bsp/ipl/ipl_git.bb @@ -7,15 +7,15 @@ PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -inherit autotools +inherit autotools pkgconfig S = "${WORKDIR}/git" SRC_URI = "git://git@github.com/open-power/ipl;branch="main"" -SRCREV = "ea1162e71b10e3979fdad64c32f95d1f69362de2" +SRCREV = "40f24df6dc4172986bbcb5f0d62dac1fc8f2c4c9" DEPENDS = " \ - libekb pdbg autoconf-archive guard \ + libekb pdbg autoconf-archive guard pdata \ " RDEPENDS:${PN} = "phal-devtree" -- cgit v1.2.3 From bbadc7681c8fa0ab9febffb922421b3606022eaf Mon Sep 17 00:00:00 2001 From: Jayanth Othayoth Date: Sun, 17 Oct 2021 02:27:31 -0500 Subject: openpower: guard version bump ..ebb9771055 Chirag Sharma (5): libguard: Adding space check before creating record libguard: Add support for guard record history libguard: Storing oldest resolved record's position libguard: Adding user defined exceptions tool: Changes in options of guard tool Ramesh Iyyar (7): libguard: Throwing exception on create failure libguard: Return created record data libguard: Added helper function to delete guard record libguard: Using helper function to delete guard record libguard: Throwing exception on delete guard record libguard: Added a clear() interface to pass record id libguard: Added a interface to get guard file path Signed-off-by: Jayanth Othayoth Change-Id: I54fe14b1ada8cbaa54ea126c63c5ac79fff86ca7 --- meta-openpower/recipes-bsp/guard/guard_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-bsp') diff --git a/meta-openpower/recipes-bsp/guard/guard_git.bb b/meta-openpower/recipes-bsp/guard/guard_git.bb index 0d5ff964f..8208a9cbb 100644 --- a/meta-openpower/recipes-bsp/guard/guard_git.bb +++ b/meta-openpower/recipes-bsp/guard/guard_git.bb @@ -11,7 +11,7 @@ inherit meson S = "${WORKDIR}/git" SRC_URI = "git://git@github.com/open-power/guard;branch="main"" -SRCREV = "87b02b63b64b36a925bec42723d70e0531e93407" +SRCREV = "ebb9771055a3bb03ed753530870199607559ab63" DEPENDS = "cli11" -- cgit v1.2.3 From af9e207d0cc05fd330f929a29679586b73a0690d Mon Sep 17 00:00:00 2001 From: Jayanth Othayoth Date: Fri, 8 Oct 2021 00:56:01 -0500 Subject: pdata: srcrev bump b05eb90ad1..9d6b94bcd5 Jayanth Othayoth (1) build: Added bootstrap script Signed-off-by: Jayanth Othayoth Change-Id: I2af69eab47200f4f0f05d0a12f9989197c34d37c --- meta-openpower/recipes-bsp/pdata/pdata_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-bsp') diff --git a/meta-openpower/recipes-bsp/pdata/pdata_git.bb b/meta-openpower/recipes-bsp/pdata/pdata_git.bb index 4beb125e2..6ebfa3de6 100644 --- a/meta-openpower/recipes-bsp/pdata/pdata_git.bb +++ b/meta-openpower/recipes-bsp/pdata/pdata_git.bb @@ -13,7 +13,7 @@ inherit autotools \ perlnative SRC_URI = "git://git@github.com/open-power/pdata;branch="main"" -SRCREV = "b05eb90ad19807ab0f8f1c861c56a0dbb0a75d0b" +SRCREV = "9d6b94bcd5bc52c435175e8e2c05555df6271e7e" DEPENDS = "pdbg \ libxml-simple-perl-native \ -- cgit v1.2.3 From c8dbbb56e89ded4141ffa904a8f8581c9c6fd948 Mon Sep 17 00:00:00 2001 From: Jayanth Othayoth Date: Fri, 22 Oct 2021 05:54:05 -0500 Subject: openpower: ekb: srcrev bump eba08e93a7..a9996cb686 Commit included - Added sbe hreset procedure. - refershed sbe error xmls with latest. Signed-off-by: Jayanth Othayoth Change-Id: I9ad4c08aeed55d3345c5523e1e05c9ecc51a08f0 --- meta-openpower/recipes-bsp/ekb/ekb.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-bsp') diff --git a/meta-openpower/recipes-bsp/ekb/ekb.inc b/meta-openpower/recipes-bsp/ekb/ekb.inc index 3c882f1d1..ddad05cb8 100644 --- a/meta-openpower/recipes-bsp/ekb/ekb.inc +++ b/meta-openpower/recipes-bsp/ekb/ekb.inc @@ -1,6 +1,6 @@ EKB_BRANCH = "main-p10" EKB_URI = "git://git@github.com/open-power/pub-ekb;branch=${EKB_BRANCH}" -EKB_REV = "eba08e93a78a9085b55a945a4e16d99d693a304d" +EKB_REV = "a9996cb6861198688010522baed369b0af0e6aca" REQ_ATTRS_XMLS = "hwpf/fapi2/xml/attribute_info/chip_attributes.xml \ hwpf/fapi2/xml/attribute_info/common_attributes.xml \ -- cgit v1.2.3 From 9657ed3a430000aa40231e97d8bcaeb2a88fb247 Mon Sep 17 00:00:00 2001 From: Jayanth Othayoth Date: Fri, 22 Oct 2021 06:03:59 -0500 Subject: openpower: ecmd-pdbg initial commit The code in this repo provides the glue code necessary for pdbg to be used as an eCMD plugin. Signed-off-by: Jayanth Othayoth Change-Id: Id1e621025d3ee2f536bf0936533068dc202c0c65 --- .../recipes-bsp/ecmd-pdbg/ecmd-pdbg_1.0.bb | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 meta-openpower/recipes-bsp/ecmd-pdbg/ecmd-pdbg_1.0.bb (limited to 'meta-openpower/recipes-bsp') diff --git a/meta-openpower/recipes-bsp/ecmd-pdbg/ecmd-pdbg_1.0.bb b/meta-openpower/recipes-bsp/ecmd-pdbg/ecmd-pdbg_1.0.bb new file mode 100644 index 000000000..df98965af --- /dev/null +++ b/meta-openpower/recipes-bsp/ecmd-pdbg/ecmd-pdbg_1.0.bb @@ -0,0 +1,23 @@ +SUMMARY = "eCMD plugin with pdbg backend" +DESCRIPTION = "The glue code necessary for pdbg to be used as an eCMD plugin" +PR = "r1" +PV = "1.0+git${SRCPV}" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" + +inherit meson +inherit pkgconfig + +SRC_URI = "git://git@github.com/open-power/ecmd-pdbg.git" +SRCREV = "349e04048409b4a619f4bc979aa5dd76e2bbc665" + +S = "${WORKDIR}/git" + +DEPENDS = "pdbg zlib libyaml ipl" + +FILES:${PN} += "${prefix}/help" + +EXTRA_OEMESON = " \ + -Dchip=p10 \ + " -- cgit v1.2.3 From 8c561eecb190655d51249c37286cc2c904dee7c0 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Fri, 22 Oct 2021 14:20:12 -0500 Subject: treewide: clean up recipe checks in OBMC_MACHINE_FEATURES OBMC_MACHINE_FEATURES is a variable that probably shouldn't even exist as all it does is provide a level of indirection to the real MACHINE_FEATURES (in phosphor-base.inc, OBMC_ is added to the base). There are a few recipes that have developed checks against OBMC_MACHINE_FEATURES for enabling recipe-level features when they should be checking the standard MACHINE_FEATURES variable. Clean up this recipe-level indirection. Signed-off-by: Patrick Williams Change-Id: Id437b93aa6c1de9a27726eea9b7e2c30e71ab3bf --- .../logging/phosphor-logging_%.bbappend | 2 +- meta-openpower/recipes-bsp/guard/guard_git.bb | 2 +- .../openpower-debug-collector-systemd-links.inc | 4 ++-- .../debug/openpower-debug-collector_git.bb | 2 +- .../host/op-proc-control-systemd-links.bb | 4 ++-- .../recipes-phosphor/host/op-proc-control_git.bb | 26 +++++++++++----------- .../logging/openpower-hw-diags_git.bb | 2 +- .../occ/openpower-occ-control_git.bb | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) (limited to 'meta-openpower/recipes-bsp') diff --git a/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend b/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend index 361417410..aa69617da 100644 --- a/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend +++ b/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend @@ -11,7 +11,7 @@ FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-logging/pels/ibm,rainier-4u_de FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-logging/pels/ibm,everest_dev_callouts.json" #Enable phal feature, if available. -PACKAGECONFIG:append = " ${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" +PACKAGECONFIG:append = " ${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" PACKAGECONFIG[phal] = "-Dphal=enabled, -Dphal=disabled, pdata libekb pdbg" do_install:append:p10bmc() { diff --git a/meta-openpower/recipes-bsp/guard/guard_git.bb b/meta-openpower/recipes-bsp/guard/guard_git.bb index 8208a9cbb..30e7c6b75 100644 --- a/meta-openpower/recipes-bsp/guard/guard_git.bb +++ b/meta-openpower/recipes-bsp/guard/guard_git.bb @@ -15,5 +15,5 @@ SRCREV = "ebb9771055a3bb03ed753530870199607559ab63" DEPENDS = "cli11" -PACKAGECONFIG ??= "${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" PACKAGECONFIG[phal] = "-Ddevtree=enabled, -Ddevtree=disabled, pdata pdbg" diff --git a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector-systemd-links.inc b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector-systemd-links.inc index 9c522c1cd..b252e6c11 100644 --- a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector-systemd-links.inc +++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector-systemd-links.inc @@ -15,7 +15,7 @@ pkg_postinst:${PN}:append() { TARGET="../openpower-debug-collector-watchdog@.service" ln -s $TARGET $LINK - if [ "${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" != 'phal' ]; then + if [ "${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" != 'phal' ]; then LINK="$D$systemd_system_unitdir/obmc-host-timeout@0.target.wants/openpower-debug-collector-watchdog-timeout@0.service" TARGET="../openpower-debug-collector-watchdog-timeout@.service" ln -s $TARGET $LINK @@ -29,7 +29,7 @@ pkg_prerm:${PN}:append() { fi LINK="$D$systemd_system_unitdir/obmc-host-timeout@0.target.wants/openpower-debug-collector-watchdog@0.service" rm $LINK - if [ "${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" != 'phal' ]; then + if [ "${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" != 'phal' ]; then LINK="$D$systemd_system_unitdir/obmc-host-timeout@0.target.wants/openpower-debug-collector-watchdog-timeout@0.service" rm $LINK fi diff --git a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb index 68965af0a..cdb1da621 100644 --- a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb +++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb @@ -24,7 +24,7 @@ S = "${WORKDIR}/git" APPS = " \ checkstop \ watchdog \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', '', 'watchdog-timeout', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', '', 'watchdog-timeout', d)} \ " DEBUG_TMPL = "openpower-debug-collector-{0}@.service" 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 8cedb62a5..f3c63adad 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 @@ -48,7 +48,7 @@ pkg_postinst:${PN}() { ln -s $TARGET $LINK # Only install certain units if phal enabled - if [ "${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" = phal ]; then + if [ "${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" = phal ]; then 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" @@ -115,7 +115,7 @@ pkg_prerm:${PN}() { rm $LINK # Remove phal specific units if enabled - if [ "${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" = phal ]; then + if [ "${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" = phal ]; then LINK="$D$systemd_system_unitdir/obmc-host-start@0.target.requires/phal-reinit-devtree.service" rm $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 32a7d4778..92287f529 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb @@ -31,16 +31,16 @@ SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE:${PN} = "${TEMPLATE} ${INSTANCES}" SYSTEMD_SERVICE:${PN} += " \ - xyz.openbmc_project.Control.Host.NMI.service \ - op-stop-instructions@.service \ - op-cfam-reset.service \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'set-spi-mux.service', '', d)} \ - op-continue-mpreboot@.service \ - op-enter-mpreboot@.service \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'phal-reinit-devtree.service', '', d)} \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'proc-pre-poweroff@.service', '', d)} \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'op-reset-host-check@.service', '', d)} \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'op-reset-host-clear.service', '', d)} \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'phal-import-devtree@.service', '', d)} \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'phal-export-devtree@.service', '', d)} \ - " + op-cfam-reset.service \ + op-continue-mpreboot@.service \ + op-enter-mpreboot@.service \ + op-stop-instructions@.service \ + xyz.openbmc_project.Control.Host.NMI.service \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'op-reset-host-check@.service', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'op-reset-host-clear.service', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'phal-export-devtree@.service', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'phal-import-devtree@.service', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'phal-reinit-devtree.service', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'proc-pre-poweroff@.service', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'set-spi-mux.service', '', d)} \ + " diff --git a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb index 4a61ba3bd..fc7c39dfc 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -30,6 +30,6 @@ DEPENDS = "boost libgpiod pdbg phosphor-logging sdbusplus openpower-libhei \ RDEPENDS:${PN} += "openpower-libhei" # Conditionally pull in PHAL APIs, if available. -PACKAGECONFIG ??= "${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" PACKAGECONFIG[phal] = "-Dphal=enabled, -Dphal=disabled, ipl pdata" diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb b/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb index b78b85bfb..804084e1d 100644 --- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb @@ -43,7 +43,7 @@ EXTRA_OEMESON = " \ -Dyamldir=${STAGING_DATADIR_NATIVE}/${PN} \ -Dps-derating-factor=${POWER_SUPPLY_DERATING_FACTOR} \ " -EXTRA_OEMESON:append = "${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'i2c-occ', ' -Di2c-occ=enabled', '', d)}" +EXTRA_OEMESON:append = "${@bb.utils.contains('MACHINE_FEATURES', 'i2c-occ', ' -Di2c-occ=enabled', '', d)}" OCC_ENABLE = "enable" OCC_DISABLE = "disable" -- cgit v1.2.3 From 5fdf39f9c6594a5be2ffb78916b823b52d756c36 Mon Sep 17 00:00:00 2001 From: Jayanth Othayoth Date: Wed, 27 Oct 2021 02:41:22 -0500 Subject: openpower: libekb: srcrev bump 742ec3d703..5ac6a46364 Jayanth Othayoth (4): ekb: Update EKB to ..a9996cb686 hwpf: fix crosses initialization error in switch case libekb: Updated SBE Error xml list ..a9996cb686 libekb: Added sbe hreset hwp support Signed-off-by: Jayanth Othayoth Change-Id: I405d17e7a0bde2222274d35b2cb00f9e8fcc283d --- meta-openpower/recipes-bsp/libekb/libekb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-bsp') diff --git a/meta-openpower/recipes-bsp/libekb/libekb_git.bb b/meta-openpower/recipes-bsp/libekb/libekb_git.bb index 63a52aa97..7c6a7ad2d 100644 --- a/meta-openpower/recipes-bsp/libekb/libekb_git.bb +++ b/meta-openpower/recipes-bsp/libekb/libekb_git.bb @@ -17,7 +17,7 @@ inherit autotools \ SRCREV_FORMAT = "libekb_ekb" -SRCREV_libekb = "742ec3d7035be9396d324df597f48ab7d749f3dd" +SRCREV_libekb = "5ac6a46364dc065e058f0886d3ae5717eb8a52f1" SRCREV_ekb = "${EKB_REV}" SRC_URI = "git://git@github.com/open-power/libekb_p10;branch="main";name=libekb \ -- cgit v1.2.3 From 54b0890ed9a03130b39717f90954617aa4770e6a Mon Sep 17 00:00:00 2001 From: Jayanth Othayoth Date: Tue, 2 Nov 2021 01:31:03 -0500 Subject: openpower: guard version bump ..3fa0e5e312 Adriana Kobylak (1): Update GUARD PATH Signed-off-by: Jayanth Othayoth Change-Id: I018b931f5d15e0841f623958ba88c6fe3cea3876 --- meta-openpower/recipes-bsp/guard/guard_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-bsp') diff --git a/meta-openpower/recipes-bsp/guard/guard_git.bb b/meta-openpower/recipes-bsp/guard/guard_git.bb index 30e7c6b75..cda809e5c 100644 --- a/meta-openpower/recipes-bsp/guard/guard_git.bb +++ b/meta-openpower/recipes-bsp/guard/guard_git.bb @@ -11,7 +11,7 @@ inherit meson S = "${WORKDIR}/git" SRC_URI = "git://git@github.com/open-power/guard;branch="main"" -SRCREV = "ebb9771055a3bb03ed753530870199607559ab63" +SRCREV = "3fa0e5e312cb4138afb11e083e9ba7b0f0d5d5dc" DEPENDS = "cli11" -- cgit v1.2.3 From baf5ba7c52d366457831f44e06f2ac017c843377 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 3 Nov 2021 10:01:23 -0500 Subject: meta-openpower:meson: pkgconfig inherit required Upstream yocto made a change recently that brought to light a bug in some of our recipes. If your meson makefiles utilize the dependency() function then the recipe must also include pkgconfig. Signed-off-by: Andrew Geissler Change-Id: I48c062226275c6e110bde27e815d2643c369c14c --- meta-openpower/recipes-bsp/guard/guard_git.bb | 2 +- meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb | 2 +- meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb | 2 +- meta-openpower/recipes-phosphor/logging/openpower-libhei_git.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'meta-openpower/recipes-bsp') diff --git a/meta-openpower/recipes-bsp/guard/guard_git.bb b/meta-openpower/recipes-bsp/guard/guard_git.bb index cda809e5c..ba649db9d 100644 --- a/meta-openpower/recipes-bsp/guard/guard_git.bb +++ b/meta-openpower/recipes-bsp/guard/guard_git.bb @@ -6,7 +6,7 @@ PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -inherit meson +inherit pkgconfig meson S = "${WORKDIR}/git" diff --git a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb index cdb1da621..b9a2393d9 100644 --- a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb +++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb @@ -4,7 +4,7 @@ DESCRIPTION = "Application to log error during host checkstop and watchdog timeo PR = "r1" PV = "1.0+git${SRCPV}" -inherit meson \ +inherit pkgconfig meson \ obmc-phosphor-systemd \ python3native \ phosphor-dbus-yaml diff --git a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb index 4efdfce98..e0affeda1 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -19,7 +19,7 @@ SRCREV = "39fcf65dce4d91601951c146a543bf85d68f6b3c" S = "${WORKDIR}/git" -inherit meson systemd +inherit pkgconfig meson systemd SYSTEMD_SERVICE:${PN} = "attn_handler.service" diff --git a/meta-openpower/recipes-phosphor/logging/openpower-libhei_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-libhei_git.bb index 183e2ed5c..d45d95f3c 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-libhei_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-libhei_git.bb @@ -13,7 +13,7 @@ include openpower-libhei-rev.inc S = "${WORKDIR}/git" -inherit meson +inherit pkgconfig meson inherit perlnative DEPENDS = "libxml2-native libxml-simple-perl-native libjson-perl-native" -- cgit v1.2.3 From 458c7e53c9cfcf788d30ee785d52f0554c2a4c1d Mon Sep 17 00:00:00 2001 From: Jayanth Othayoth Date: Thu, 11 Nov 2021 06:37:32 -0600 Subject: openpower: ipl version bump ..65468bce95 Jayanth Othayoth (2): libphal: utility function to get target from bin path libphal: deconfigureTgt API support Signed-off-by: Jayanth Othayoth Change-Id: I82e0b99496cf66b29aea8b058e13b0730d113e77 --- meta-openpower/recipes-bsp/ipl/ipl_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-bsp') diff --git a/meta-openpower/recipes-bsp/ipl/ipl_git.bb b/meta-openpower/recipes-bsp/ipl/ipl_git.bb index 4c6f827cc..bbce76551 100644 --- a/meta-openpower/recipes-bsp/ipl/ipl_git.bb +++ b/meta-openpower/recipes-bsp/ipl/ipl_git.bb @@ -12,7 +12,7 @@ inherit autotools pkgconfig S = "${WORKDIR}/git" SRC_URI = "git://git@github.com/open-power/ipl;branch="main"" -SRCREV = "40f24df6dc4172986bbcb5f0d62dac1fc8f2c4c9" +SRCREV = "65468bce95cbe7fa48b8c938b496cf04c6a02f83" DEPENDS = " \ libekb pdbg autoconf-archive guard pdata \ -- cgit v1.2.3 From 9483fe5ce1bc2a051c2b1696fd74586ec07023a9 Mon Sep 17 00:00:00 2001 From: Jayanth Othayoth Date: Mon, 15 Nov 2021 03:08:51 -0600 Subject: openpower: ipl version bump ..11775c0f84 Jayanth Othayoth (1): libphal: getLocationCode API support Signed-off-by: Jayanth Othayoth Change-Id: I73fc7219b3b44a4f81a610a68b539ec13ed3b508 --- meta-openpower/recipes-bsp/ipl/ipl_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-bsp') diff --git a/meta-openpower/recipes-bsp/ipl/ipl_git.bb b/meta-openpower/recipes-bsp/ipl/ipl_git.bb index bbce76551..dfe2a40f6 100644 --- a/meta-openpower/recipes-bsp/ipl/ipl_git.bb +++ b/meta-openpower/recipes-bsp/ipl/ipl_git.bb @@ -12,7 +12,7 @@ inherit autotools pkgconfig S = "${WORKDIR}/git" SRC_URI = "git://git@github.com/open-power/ipl;branch="main"" -SRCREV = "65468bce95cbe7fa48b8c938b496cf04c6a02f83" +SRCREV = "11775c0f84a3e62735503294c1ee7ec61fcd4c9a" DEPENDS = " \ libekb pdbg autoconf-archive guard pdata \ -- cgit v1.2.3