Merge pull request #1361 from shenki/kernel-4.12.8
linux: Release 4.12.8-openpower1
diff --git a/openpower/configs/hostboot/p9dsu.config b/openpower/configs/hostboot/p9dsu.config
index 350bd7f..0d6268f 100644
--- a/openpower/configs/hostboot/p9dsu.config
+++ b/openpower/configs/hostboot/p9dsu.config
@@ -31,10 +31,11 @@
set GPIODD
unset PALMETTO_VDDR
-# Enable SBE updates
+# Enable Consecutive SBE Updates
+set SBE_UPDATE_CONSECUTIVE
unset SBE_UPDATE_INDEPENDENT
unset SBE_UPDATE_SEQUENTIAL
-set SBE_UPDATE_SIMULTANEOUS
+unset SBE_UPDATE_SIMULTANEOUS
unset NO_SBE_UPDATES
unset PCIE_HOTPLUG_CONTROLLER
diff --git a/openpower/configs/hostboot/romulus.config b/openpower/configs/hostboot/romulus.config
index af8a85e..ef027ea 100755
--- a/openpower/configs/hostboot/romulus.config
+++ b/openpower/configs/hostboot/romulus.config
@@ -31,10 +31,11 @@
set GPIODD
unset PALMETTO_VDDR
-# Enable SBE updates
+# Enable Consecutive SBE Updates
+set SBE_UPDATE_CONSECUTIVE
unset SBE_UPDATE_INDEPENDENT
unset SBE_UPDATE_SEQUENTIAL
-set SBE_UPDATE_SIMULTANEOUS
+unset SBE_UPDATE_SIMULTANEOUS
unset NO_SBE_UPDATES
unset PCIE_HOTPLUG_CONTROLLER
diff --git a/openpower/configs/hostboot/witherspoon.config b/openpower/configs/hostboot/witherspoon.config
index de8d973..8520361 100755
--- a/openpower/configs/hostboot/witherspoon.config
+++ b/openpower/configs/hostboot/witherspoon.config
@@ -31,10 +31,11 @@
set GPIODD
unset PALMETTO_VDDR
-# Disable SBE updates
+# Enable Consecutive SBE Updates
+set SBE_UPDATE_CONSECUTIVE
unset SBE_UPDATE_INDEPENDENT
unset SBE_UPDATE_SEQUENTIAL
-set SBE_UPDATE_SIMULTANEOUS
+unset SBE_UPDATE_SIMULTANEOUS
unset NO_SBE_UPDATES
unset PCIE_HOTPLUG_CONTROLLER
diff --git a/openpower/configs/hostboot/zaius.config b/openpower/configs/hostboot/zaius.config
index 23e49ac..8f4fc54 100755
--- a/openpower/configs/hostboot/zaius.config
+++ b/openpower/configs/hostboot/zaius.config
@@ -31,10 +31,11 @@
set GPIODD
unset PALMETTO_VDDR
-# Disable SBE updates
+# Enable Consecutive SBE Updates
+set SBE_UPDATE_CONSECUTIVE
unset SBE_UPDATE_INDEPENDENT
unset SBE_UPDATE_SEQUENTIAL
-set SBE_UPDATE_SIMULTANEOUS
+unset SBE_UPDATE_SIMULTANEOUS
unset NO_SBE_UPDATES
unset PCIE_HOTPLUG_CONTROLLER
@@ -58,8 +59,8 @@
set BMC_BT_LPC_IPMI
-# Disable Checktop Analysis
-unset ENABLE_CHECKSTOP_ANALYSIS
+# Enable Runtime Checktop Analysis
+set ENABLE_CHECKSTOP_ANALYSIS
unset IPLTIME_CHECKSTOP_ANALYSIS
# Hostboot will not detect hardware changes
diff --git a/openpower/package/occ/occ.mk b/openpower/package/occ/occ.mk
index 7722263..b6c52ab 100644
--- a/openpower/package/occ/occ.mk
+++ b/openpower/package/occ/occ.mk
@@ -5,7 +5,7 @@
################################################################################
OCC_VERSION_BRANCH_MASTER_P8 ?= 28f2cec690b7f19548ce860a8820f519e6c39a6a
-OCC_VERSION_BRANCH_MASTER ?= 71b5f68da8b725f9c5251261b41fd824e652e491
+OCC_VERSION_BRANCH_MASTER ?= 3b72373a3bfd5716902b48515f96faac683ef8dd
OCC_VERSION ?= $(if $(BR2_OPENPOWER_POWER9),$(OCC_VERSION_BRANCH_MASTER),$(OCC_VERSION_BRANCH_MASTER_P8))
OCC_SITE ?= $(call github,open-power,occ,$(OCC_VERSION))