diff options
author | Stephen Cprek <smcprek@us.ibm.com> | 2017-08-28 11:39:53 -0500 |
---|---|---|
committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-09-08 15:55:03 -0400 |
commit | 513299a5b565b066816fe31b1ba224f8d195ca27 (patch) | |
tree | f54948083ef5a77eed53229160f2c842f4d4d46c /src/usr/runtime | |
parent | 948bff49730d59eb2c84c545b5fcec157b08bfbb (diff) | |
download | talos-hostboot-513299a5b565b066816fe31b1ba224f8d195ca27.tar.gz talos-hostboot-513299a5b565b066816fe31b1ba224f8d195ca27.zip |
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 <mbaiocch@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-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: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/runtime')
-rw-r--r-- | src/usr/runtime/populate_hbruntime.C | 12 |
1 files changed, 4 insertions, 8 deletions
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); |