Merge pull request #734 from ploetzma/fixAstPatch
Fix SFT_IS_AST2500 config patch in src/usr/pnor/HBconfig
diff --git a/openpower/package/hostboot/hostboot.mk b/openpower/package/hostboot/hostboot.mk
index 7efb57a..ba22386 100644
--- a/openpower/package/hostboot/hostboot.mk
+++ b/openpower/package/hostboot/hostboot.mk
@@ -3,8 +3,8 @@
# hostboot
#
################################################################################
-HOSTBOOT_VERSION_BRANCH_MASTER_P8 ?= 2eb7706db0b11c1e14ad659a02c164ce59181538
-HOSTBOOT_VERSION_BRANCH_MASTER ?= 8e662b21200243dbcd0caa1a0d89cdc5b0eead0a
+HOSTBOOT_VERSION_BRANCH_MASTER_P8 ?= 94aeacf88566756f12a8529e3ddafa288c4e7214
+HOSTBOOT_VERSION_BRANCH_MASTER ?= e44db81a7fa605a25c64b90e18601ec63c6d6423
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-0003-ast-2400-include-uartif.patch b/openpower/package/hostboot/p9Patches/hostboot-0003-ast-2400-include-uartif.patch
deleted file mode 100644
index e1d6f08..0000000
--- a/openpower/package/hostboot/p9Patches/hostboot-0003-ast-2400-include-uartif.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 6e503c6585192b77a73a387da31d1a6935efe1bc Mon Sep 17 00:00:00 2001
-From: Matt Ploetz <maploetz@us.ibm.com>
-Date: Wed, 26 Oct 2016 16:58:37 -0500
-Subject: [PATCH] Add uartif include to ast2400
-
-Change-Id: Ica065fb2dd4402c0fa71466055bcccb573d48101
----
- src/HBconfig | 7 ++++++-
- src/usr/console/ast2400.C | 1 +
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/HBconfig b/src/HBconfig
-index 08ab160..5abb512 100644
---- a/src/HBconfig
-+++ b/src/HBconfig
-@@ -9,9 +9,14 @@ config P9_VPO_COMPILE
- help
- Compile and build image for VPO environment
-
--config BMC_AST2400
-+config BMC_AST2500
- default n
- help
-+ Compile hostboot support for AST2500 based BMC
-+
-+config BMC_AST2400
-+ default y if (BMC_AST2500)
-+ help
- Compile hostboot support for AST2400 based BMC
-
- config P9_SYSTEM
-diff --git a/src/usr/console/ast2400.C b/src/usr/console/ast2400.C
-index 5e8c0bc..43ec9ef 100644
---- a/src/usr/console/ast2400.C
-+++ b/src/usr/console/ast2400.C
-@@ -30,6 +30,7 @@
- #include <kernel/console.H>
- #include <devicefw/driverif.H>
- #include <initservice/bootconfigif.H>
-+#include <console/uartif.H>
-
- namespace CONSOLE
- {
---
-1.8.2.2
-
diff --git a/openpower/package/hostboot/p9Patches/hostboot-0004-include-pvpd.patch b/openpower/package/hostboot/p9Patches/hostboot-0004-include-pvpd.patch
deleted file mode 100644
index eadb293..0000000
--- a/openpower/package/hostboot/p9Patches/hostboot-0004-include-pvpd.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6a6b23ff055da56f758d3719abecae4ebc464e9f Mon Sep 17 00:00:00 2001
-From: Matt Ploetz <maploetz@us.ibm.com>
-Date: Wed, 2 Nov 2016 16:29:26 -0500
-Subject: [PATCH] Include pvpd in dvpd
-
-Change-Id: Iff83d5ab6cebabb623f9317f34b5b8d46e5d7554
----
- src/usr/vpd/dvpd.C | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/usr/vpd/dvpd.C b/src/usr/vpd/dvpd.C
-index 9ce0999..2839172 100644
---- a/src/usr/vpd/dvpd.C
-+++ b/src/usr/vpd/dvpd.C
-@@ -43,6 +43,7 @@
- #include "dvpd.H"
- #include "cvpd.H"
- #include "vpd.H"
-+#include "pvpd.H"
- #include <initservice/initserviceif.H>
-
-
---
-1.8.2.2
-
diff --git a/openpower/package/occ/occ.mk b/openpower/package/occ/occ.mk
index c6c455b..36e3e1b 100644
--- a/openpower/package/occ/occ.mk
+++ b/openpower/package/occ/occ.mk
@@ -4,7 +4,7 @@
#
################################################################################
-OCC_VERSION_BRANCH_MASTER_P8 ?= bb092e95266788920751389f7df189425f1ec1d6
+OCC_VERSION_BRANCH_MASTER_P8 ?= 210df8f7062e59d5cec418ef94a2987710825c9b
OCC_VERSION_BRANCH_MASTER ?= a4e04571d60b58c0c778c870bc215bf467085fb6
OCC_VERSION ?= $(if $(BR2_OPENPOWER_POWER9),$(OCC_VERSION_BRANCH_MASTER),$(OCC_VERSION_BRANCH_MASTER_P8))