From d87aceae2d5e5cb66201af5f897b06fa1471d90e Mon Sep 17 00:00:00 2001 From: Stephen Cprek Date: Mon, 20 Mar 2017 13:07:42 -0500 Subject: 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 Tested-by: Jenkins Server Tested-by: FSP CI Jenkins Tested-by: Jenkins OP Build CI Reviewed-by: Michael Baiocchi Reviewed-by: Nicholas E. Bofferding Reviewed-by: William G. Hoffa --- src/usr/pnor/pnorrp.C | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/usr/pnor/pnorrp.C') 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 -- cgit v1.2.1