Merge pull request #516 from ismirno/master-p10
Enable Multichip In rainier.config
diff --git a/openpower/configs/rainier_defconfig b/openpower/configs/rainier_defconfig
index 5d88b6f..5d9c1fc 100644
--- a/openpower/configs/rainier_defconfig
+++ b/openpower/configs/rainier_defconfig
@@ -26,7 +26,7 @@
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
BR2_PACKAGE_SKIBOOT=y
BR2_SKIBOOT_CUSTOM_VERSION=y
-BR2_SKIBOOT_CUSTOM_VERSION_VALUE="30f754f734146a17d4260bde2827d0f08e503916"
+BR2_SKIBOOT_CUSTOM_VERSION_VALUE="4e568bf15692ec2b26440288aad87e02daeba4b0"
BR2_SKIBOOT_CUSTOM_GIT=y
BR2_SKIBOOT_CUSTOM_REPO_URL="git@github.ibm.com:p10/skiboot.git"
BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/busybox.fragment"
@@ -55,7 +55,7 @@
BR2_HOSTBOOT_P10_CONFIG_FILE="rainier.config"
BR2_OPENPOWER_MACHINE_XML_CUSTOM_GIT=y
BR2_OPENPOWER_MACHINE_XML_CUSTOM_GIT_VALUE="git@github.ibm.com:openbmc/rainier-xml.git"
-BR2_OPENPOWER_MACHINE_XML_VERSION="766108ba501768f3f702bd4c737ad64f88cc1ec0"
+BR2_OPENPOWER_MACHINE_XML_VERSION="74a31bed3cfae1268d1760f23179c2bf371f048c"
BR2_OPENPOWER_MACHINE_XML_FILENAME="Rainier-2U-MRW.xml"
BR2_OPENPOWER_SYSTEM_XML_FILENAME="RAINIER_hb.system.xml"
BR2_OPENPOWER_MRW_XML_FILENAME="RAINIER_hb.mrw.xml"
diff --git a/openpower/package/hcode-p10/Config.in b/openpower/package/hcode-p10/Config.in
index 4c4dfc1..2975162 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 "hw091720a.opmst10" if BR2_HCODE_P10_LATEST_VERSION
+ default "hw091820a.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 b2216eb..4660e4f 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 "hw091720a.opmst10" if BR2_HOSTBOOT_BINARIES_LATEST_VERSION
+ default "hw091820a.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 a8302c2..f45a6d4 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 "e28eba1cbf3f19f75eb842acd6bb3bb8a6e7d661" if BR2_HOSTBOOT_P10_LATEST_VERSION
+ default "414b66472994783d5981e9eb6f8d679d9148f52e" 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 4ca7069..a00f6e9 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 "bc315517ba2914c8389a3a8d984d3aa74d3c93e4" if BR2_SBE_P10_LATEST_VERSION
+ default "eeabd33c545aad99937acb79f7446ed832898e6e" if BR2_SBE_P10_LATEST_VERSION
default BR2_SBE_P10_CUSTOM_VERSION_VALUE \
if BR2_SBE_P10_CUSTOM_VERSION