commit 2ade4860be7025670430045a1aed663c231eee3c
author William Hoffa <wihoffa@gmail.com> Thu Jun 01 08:32:55 2017 -0500
committer GitHub <noreply@github.com> Thu Jun 01 08:32:55 2017 -0500
tree 0b6853e1f9fc6b580536fa6044ec981d2a0777b6
parent d6eda8bb210454a576e14d9105a4d39bd44a614c
parent 8e3ec91dceb1d5f8178a9e728c40cd88b4e73bd9

Merge pull request #1120 from op-jenkins/op-build-update_05_6-1-2017

op-build update 6-1-2017

openpower/configs/hostboot/witherspoon.config

diff --git a/openpower/configs/hostboot/witherspoon.config b/openpower/configs/hostboot/witherspoon.config
index bc91d5a..a3380fb 100755
--- a/openpower/configs/hostboot/witherspoon.config
+++ b/openpower/configs/hostboot/witherspoon.config
@@ -1,6 +1,8 @@
-# The Serial Flash Controller is the AST2400 BMC.
-set   SFC_IS_AST2500
+# The BMC MBOX Protocol is used to access PNOR
+unset SFC_IS_AST2500
 unset SFC_IS_AST2400
+set   PNORDD_IS_BMCMBOX
+unset PNORDD_IS_SFC
 unset BMC_DOES_SFC_INIT
 unset SFC_IS_IBM_DPSS
 set   ALLOW_MICRON_PNOR

openpower/configs/hostboot/zaius.config

diff --git a/openpower/configs/hostboot/zaius.config b/openpower/configs/hostboot/zaius.config
index bc87d42..cd0390e 100755
--- a/openpower/configs/hostboot/zaius.config
+++ b/openpower/configs/hostboot/zaius.config
@@ -1,6 +1,8 @@
-# The Serial Flash Controller is the AST2500 BMC.
-set   SFC_IS_AST2500
+# The BMC MBOX Protocol is used to access PNOR
+unset SFC_IS_AST2500
 unset SFC_IS_AST2400
+set   PNORDD_IS_BMCMBOX
+unset PNORDD_IS_SFC
 unset BMC_DOES_SFC_INIT
 unset SFC_IS_IBM_DPSS
 set   ALLOW_MICRON_PNOR