summaryrefslogtreecommitdiffstats
path: root/src/usr/pnor/test
diff options
context:
space:
mode:
authorAndrew Jeffery <andrewrj@au1.ibm.com>2018-09-17 17:23:19 +0930
committerDaniel M. Crowell <dcrowell@us.ibm.com>2018-10-10 13:46:36 -0500
commit9518b4c189c96a26cb80a57aa441e38f33bdc5cf (patch)
tree3ee47d1136fae625b0ed7a8ccea91e8328682695 /src/usr/pnor/test
parent7c16f3706b3c822e72d369d828939a800acccdd2 (diff)
downloadblackbird-hostboot-9518b4c189c96a26cb80a57aa441e38f33bdc5cf.tar.gz
blackbird-hostboot-9518b4c189c96a26cb80a57aa441e38f33bdc5cf.zip
pnor: Fall back to AST mbox transport if IPMI is unavailable
Avoid a flag-day transition by allowing for old BMC releases. Eventually support for the AST mailbox will be removed and the indirection with it. Change-Id: Ic62ee6a0f2132583cba290098a52417d32eb772d Signed-off-by: Andrew Jeffery <andrewrj@au1.ibm.com> Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/66122 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/pnor/test')
-rw-r--r--src/usr/pnor/test/pnorddtest.H15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/usr/pnor/test/pnorddtest.H b/src/usr/pnor/test/pnorddtest.H
index 44491d973..fa38413ff 100644
--- a/src/usr/pnor/test/pnorddtest.H
+++ b/src/usr/pnor/test/pnorddtest.H
@@ -40,19 +40,16 @@
#include <devicefw/userif.H>
#include <kernel/console.H>
#include <sys/time.h>
-#ifdef CONFIG_PNORDD_IS_SFC
+#if defined(CONFIG_PNORDD_IS_SFC)
#include "pnor_sfcdd.H"
using PnorDD = PnorSfcDD;
-#elif CONFIG_PNORDD_IS_BMCMBOX
-#include "pnor_mboxdd.H"
-using PnorDD = PnorMboxDD;
-#elif CONFIG_PNORDD_IS_IPMI
-#include "pnor_ipmidd.H"
-using PnorDD = PnorIpmiDD;
+#elif (defined(CONFIG_PNORDD_IS_BMCMBOX) || defined(CONFIG_PNORDD_IS_IPMI))
+#include "pnor_hiomapdd.H"
+using PnorDD = PnorHiomapDD;
#else
-#error "No PNOR DD implementation configured"
+#error "No PNOR DD configured"
#endif
-#include "../pnorrp.H"
+#include "pnorrp.H"
#include <list>
#include <targeting/common/attributes.H>
OpenPOWER on IntegriCloud