Merge pull request #830 from ploetzma/updateHostboot
Update Hostboot commit hash and add MSS_EFF_CONFIG patch
diff --git a/openpower/package/hostboot/hostboot.mk b/openpower/package/hostboot/hostboot.mk
index 44d23fa..c89c211 100644
--- a/openpower/package/hostboot/hostboot.mk
+++ b/openpower/package/hostboot/hostboot.mk
@@ -4,7 +4,7 @@
#
################################################################################
HOSTBOOT_VERSION_BRANCH_MASTER_P8 ?= e28b28fa9995ab3039b44f2c200fdbbc58313677
-HOSTBOOT_VERSION_BRANCH_MASTER ?= f792a2cbe3d68e549f5321ac70adf9d24a7ab6ab
+HOSTBOOT_VERSION_BRANCH_MASTER ?= 06e5c5eb5192aa01ac6c4868141fa7ae49547acc
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/hostboot/p9Patches/hostboot-0007-Skip-running-p9_mss_eff_config_thermal.patch b/openpower/package/hostboot/p9Patches/hostboot-0007-Skip-running-p9_mss_eff_config_thermal.patch
new file mode 100644
index 0000000..38a85c8
--- /dev/null
+++ b/openpower/package/hostboot/p9Patches/hostboot-0007-Skip-running-p9_mss_eff_config_thermal.patch
@@ -0,0 +1,28 @@
+From d68ea0cc45fa21821f3820dfb83fb8332c8eec8f Mon Sep 17 00:00:00 2001
+From: Bill Hoffa <wghoffa@us.ibm.com>
+Date: Wed, 18 Jan 2017 21:56:18 -0600
+Subject: [PATCH 5/6] Temporarily Skip running p9_mss_eff_config_thermal
+
+Change-Id: I491c8e30fef9431663aaa29147ef96c0d897a015
+---
+ src/usr/isteps/istep07/call_mss_eff_config.C | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/usr/isteps/istep07/call_mss_eff_config.C b/src/usr/isteps/istep07/call_mss_eff_config.C
+index e13dace..761a07d 100644
+--- a/src/usr/isteps/istep07/call_mss_eff_config.C
++++ b/src/usr/isteps/istep07/call_mss_eff_config.C
+@@ -241,8 +241,8 @@ void* call_mss_eff_config( void *io_pArgs )
+ }
+ // Call the mss_eff_config_thermal HWP
+ TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
+- "p9_mss_eff_config_thermal HWP. ");
+- FAPI_INVOKE_HWP(l_err, p9_mss_eff_config_thermal,l_fapi_mcs_targs);
++ "Temporarily skipping p9_mss_eff_config_thermal HWP. ");
++ //FAPI_INVOKE_HWP(l_err, p9_mss_eff_config_thermal,l_fapi_mcs_targs);
+
+ if (l_err)
+ {
+--
+1.8.2.2
+