Merge pull request #4145 from kgdeepak/ima-update
Updated Catalog files for P10 DD1 and DD2
diff --git a/openpower/configs/p10ebmc_defconfig b/openpower/configs/p10ebmc_defconfig
index 95f52df..3b68089 100644
--- a/openpower/configs/p10ebmc_defconfig
+++ b/openpower/configs/p10ebmc_defconfig
@@ -51,18 +51,18 @@
BR2_OPENPOWER_MACHINE_XML_CUSTOM_GIT=y
BR2_RAINIER_2U_XML_CUSTOM_GIT=y
BR2_RAINIER_2U_XML_CUSTOM_GIT_VALUE="git@github.ibm.com:openbmc/rainier-xml.git"
-BR2_RAINIER_2U_XML_VERSION="3d6140808f051ddb7c8829f19d5cfdcea8a19af6"
+BR2_RAINIER_2U_XML_VERSION="07073d927cb70cb074ce57d06f8b9a291716f654"
BR2_RAINIER_2U_XML_SYSTEM_FILENAME="Rainier-2U-MRW_hb.system.xml"
BR2_RAINIER_2U_XML_TARGETING_FILENAME="Rainier-2U-MRW_hb.mrw.xml"
BR2_RAINIER_4U_XML_CUSTOM_GIT=y
BR2_RAINIER_4U_XML_CUSTOM_GIT_VALUE="git@github.ibm.com:openbmc/rainier-xml.git"
-BR2_RAINIER_4U_XML_VERSION="3d6140808f051ddb7c8829f19d5cfdcea8a19af6"
+BR2_RAINIER_4U_XML_VERSION="07073d927cb70cb074ce57d06f8b9a291716f654"
BR2_RAINIER_4U_XML_SYSTEM_FILENAME="Rainier-4U-MRW_hb.system.xml"
BR2_RAINIER_4U_XML_TARGETING_FILENAME="Rainier-4U-MRW_hb.mrw.xml"
BR2_PACKAGE_EVEREST_XML=y
BR2_EVEREST_XML_CUSTOM_GIT=y
BR2_EVEREST_XML_CUSTOM_GIT_VALUE="git@github.ibm.com:openbmc/everest-xml.git"
-BR2_EVEREST_XML_VERSION="6d2c749051a4f1884afb004475a67049d5f8049f"
+BR2_EVEREST_XML_VERSION="1784d76d77a917fc97f9614aa47687db45bfb955"
BR2_EVEREST_XML_SYSTEM_FILENAME="Everest-MRW_hb.system.xml"
BR2_EVEREST_XML_TARGETING_FILENAME="Everest-MRW_hb.mrw.xml"
BR2_PACKAGE_OPENPOWER_PNOR_P10=y
diff --git a/openpower/configs/rainier_defconfig b/openpower/configs/rainier_defconfig
index e152695..12e689e 100644
--- a/openpower/configs/rainier_defconfig
+++ b/openpower/configs/rainier_defconfig
@@ -51,12 +51,12 @@
BR2_OPENPOWER_MACHINE_XML_CUSTOM_GIT=y
BR2_RAINIER_2U_XML_CUSTOM_GIT=y
BR2_RAINIER_2U_XML_CUSTOM_GIT_VALUE="git@github.ibm.com:openbmc/rainier-xml.git"
-BR2_RAINIER_2U_XML_VERSION="3d6140808f051ddb7c8829f19d5cfdcea8a19af6"
+BR2_RAINIER_2U_XML_VERSION="07073d927cb70cb074ce57d06f8b9a291716f654"
BR2_RAINIER_2U_XML_SYSTEM_FILENAME="Rainier-2U-MRW_hb.system.xml"
BR2_RAINIER_2U_XML_TARGETING_FILENAME="Rainier-2U-MRW_hb.mrw.xml"
BR2_RAINIER_4U_XML_CUSTOM_GIT=y
BR2_RAINIER_4U_XML_CUSTOM_GIT_VALUE="git@github.ibm.com:openbmc/rainier-xml.git"
-BR2_RAINIER_4U_XML_VERSION="3d6140808f051ddb7c8829f19d5cfdcea8a19af6"
+BR2_RAINIER_4U_XML_VERSION="07073d927cb70cb074ce57d06f8b9a291716f654"
BR2_RAINIER_4U_XML_SYSTEM_FILENAME="Rainier-4U-MRW_hb.system.xml"
BR2_RAINIER_4U_XML_TARGETING_FILENAME="Rainier-4U-MRW_hb.mrw.xml"
BR2_PACKAGE_OPENPOWER_PNOR_P10=y
diff --git a/openpower/package/hcode-p10/Config.in b/openpower/package/hcode-p10/Config.in
index 2c1d037..6a83dee 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 "hw042221a.opmst10" if BR2_HCODE_P10_LATEST_VERSION
+ default "hw062121a.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 44adc39..93886ec 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 "hw042221a.opmst10" if BR2_HOSTBOOT_BINARIES_LATEST_VERSION
+ default "hw062121a.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 24c9450..c72902d 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 "cd51f27912e6c3af14fef8c227ca1fe5f6d3f40d" if BR2_HOSTBOOT_P10_LATEST_VERSION
+ default "6a668f7e5d2f8a95f011a51b00adfc63061e4699" if BR2_HOSTBOOT_P10_LATEST_VERSION
default BR2_HOSTBOOT_P10_CUSTOM_VERSION_VALUE \
if BR2_HOSTBOOT_P10_CUSTOM_VERSION
diff --git a/openpower/package/occ-p10/Config.in b/openpower/package/occ-p10/Config.in
index ee47b8a..b934111 100644
--- a/openpower/package/occ-p10/Config.in
+++ b/openpower/package/occ-p10/Config.in
@@ -43,7 +43,7 @@
config BR2_OCC_P10_VERSION
string
- default "38cc5b97a98daff8b04a2e34df3c95c17e9da0cf" if BR2_OCC_P10_LATEST_VERSION
+ default "016bf5b0f9805079a000ca844283bcde756160fd" if BR2_OCC_P10_LATEST_VERSION
default BR2_OCC_P10_CUSTOM_VERSION_VALUE \
if BR2_OCC_P10_CUSTOM_VERSION
diff --git a/openpower/package/openpower-pnor-p10/openpower-pnor-p10.mk b/openpower/package/openpower-pnor-p10/openpower-pnor-p10.mk
index 8a0fe5c..87d7b63 100644
--- a/openpower/package/openpower-pnor-p10/openpower-pnor-p10.mk
+++ b/openpower/package/openpower-pnor-p10/openpower-pnor-p10.mk
@@ -4,7 +4,7 @@
#
################################################################################
-OPENPOWER_PNOR_P10_VERSION ?= 03f1f8e939a435a6da4c653a01a2c938b0f44704
+OPENPOWER_PNOR_P10_VERSION ?= b63d81085a4ab5582185c2370b4624701c79c127
# TODO: WORKAROUND: Need to reenable next line and comment out the two lines
# after that, when code is propagated to a public repo
diff --git a/openpower/package/sbe-p10/Config.in b/openpower/package/sbe-p10/Config.in
index d04b9ff..52a195e 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 "943e199dd759793955d418f1532ba8559ec62b32" if BR2_SBE_P10_LATEST_VERSION
+ default "c0778ad4f722fae5c764dd0a8025044319759f7d" if BR2_SBE_P10_LATEST_VERSION
default BR2_SBE_P10_CUSTOM_VERSION_VALUE \
if BR2_SBE_P10_CUSTOM_VERSION