Merge pull request #124 from duchen/duchen-patch-1
Update rainier.config to enable console
diff --git a/openpower/configs/rainier_defconfig b/openpower/configs/rainier_defconfig
index 20b79f2..a39c8e6 100644
--- a/openpower/configs/rainier_defconfig
+++ b/openpower/configs/rainier_defconfig
@@ -49,7 +49,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="1b1ffb58692c6d557b54fdca9f9b1f9ff76c22f3"
+BR2_OPENPOWER_MACHINE_XML_VERSION="6ae68ba8437374ce6d84bfe293291368133d3ac4"
BR2_OPENPOWER_MACHINE_XML_FILENAME="Rainier-4U-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 c4f4af3..3358baa 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 "hw010820a.opmst10" if BR2_HCODE_P10_LATEST_VERSION
+ default "hw011420a.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 09bad3e..252bfd5 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 "hw010320a.opmst10" if BR2_HOSTBOOT_BINARIES_LATEST_VERSION
+ default "hw011320a.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 36fa254..43e10b8 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 "de4ba57273d231ea56a7c369c5cc75d4ccd3f469" if BR2_HOSTBOOT_P10_LATEST_VERSION
+ default "30441e25ce22242732d865f53f902d85c096dbdf" 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 3218dd8..e063b6b 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 "36e1a84618297d1fc14e07388794d832c641528e" if BR2_OCC_P10_LATEST_VERSION
+ default "5dd72c89361b35e07044e5b2c0b73df3f3f7358f" 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/Config.in b/openpower/package/openpower-pnor/Config.in
index ab35d4c..5233fff 100644
--- a/openpower/package/openpower-pnor/Config.in
+++ b/openpower/package/openpower-pnor/Config.in
@@ -8,7 +8,7 @@
select BR2_PACKAGE_SKIBOOT
select BR2_PACKAGE_OPENPOWER_FFS
select BR2_PACKAGE_OCC_P10 if (! (BR2_OPENPOWER_POWER8 || BR2_OPENPOWER_POWER9 ) )
- select BR2_PACKAGE_OCC if !BR2_OPENPOWER_POWER9
+ select BR2_PACKAGE_OCC if BR2_OPENPOWER_POWER9
select BR2_PACKAGE_OCC_P8 if BR2_OPENPOWER_POWER8
select BR2_PACKAGE_CAPP_UCODE
select BR2_PACKAGE_IMA_CATALOG
diff --git a/openpower/package/sbe-p10/Config.in b/openpower/package/sbe-p10/Config.in
index f24dc82..1f81872 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 "c9b45b2a339dc40de34d364322ae9f8b589d9b11" if BR2_SBE_P10_LATEST_VERSION
+ default "3eb60e89da41bb88fee59e00d701432e0cab1378" if BR2_SBE_P10_LATEST_VERSION
default BR2_SBE_P10_CUSTOM_VERSION_VALUE \
if BR2_SBE_P10_CUSTOM_VERSION