Merge tag '0.52' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update

8 files changed, 7 insertions, 7 deletions

diff --git a/meta-intel-openbmc/conf/layer.conf b/meta-intel-openbmc/conf/layer.conf
index e515b5f57..e2133be24 100644
--- a/meta-intel-openbmc/conf/layer.conf
+++ b/meta-intel-openbmc/conf/layer.conf
@@ -8,5 +8,5 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "intel"
 BBFILE_PATTERN_intel = "^${LAYERDIR}/"
 LAYERVERSION_intel = "1"
-LAYERSERIES_COMPAT_intel = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_intel = "gatesgarth hardknott"
 LAYERDEPENDS_intel = "phosphor-layer"
diff --git a/meta-intel-openbmc/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb b/meta-intel-openbmc/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb
index 6b24c522c..1236cbfc7 100644
--- a/meta-intel-openbmc/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb
+++ b/meta-intel-openbmc/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb
@@ -7,7 +7,7 @@ SRC_URI = "git://github.com/openbmc/host-error-monitor"
 DEPENDS = "boost sdbusplus libgpiod libpeci"
 
 PV = "0.1+git${SRCPV}"
-SRCREV = "c90570ab1ad57ac824edf7b5d0f8a89afbcf0c09"
+SRCREV = "4a6e45c4c2f38bc64afe5faac05ea82b3adb8d93"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta-intel-openbmc/meta-common/recipes-core/libpeci/libpeci_git.bb b/meta-intel-openbmc/meta-common/recipes-core/libpeci/libpeci_git.bb
index ad02834a3..417705148 100644
--- a/meta-intel-openbmc/meta-common/recipes-core/libpeci/libpeci_git.bb
+++ b/meta-intel-openbmc/meta-common/recipes-core/libpeci/libpeci_git.bb
@@ -8,6 +8,6 @@ inherit cmake
 SRC_URI = "git://github.com/openbmc/libpeci"
 
 PV = "0.1+git${SRCPV}"
-SRCREV = "8fc53d7cef0dd7ac405b5d7d91a368f376cdb508"
+SRCREV = "ff44e549c44c7658ec11e0c19c13c4c45900cfe4"
 
 S = "${WORKDIR}/git"
diff --git a/meta-intel-openbmc/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb b/meta-intel-openbmc/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb
index bb820da3f..3a86b5657 100755
--- a/meta-intel-openbmc/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb
+++ b/meta-intel-openbmc/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb
@@ -5,7 +5,7 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a4edad4aed50f39a66d098d74b265b"
 
 SRC_URI = "git://github.com/openbmc/intel-ipmi-oem"
-SRCREV = "06aa21ab75cecce354b2a17e05d053c6f61d6a29"
+SRCREV = "01fbd0176c403feb29bf2a9ddd17469d0a27c3ef"
 
 S = "${WORKDIR}/git"
 PV = "0.1+git${SRCPV}"
diff --git a/meta-intel-openbmc/meta-common/recipes-intel/pfr/pfr-manager_git.bb b/meta-intel-openbmc/meta-common/recipes-intel/pfr/pfr-manager_git.bb
index abfcbc539..264d661e9 100644
--- a/meta-intel-openbmc/meta-common/recipes-intel/pfr/pfr-manager_git.bb
+++ b/meta-intel-openbmc/meta-common/recipes-intel/pfr/pfr-manager_git.bb
@@ -8,7 +8,7 @@ inherit cmake systemd
 SRC_URI = "git://github.com/openbmc/pfr-manager"
 
 PV = "0.1+git${SRCPV}"
-SRCREV = "00acaffb3840d019bf0853d1ee93fdde947f47d2"
+SRCREV = "2dfaf507da581ed4c71d41c02976e4efafc1d634"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta-intel-openbmc/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-intel-openbmc/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend
index 4e24bab9e..bd97c35f4 100644
--- a/meta-intel-openbmc/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend
+++ b/meta-intel-openbmc/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend
@@ -1,5 +1,4 @@
 EXTRA_OEMESON += "-Dredfish-cpu-log=enabled \
-                  -Dredfish-raw-peci=enabled \
                   -Dredfish-bmc-journal=enabled \
                   -Drest=disabled"
 
diff --git a/meta-intel-openbmc/meta-s2600wf/conf/bblayers.conf.sample b/meta-intel-openbmc/meta-s2600wf/conf/bblayers.conf.sample
index c208e10fc..cbaf88b2e 100644
--- a/meta-intel-openbmc/meta-s2600wf/conf/bblayers.conf.sample
+++ b/meta-intel-openbmc/meta-s2600wf/conf/bblayers.conf.sample
@@ -13,6 +13,7 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-openembedded/meta-perl \
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
+  ##OEROOT##/meta-security \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-intel-openbmc \
diff --git a/meta-intel-openbmc/meta-s2600wf/conf/layer.conf b/meta-intel-openbmc/meta-s2600wf/conf/layer.conf
index c5001beec..82a9da0ae 100644
--- a/meta-intel-openbmc/meta-s2600wf/conf/layer.conf
+++ b/meta-intel-openbmc/meta-s2600wf/conf/layer.conf
@@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "s2600wf"
 BBFILE_PATTERN_s2600wf = ""
 BBFILE_PRIORITY_s2600wf = "5"
-LAYERSERIES_COMPAT_s2600wf = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_s2600wf = "gatesgarth hardknott"