11 files changed, 14 insertions, 9 deletions
diff --git a/meta-openpower/recipes-bsp/libekb/libekb_git.bb b/meta-openpower/recipes-bsp/libekb/libekb_git.bb
index 7c6a7ad2d..ccaad5778 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 = "5ac6a46364dc065e058f0886d3ae5717eb8a52f1"
+SRCREV_libekb = "9a8b5a419f2058e7e1d4bb97a1f91bd2d343f86a"
 SRCREV_ekb = "${EKB_REV}"
 
 SRC_URI = "git://git@github.com/open-power/libekb_p10;branch="main";name=libekb \
diff --git a/meta-openpower/recipes-bsp/pdata/files/power-target.sh b/meta-openpower/recipes-bsp/pdata/files/power-target.sh
index 10c985050..4a024195c 100755
--- a/meta-openpower/recipes-bsp/pdata/files/power-target.sh
+++ b/meta-openpower/recipes-bsp/pdata/files/power-target.sh
@@ -1,6 +1,7 @@
 # Command line debug tools like pdbg and ecmd requires
 # PDBG_DTB environment variable.
-# attributes tool required both PDBG_DTB and PDATA_INFODB.
+# attributes tool required PDBG_DTB, PDATA_INFODB and PDATA_ATTR_OVERRIDE
 
 export PDBG_DTB=/var/lib/phosphor-software-manager/pnor/rw/DEVTREE
 export PDATA_INFODB=/usr/share/pdata/attributes_info.db
+export PDATA_ATTR_OVERRIDE=/tmp/devtree_attr_override
diff --git a/meta-openpower/recipes-bsp/pdata/pdata_git.bb b/meta-openpower/recipes-bsp/pdata/pdata_git.bb
index 6ebfa3de6..65e73a311 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 = "9d6b94bcd5bc52c435175e8e2c05555df6271e7e"
+SRCREV = "b2c92eff169e96a67db516f3ea29a4e9d601d89d"
 
 DEPENDS = "pdbg \
            libxml-simple-perl-native \
diff --git a/meta-openpower/recipes-bsp/pdbg/pdbg_3.3.bb b/meta-openpower/recipes-bsp/pdbg/pdbg_3.4.bb
index d7b3c31b9..ffbe0847b 100644
--- a/meta-openpower/recipes-bsp/pdbg/pdbg_3.3.bb
+++ b/meta-openpower/recipes-bsp/pdbg/pdbg_3.4.bb
@@ -4,7 +4,7 @@ LICENSE     = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
 SRC_URI += "git://github.com/open-power/pdbg.git"
-SRCREV = "v3.3"
+SRCREV = "v3.4"
 
 DEPENDS += "dtc-native"
 
diff --git a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-watchdog@.service b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-watchdog@.service
index 6fc3fec82..6826764ff 100644
--- a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-watchdog@.service
+++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-watchdog@.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=OpenPOWER debug data collector for host watchdog timeout
 Before=obmc-host-quiesce@%i.target
+After=op-stop-instructions@%i.service
 
 [Service]
 ExecStart=/usr/bin/env watchdog_timeout
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 7b44d7840..eca81d800 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 = "9cbc06b10d2738f7c2e3472cd447612768739f1d"
+SRCREV = "5e0b2375b20ea1e82f95770f68ae416a8c0de62f"
 
 DBUS_SERVICE:${PN} += "org.open_power.Software.Host.Updater.service"
 
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 1a3fde452..a0dd2bab2 100644
--- a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb
+++ b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb
@@ -11,7 +11,7 @@ inherit meson obmc-phosphor-utils pkgconfig
 inherit systemd
 
 SRC_URI += "git://github.com/openbmc/openpower-proc-control"
-SRCREV = "0ac7c38f64ce2c5a170ab6fe219d26e599713da3"
+SRCREV = "db92472533b150dfbe7e60489b47cfc4791ec11c"
 
 DEPENDS += " \
         phosphor-logging \
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 9bbba105e..040b26e06 100644
--- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb
+++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb
@@ -15,7 +15,7 @@ PR = "r1"
 PV = "0.1+git${SRCPV}"
 
 SRC_URI = "git://github.com/openbmc/openpower-hw-diags"
-SRCREV = "04f010abb7946c18d6bb68c714ca6a4417845d8d"
+SRCREV = "15527a43fe309d3599d146d5a48607b14b426a37"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc
index 93c2ae5bd..e10131436 100644
--- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc
+++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc
@@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-occ-control"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 SRC_URI += "git://github.com/openbmc/openpower-occ-control"
-SRCREV = "a7b74dc31001884243556e4433d0bbfda3c09083"
+SRCREV = "432dc48607223e24250e1fc4fa6fb42456a6db62"
diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control/org.open_power.OCC.Control.service b/meta-openpower/recipes-phosphor/occ/openpower-occ-control/org.open_power.OCC.Control.service
index d16bcdce7..10ac0ee94 100644
--- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control/org.open_power.OCC.Control.service
+++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control/org.open_power.OCC.Control.service
@@ -2,6 +2,9 @@
 Description=OpenPOWER OCC controller
 Wants=mapper-wait@-xyz-openbmc_project-inventory.service
 After=mapper-wait@-xyz-openbmc_project-inventory.service
+Wants=obmc-host-reset-running@0.target
+After=obmc-host-reset-running@0.target
+After=fsi-scan@0.service
 
 [Service]
 ExecStart=/usr/bin/env openpower-occ-control
diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc
index c26dc27f6..3a590a8c8 100644
--- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc
+++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc
@@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-vpd-parser"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 SRC_URI += "git://github.com/openbmc/openpower-vpd-parser"
-SRCREV = "88d2ae82af7fd97086c60fa9e39e0b4ee31a5974"
+SRCREV = "26d6c146d265de6f0b6b66baf3951298c0418a67"