From 513299a5b565b066816fe31b1ba224f8d195ca27 Mon Sep 17 00:00:00 2001 From: Stephen Cprek Date: Mon, 28 Aug 2017 11:39:53 -0500 Subject: Re-enable OCC parition in pnor Additional Changes - Created isEmpty check for pnor sections to handle lack of FSP support when loading Lids - Removed not needed PNOR partitions from FSP layout Change-Id: I326831a1b389ef25b6f5f557d332c74f3b5e77d8 RTC:178164 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/45251 Reviewed-by: Michael Baiocchi Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Tested-by: FSP CI Jenkins Reviewed-by: Nicholas E. Bofferding Reviewed-by: Daniel M. Crowell --- src/usr/runtime/populate_hbruntime.C | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/usr/runtime') diff --git a/src/usr/runtime/populate_hbruntime.C b/src/usr/runtime/populate_hbruntime.C index 450ff22fd..b4af2f3d6 100644 --- a/src/usr/runtime/populate_hbruntime.C +++ b/src/usr/runtime/populate_hbruntime.C @@ -1169,15 +1169,11 @@ errlHndl_t populate_HbRsvMem(uint64_t i_nodeId) // -- HCODE // -- Non-verified Images /// -- RINGOVD - // @TODO RTC:178164 add OCC PNOR support for fsp back - if (!INITSERVICE::spBaseServicesEnabled()) + l_elog = hbResvLoadSecureSection(PNOR::OCC, i_nodeId, + l_prevDataAddr, l_prevDataSize); + if (l_elog) { - l_elog = hbResvLoadSecureSection(PNOR::OCC, i_nodeId, - l_prevDataAddr, l_prevDataSize); - if (l_elog) - { - break; - } + break; } l_elog = hbResvLoadSecureSection(PNOR::WOFDATA, i_nodeId, l_prevDataAddr, l_prevDataSize); -- cgit v1.2.3