summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorey Swenson <cswenson@us.ibm.com>2017-01-31 12:45:34 -0600
committerDaniel M. Crowell <dcrowell@us.ibm.com>2017-02-02 17:08:23 -0500
commitef97aaaf30330d6f7cf5ffae2ede16b105ea2bbe (patch)
treeb0a550355d0f73dcdd808fa03f63a69a474c7ace
parentd7058975ebf6059bc79893dd5fbd624a8ce42eb6 (diff)
downloadblackbird-hostboot-ef97aaaf30330d6f7cf5ffae2ede16b105ea2bbe.tar.gz
blackbird-hostboot-ef97aaaf30330d6f7cf5ffae2ede16b105ea2bbe.zip
Workaround to skip getRingOvd at runtime
Change-Id: Ic1e0be39f4ee639373474e6f7d5d9731414050bd Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35729 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Reviewed-by: Martin Gloff <mgloff@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
-rw-r--r--src/usr/isteps/pm/pm_common.C6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/usr/isteps/pm/pm_common.C b/src/usr/isteps/pm/pm_common.C
index 857314128..befd431e7 100644
--- a/src/usr/isteps/pm/pm_common.C
+++ b/src/usr/isteps/pm/pm_common.C
@@ -341,7 +341,7 @@ namespace HBPM
// Check if we have a valid ring override section and
// include it in if so
- void* l_ringOverrides = NULL;
+ void* l_ringOverrides = nullptr;
l_errl = HBPM::getRingOvd(l_ringOverrides);
if(l_errl)
{
@@ -972,6 +972,10 @@ namespace HBPM
do {
io_overrideImg = nullptr;
+#ifdef __HOSTBOOT_RUNTIME
+ break;
+#endif
+
// No overrides in secure mode
if( SECUREBOOT::enabled() )
{
OpenPOWER on IntegriCloud