Merge pull request #4373 from kgdeepak/ima-update
P10 IMA Catalog Core events and groups updated
diff --git a/openpower/configs/hostboot/p10ebmc.config b/openpower/configs/hostboot/p10ebmc.config
index b4460ce..44672c9 100755
--- a/openpower/configs/hostboot/p10ebmc.config
+++ b/openpower/configs/hostboot/p10ebmc.config
@@ -1,7 +1,9 @@
-# The HIOMAP protocol is used to access PNOR
+# PLDM is used to access PNOR
+set FILE_XFER_VIA_PLDM
+
unset SFC_IS_AST2500
unset SFC_IS_AST2400
-set PNORDD_IS_IPMI
+unset PNORDD_IS_IPMI
unset PNORDD_IS_SFC
unset ALLOW_MICRON_PNOR
unset ALLOW_MACRONIX_PNOR
diff --git a/openpower/package/hcode-p10/Config.in b/openpower/package/hcode-p10/Config.in
index a1a5747..6733f3e 100644
--- a/openpower/package/hcode-p10/Config.in
+++ b/openpower/package/hcode-p10/Config.in
@@ -31,7 +31,7 @@
config BR2_HCODE_P10_VERSION
string
- default "hw101521a.opmst10" if BR2_HCODE_P10_LATEST_VERSION
+ default "hw102521a.opmst10" if BR2_HCODE_P10_LATEST_VERSION
default BR2_HCODE_P10_CUSTOM_VERSION_VALUE \
if BR2_HCODE_P10_CUSTOM_VERSION
diff --git a/openpower/package/hostboot-binaries/Config.in b/openpower/package/hostboot-binaries/Config.in
index 9a53571..50d91a7 100644
--- a/openpower/package/hostboot-binaries/Config.in
+++ b/openpower/package/hostboot-binaries/Config.in
@@ -24,7 +24,7 @@
config BR2_HOSTBOOT_BINARIES_VERSION
string
- default "hw101921a.opmst" if BR2_HOSTBOOT_BINARIES_LATEST_VERSION
+ default "hw102521a.opmst10" if BR2_HOSTBOOT_BINARIES_LATEST_VERSION
default BR2_HOSTBOOT_BINARIES_CUSTOM_VERSION_VALUE \
if BR2_HOSTBOOT_BINARIES_CUSTOM_VERSION
diff --git a/openpower/package/hostboot-p10/Config.in b/openpower/package/hostboot-p10/Config.in
index 1cad46c..ff35adb 100644
--- a/openpower/package/hostboot-p10/Config.in
+++ b/openpower/package/hostboot-p10/Config.in
@@ -25,7 +25,7 @@
config BR2_HOSTBOOT_P10_VERSION
string
- default "753c4662c6ed489b6fe59bf0a789a8c82e95e42e" if BR2_HOSTBOOT_P10_LATEST_VERSION
+ default "69303599ef7b37a1c097989f287a95b633bbc313" if BR2_HOSTBOOT_P10_LATEST_VERSION
default BR2_HOSTBOOT_P10_CUSTOM_VERSION_VALUE \
if BR2_HOSTBOOT_P10_CUSTOM_VERSION
diff --git a/openpower/package/sbe-p10/Config.in b/openpower/package/sbe-p10/Config.in
index d856866..4a77c81 100644
--- a/openpower/package/sbe-p10/Config.in
+++ b/openpower/package/sbe-p10/Config.in
@@ -26,7 +26,7 @@
config BR2_SBE_P10_VERSION
string
- default "f8ee8cfad2cf2a53e78789633ddffc192f5a197e" if BR2_SBE_P10_LATEST_VERSION
+ default "5d87c4356c30c44967c7c81e152f1962d80bb5b3" if BR2_SBE_P10_LATEST_VERSION
default BR2_SBE_P10_CUSTOM_VERSION_VALUE \
if BR2_SBE_P10_CUSTOM_VERSION
diff --git a/openpower/package/skiboot/Config.in b/openpower/package/skiboot/Config.in
index bdd5817..04e1052 100644
--- a/openpower/package/skiboot/Config.in
+++ b/openpower/package/skiboot/Config.in
@@ -31,7 +31,7 @@
config BR2_SKIBOOT_VERSION
string
- default "v6.8-104-g820d43c0a" if BR2_SKIBOOT_LATEST_VERSION
+ default "v7.0" if BR2_SKIBOOT_LATEST_VERSION
default BR2_SKIBOOT_CUSTOM_VERSION_VALUE \
if BR2_SKIBOOT_CUSTOM_VERSION