Merge pull request #861 from op-jenkins/op_update_1218_2-9-2017
op-build update 2-9-2017
diff --git a/openpower/package/garrison-xml/garrison.mk b/openpower/package/garrison-xml/garrison.mk
index 5b95379..cc54451 100644
--- a/openpower/package/garrison-xml/garrison.mk
+++ b/openpower/package/garrison-xml/garrison.mk
@@ -4,7 +4,7 @@
#
################################################################################
-GARRISON_XML_VERSION ?= c4d238ee2f893d2b52b88c36c993e2c497ee6443
+GARRISON_XML_VERSION ?= e0ccdcbb81fd73f1e9e9c0f555ae0489ca83100d
GARRISON_XML_SITE ?= $(call github,open-power,garrison-xml,$(GARRISON_XML_VERSION))
GARRISON_XML_LICENSE = Apache-2.0
diff --git a/openpower/package/hostboot-binaries/hostboot_binaries.mk b/openpower/package/hostboot-binaries/hostboot_binaries.mk
index a814769..b4a74ce 100644
--- a/openpower/package/hostboot-binaries/hostboot_binaries.mk
+++ b/openpower/package/hostboot-binaries/hostboot_binaries.mk
@@ -4,7 +4,7 @@
#
################################################################################
-HOSTBOOT_BINARIES_VERSION ?= 7425fb1d540920f0397f57f6c54a180f4f6a720e
+HOSTBOOT_BINARIES_VERSION ?= 01cbe096ec1bc1d3f6957efa00f6a6cea914ad34
HOSTBOOT_BINARIES_SITE ?= $(call github,open-power,hostboot-binaries,$(HOSTBOOT_BINARIES_VERSION))
HOSTBOOT_BINARIES_LICENSE = Apache-2.0
HOSTBOOT_BINARIES_LICENSE_FILES = LICENSE
diff --git a/openpower/package/hostboot/hostboot.mk b/openpower/package/hostboot/hostboot.mk
index 0e64418..abe8b71 100644
--- a/openpower/package/hostboot/hostboot.mk
+++ b/openpower/package/hostboot/hostboot.mk
@@ -4,7 +4,7 @@
#
################################################################################
HOSTBOOT_VERSION_BRANCH_MASTER_P8 ?= f2b28bf6eee57757be45c45e514d2542d72aa350
-HOSTBOOT_VERSION_BRANCH_MASTER ?= b9fd10a99329adb4093c453bf9f80b05a6f31fa3
+HOSTBOOT_VERSION_BRANCH_MASTER ?= 8ca944a7d893e3ef92498987038d487f1d9599fc
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-0006-fix-AST2500-config.patch b/openpower/package/hostboot/p9Patches/hostboot-0006-fix-AST2500-config.patch
deleted file mode 100644
index 2c52864..0000000
--- a/openpower/package/hostboot/p9Patches/hostboot-0006-fix-AST2500-config.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4bd0930e6d63bf714188ecacbe06a162b3529351 Mon Sep 17 00:00:00 2001
-From: Matt Ploetz <maploetz@us.ibm.com>
-Date: Sun, 6 Nov 2016 19:20:39 -0600
-Subject: [PATCH] Change AST2400 to default only if AST2500 isn't set
-
-Change-Id: Ic9c1da281fcdc650e7528a84377d4fbe51355c84
----
- src/usr/pnor/HBconfig | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/usr/pnor/HBconfig b/src/usr/pnor/HBconfig
-index c0dfde8..9ce13b1 100644
---- a/src/usr/pnor/HBconfig
-+++ b/src/usr/pnor/HBconfig
-@@ -5,7 +5,7 @@ config SFC_IS_IBM_DPSS
- The Serial Flash Controller is the IBM DPSS FPGA.
-
- config SFC_IS_AST2400
-- default y
-+ default y if !SFC_IS_AST2500
- depends on !SFC_IS_IBM_DPSS && !SFC_IS_FAKE && !SFC_IS_AST2500
- help
- The Serial Flash Controller is the AST2400 BMC.
---
-1.8.2.2
-