summaryrefslogtreecommitdiffstats
path: root/src/usr/pnor/pnorrp.C
diff options
context:
space:
mode:
authorStephen Cprek <smcprek@us.ibm.com>2017-03-20 13:07:42 -0500
committerWilliam G. Hoffa <wghoffa@us.ibm.com>2017-03-23 10:05:07 -0400
commitd87aceae2d5e5cb66201af5f897b06fa1471d90e (patch)
tree8ca50bf550c1b460d9dc686aed5839901ba5d3e8 /src/usr/pnor/pnorrp.C
parent98de8e60e8395033bf1deed9ede0929ecb796841 (diff)
downloadtalos-hostboot-d87aceae2d5e5cb66201af5f897b06fa1471d90e.tar.gz
talos-hostboot-d87aceae2d5e5cb66201af5f897b06fa1471d90e.zip
Add PNOR SectionIdToString to replace direct access to cv_EYECATCHER
This catches if the const array size does not match the number of pnor sections and out of range index errors Also it adds genErrlParsing for bootloader files Change-Id: I0a90816a7620022dec16bc7358a68ffbdade0083 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/38159 Reviewed-by: Martin Gloff <mgloff@us.ibm.com> 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: Michael Baiocchi <mbaiocch@us.ibm.com> Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com> Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Diffstat (limited to 'src/usr/pnor/pnorrp.C')
-rw-r--r--src/usr/pnor/pnorrp.C10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/usr/pnor/pnorrp.C b/src/usr/pnor/pnorrp.C
index b3f394e51..329e3cac9 100644
--- a/src/usr/pnor/pnorrp.C
+++ b/src/usr/pnor/pnorrp.C
@@ -66,10 +66,6 @@ extern trace_desc_t* g_trac_pnor;
using namespace PNOR;
-/**
- * Eyecatcher strings for PNOR TOC entries
- */
-extern const char* cv_EYECATCHER[];
/**
* @brief set up _start() task entry procedure for PNOR daemon
@@ -528,7 +524,7 @@ errlHndl_t PnorRP::getSectionInfo( PNOR::SectionId i_section,
// copy my data into the external format
o_info.id = iv_TOC[id].id;
- o_info.name = cv_EYECATCHER[id];
+ o_info.name = SectionIdToString(id);
#ifdef CONFIG_SECUREBOOT
o_info.secureProtectedPayloadSize = 0; // for non secure sections
@@ -1737,7 +1733,7 @@ errlHndl_t PnorRP::setVirtAddrs(void)
if (rc)
{
TRACFCOMP(g_trac_pnor, "E>PnorRP::readTOC: Failed to set block permissions to WRITABLE for section %s.",
- cv_EYECATCHER[i]);
+ SectionIdToString(i));
/*@
* @errortype
* @moduleid PNOR::MOD_PNORRP_READTOC
@@ -1770,7 +1766,7 @@ errlHndl_t PnorRP::setVirtAddrs(void)
if (rc)
{
TRACFCOMP(g_trac_pnor, "E>PnorRP::readTOC: Failed to set block permissions to WRITABLE/WRITE_TRACKED for section %s.",
- cv_EYECATCHER[i]);
+ SectionIdToString(i));
/*@
* @errortype
* @moduleid PNOR::MOD_PNORRP_READTOC
OpenPOWER on IntegriCloud