Merge pull request #1863 from vaibhav92/capp_ucode_dd2_2
Add capp ucode for P9-DD2.2
diff --git a/openpower/configs/hostboot/romulus.config b/openpower/configs/hostboot/romulus.config
old mode 100755
new mode 100644
index f41ec16..6e03400
--- a/openpower/configs/hostboot/romulus.config
+++ b/openpower/configs/hostboot/romulus.config
@@ -44,25 +44,30 @@
set CONSOLE
set BMC_AST2500
-set DISABLE_HOSTBOOT_RUNTIME
+unset DISABLE_HOSTBOOT_RUNTIME
# Compile in hostboot runtime PRD
set HBRT_PRD
+
+# Compile in hb rt HTMGT : Load/Start OCC
set HTMGT
set START_OCC_DURING_BOOT
+unset CONSOLE_OUTPUT_OCC_COMM
#PNOR flags
unset PNOR_TWO_SIDE_SUPPORT
set BMC_BT_LPC_IPMI
-# Enable Checktop Analysis
-unset ENABLE_CHECKSTOP_ANALYSIS
-unset IPLTIME_CHECKSTOP_ANALYSIS
+# Enable IPLtime + Runtime Checktop Analysis
+set ENABLE_CHECKSTOP_ANALYSIS
+set IPLTIME_CHECKSTOP_ANALYSIS
# set for trace debug to console
unset CONSOLE_OUTPUT_TRACE
+set CONSOLE_OUTPUT_FFDCDISPLAY
-unset CONFIG_SECUREBOOT
-unset CONFIG_TPMDD
-unset CONFIG_TPM_NUVOTON
+
+unset SECUREBOOT
+unset TPMDD
+unset TPM_NUVOTON
diff --git a/openpower/configs/zaius_defconfig b/openpower/configs/zaius_defconfig
index 902f859..9e1b708 100644
--- a/openpower/configs/zaius_defconfig
+++ b/openpower/configs/zaius_defconfig
@@ -1,5 +1,6 @@
BR2_powerpc64le=y
BR2_powerpc_power8=y
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_OP_BUILD_PATH)/patches/zaius-patches"
BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
BR2_TOOLCHAIN_BUILDROOT_CXX=y
diff --git a/openpower/package/hostboot-binaries/hostboot_binaries.mk b/openpower/package/hostboot-binaries/hostboot_binaries.mk
index 2e072e6..ed21f5c 100644
--- a/openpower/package/hostboot-binaries/hostboot_binaries.mk
+++ b/openpower/package/hostboot-binaries/hostboot_binaries.mk
@@ -5,7 +5,7 @@
################################################################################
-HOSTBOOT_BINARIES_VERSION ?= 6924d6b711ba7b1d4c47346c9a8dff88cfaaf4c8
+HOSTBOOT_BINARIES_VERSION ?= 134d61bcf3f2183c69793a3b9475d3ae80a6deae
HOSTBOOT_BINARIES_SITE ?= $(call github,open-power,hostboot-binaries,$(HOSTBOOT_BINARIES_VERSION))
HOSTBOOT_BINARIES_LICENSE = Apache-2.0
diff --git a/openpower/package/hostboot/hostboot.mk b/openpower/package/hostboot/hostboot.mk
index 9835958..5116078 100644
--- a/openpower/package/hostboot/hostboot.mk
+++ b/openpower/package/hostboot/hostboot.mk
@@ -4,7 +4,7 @@
#
################################################################################
HOSTBOOT_VERSION_BRANCH_MASTER_P8 ?= d3025f5d7ddd0723946bb54fcb471d2bf1fd2da4
-HOSTBOOT_VERSION_BRANCH_MASTER ?= 9bfb2013af399c316891e005ca0fb8b417deffb3
+HOSTBOOT_VERSION_BRANCH_MASTER ?= de8120523a0cf74b2c682b1f8723b99cb0388a4e
HOSTBOOT_VERSION ?= $(if $(BR2_OPENPOWER_POWER9),$(HOSTBOOT_VERSION_BRANCH_MASTER),$(HOSTBOOT_VERSION_BRANCH_MASTER_P8))
HOSTBOOT_SITE ?= $(call github,open-power,hostboot,$(HOSTBOOT_VERSION))
diff --git a/openpower/package/skiboot/Config.in b/openpower/package/skiboot/Config.in
index 705e97f..dbbc77a 100644
--- a/openpower/package/skiboot/Config.in
+++ b/openpower/package/skiboot/Config.in
@@ -31,7 +31,7 @@
config BR2_SKIBOOT_VERSION
string
- default "v5.10-rc1" if BR2_SKIBOOT_LATEST_VERSION
+ default "v5.10-rc2" if BR2_SKIBOOT_LATEST_VERSION
default BR2_SKIBOOT_CUSTOM_VERSION_VALUE \
if BR2_SKIBOOT_CUSTOM_VERSION
diff --git a/openpower/patches/zaius-patches/machine-xml/0001-Update-EREPAIR-attributes.patch b/openpower/patches/zaius-patches/machine-xml/0001-Update-EREPAIR-attributes.patch
new file mode 100644
index 0000000..0f352ae
--- /dev/null
+++ b/openpower/patches/zaius-patches/machine-xml/0001-Update-EREPAIR-attributes.patch
@@ -0,0 +1,59 @@
+From b2391175e61b3d1bd7e5fdba719d7fd2925fdbed Mon Sep 17 00:00:00 2001
+From: Adrian Barrera <abarrera@us.ibm.com>
+Date: Tue, 6 Feb 2018 18:38:21 -0600
+Subject: [PATCH 1/2] Update EREPAIR attributes
+
+---
+ zaius.xml | 16 ++++++++++++----
+ 1 file changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/zaius.xml b/zaius.xml
+index 3b9f54a884d4..df1f4dfcd2d0 100644
+--- a/zaius.xml
++++ b/zaius.xml
+@@ -8972,11 +8972,11 @@
+ </attribute>
+ <attribute>
+ <id>DMI_EREPAIR_THRESHOLD_FIELD</id>
+- <default></default>
++ <default>0x1</default>
+ </attribute>
+ <attribute>
+ <id>DMI_EREPAIR_THRESHOLD_MNFG</id>
+- <default></default>
++ <default>0x0</default>
+ </attribute>
+ <attribute>
+ <id>DO_ABUS_DECONFIG</id>
+@@ -9932,6 +9932,14 @@
+ <id>OS_IPL_MODE</id>
+ <default></default>
+ </attribute>
++ <attribute>
++ <id>O_EREPAIR_THRESHOLD_FIELD</id>
++ <default>0x1</default>
++ </attribute>
++ <attribute>
++ <id>O_EREPAIR_THRESHOLD_MNFG</id>
++ <default>0x0</default>
++ </attribute>
+ <attribute>
+ <id>PAYLOAD_BASE</id>
+ <default>0</default>
+@@ -10543,11 +10551,11 @@
+ </attribute>
+ <attribute>
+ <id>X_EREPAIR_THRESHOLD_FIELD</id>
+- <default></default>
++ <default>0x1</default>
+ </attribute>
+ <attribute>
+ <id>X_EREPAIR_THRESHOLD_MNFG</id>
+- <default></default>
++ <default>0x0</default>
+ </attribute>
+ <attribute>
+ <id>power-def-filenames</id>
+--
+2.14.3
+
diff --git a/openpower/patches/zaius-patches/machine-xml/0002-Update-Obus-PLL-bucket-to-25G.patch b/openpower/patches/zaius-patches/machine-xml/0002-Update-Obus-PLL-bucket-to-25G.patch
new file mode 100644
index 0000000..58b69af
--- /dev/null
+++ b/openpower/patches/zaius-patches/machine-xml/0002-Update-Obus-PLL-bucket-to-25G.patch
@@ -0,0 +1,40 @@
+From d3a35441092c3616e69a2e3c81c0e2f1f5df96ed Mon Sep 17 00:00:00 2001
+From: Adrian Barrera <abarrera@us.ibm.com>
+Date: Fri, 9 Feb 2018 15:23:55 -0600
+Subject: [PATCH 2/2] Update Obus PLL bucket to 25G
+
+---
+ zaius.xml | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/zaius.xml b/zaius.xml
+index df1f4dfcd2d0..9929e8b9f5a4 100644
+--- a/zaius.xml
++++ b/zaius.xml
+@@ -14407,19 +14407,19 @@
+ </attribute>
+ <attribute>
+ <id>OB0_PLL_BUCKET</id>
+- <default>2</default>
++ <default>1</default>
+ </attribute>
+ <attribute>
+ <id>OB1_PLL_BUCKET</id>
+- <default>2</default>
++ <default>1</default>
+ </attribute>
+ <attribute>
+ <id>OB2_PLL_BUCKET</id>
+- <default>2</default>
++ <default>1</default>
+ </attribute>
+ <attribute>
+ <id>OB3_PLL_BUCKET</id>
+- <default>2</default>
++ <default>1</default>
+ </attribute>
+ <attribute>
+ <id>OBUS_RATIO_VALUE</id>
+--
+2.14.3
+