Merge pull request #1336 from wghoffa/spd_write_off
Disable Dimm SPD Write to HW for P9 Platforms
diff --git a/openpower/package/hostboot-binaries/hostboot_binaries.mk b/openpower/package/hostboot-binaries/hostboot_binaries.mk
index e7cc9f6..335f178 100644
--- a/openpower/package/hostboot-binaries/hostboot_binaries.mk
+++ b/openpower/package/hostboot-binaries/hostboot_binaries.mk
@@ -4,7 +4,7 @@
#
################################################################################
-HOSTBOOT_BINARIES_VERSION ?= cf51511662aac5331975c60aa1896b200c0ceb30
+HOSTBOOT_BINARIES_VERSION ?= 883d2186e4508f327b3c90f3ca096aa4bff6b73a
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 3b8538f..6f40135 100644
--- a/openpower/package/hostboot/hostboot.mk
+++ b/openpower/package/hostboot/hostboot.mk
@@ -4,7 +4,7 @@
#
################################################################################
HOSTBOOT_VERSION_BRANCH_MASTER_P8 ?= 695bd891343faf1f0ef85fe53148590e58239efd
-HOSTBOOT_VERSION_BRANCH_MASTER ?= 42ecd455ada336844fe97f710250813e0d47b08f
+HOSTBOOT_VERSION_BRANCH_MASTER ?= 75333b1d93a30e2337fb5580357ff32733d28db3
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-0001-Skip-Presence-Detect-in-HDAT-for-BMC-Type.patch b/openpower/package/hostboot/p9Patches/hostboot-0001-Skip-Presence-Detect-in-HDAT-for-BMC-Type.patch
new file mode 100644
index 0000000..7e34dfe
--- /dev/null
+++ b/openpower/package/hostboot/p9Patches/hostboot-0001-Skip-Presence-Detect-in-HDAT-for-BMC-Type.patch
@@ -0,0 +1,27 @@
+From d9da41e3a912a916c4063d0e3995ce71b260e288 Mon Sep 17 00:00:00 2001
+From: Bill Hoffa <wghoffa@us.ibm.com>
+Date: Tue, 8 Aug 2017 14:18:41 -0500
+Subject: [PATCH] Skip Presence Detect in HDAT for BMC Type
+
+Change-Id: Iba981eef5e6535458085b1750d25a8d11aa37200
+---
+ src/usr/hdat/hdathostslcadata.C | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/usr/hdat/hdathostslcadata.C b/src/usr/hdat/hdathostslcadata.C
+index d112659..4599eb7 100755
+--- a/src/usr/hdat/hdathostslcadata.C
++++ b/src/usr/hdat/hdathostslcadata.C
+@@ -94,7 +94,8 @@ bool getVPDCollectedStatus(TARGETING::Target *i_Target)
+ //@TODO: RTC 149382: Method to get VPD collected status for Targets
+
+ if((i_Target->getAttr<ATTR_TYPE>() != TYPE_PCI) &&
+- (i_Target->getAttr<ATTR_TYPE>() != TYPE_SYS))
++ (i_Target->getAttr<ATTR_TYPE>() != TYPE_SYS) &&
++ (i_Target->getAttr<ATTR_TYPE>() != TYPE_BMC))
+ {
+ l_vpdCollectedStatus = pvpdPresent(i_Target);
+ }
+--
+1.8.2.2
+
diff --git a/openpower/package/skiboot/Config.in b/openpower/package/skiboot/Config.in
index 410b50f..2147498 100644
--- a/openpower/package/skiboot/Config.in
+++ b/openpower/package/skiboot/Config.in
@@ -31,7 +31,7 @@
config BR2_SKIBOOT_VERSION
string
- default "v5.7-76-g830fc9a0ed0a" if BR2_SKIBOOT_LATEST_VERSION
+ default "v5.7-92-g0818df625e35" if BR2_SKIBOOT_LATEST_VERSION
default BR2_SKIBOOT_CUSTOM_VERSION_VALUE \
if BR2_SKIBOOT_CUSTOM_VERSION