diff options
| author | Stephen Cprek <smcprek@us.ibm.com> | 2017-03-20 13:07:42 -0500 |
|---|---|---|
| committer | William G. Hoffa <wghoffa@us.ibm.com> | 2017-03-23 10:05:07 -0400 |
| commit | d87aceae2d5e5cb66201af5f897b06fa1471d90e (patch) | |
| tree | 8ca50bf550c1b460d9dc686aed5839901ba5d3e8 /src/bootloader | |
| parent | 98de8e60e8395033bf1deed9ede0929ecb796841 (diff) | |
| download | talos-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/bootloader')
| -rw-r--r-- | src/bootloader/bl_pnorAccess.C | 22 | ||||
| -rw-r--r-- | src/bootloader/bl_terminate.C | 16 | ||||
| -rw-r--r-- | src/bootloader/bootloader.C | 6 |
3 files changed, 21 insertions, 23 deletions
diff --git a/src/bootloader/bl_pnorAccess.C b/src/bootloader/bl_pnorAccess.C index 037b5eb68..b8db406a0 100644 --- a/src/bootloader/bl_pnorAccess.C +++ b/src/bootloader/bl_pnorAccess.C @@ -33,8 +33,6 @@ #define BOOTLOADER_TRACE_W_BRK(args) TRACFCOMP(g_trac_pnor,"##args") #endif - -extern const char* cv_EYECATCHER[]; /** * @brief Takes in a buffer containing a ToC, as well as a base address Returns out a boolean whether or not this toc was valid @@ -66,8 +64,8 @@ void bl_pnorAccess::readTOC(uint8_t i_tocBuffer[PNOR::TOC_SIZE], // Set TI information but caller decides to TI or not /*@ * @errortype - * @moduleid MOD_PNORACC_READTOC - * @reasoncode RC_CHK_NULL_BUFFER + * @moduleid Bootloader::MOD_PNORACC_READTOC + * @reasoncode Bootloader::RC_CHK_NULL_BUFFER * @userdata1[0:15] TI_WITH_SRC * @userdata1[16:31] TI_BOOTLOADER * @userdata1[32:63] Failing address = 0 @@ -103,8 +101,8 @@ void bl_pnorAccess::readTOC(uint8_t i_tocBuffer[PNOR::TOC_SIZE], // Set TI information but caller decides to TI or not /*@ * @errortype - * @moduleid MOD_PNORACC_READTOC - * @reasoncode RC_HDR_CHECKSUM_ERR + * @moduleid Bootloader::MOD_PNORACC_READTOC + * @reasoncode Bootloader::RC_HDR_CHECKSUM_ERR * @userdata1[0:15] TI_WITH_SRC * @userdata1[16:31] TI_BOOTLOADER * @userdata1[32:63] Failing address = 0 @@ -133,8 +131,8 @@ void bl_pnorAccess::readTOC(uint8_t i_tocBuffer[PNOR::TOC_SIZE], // Set TI information but caller decides to TI or not /*@ * @errortype - * @moduleid MOD_PNORACC_READTOC - * @reasoncode RC_CHECK_HEADER_ERR + * @moduleid Bootloader::MOD_PNORACC_READTOC + * @reasoncode Bootloader::RC_CHECK_HEADER_ERR * @userdata1[0:15] TI_WITH_SRC * @userdata1[16:31] TI_BOOTLOADER * @userdata1[32:63] Failing address = 0 @@ -168,8 +166,8 @@ void bl_pnorAccess::readTOC(uint8_t i_tocBuffer[PNOR::TOC_SIZE], // Set TI information but caller decides to TI or not /*@ * @errortype - * @moduleid MOD_PNORACC_READTOC - * @reasoncode RC_PARSE_ENTRIES_ERR + * @moduleid Bootloader::MOD_PNORACC_READTOC + * @reasoncode Bootloader::RC_PARSE_ENTRIES_ERR * @userdata1[0:15] TI_WITH_SRC * @userdata1[16:31] TI_BOOTLOADER * @userdata1[32:63] Failing address = 0 @@ -277,8 +275,8 @@ void bl_pnorAccess::getHBBSection(uint64_t i_pnorEnd, BOOTLOADER_TRACE_W_BRK(BTLDR_TRC_PA_GETHBBSECTION_FINDTOC_NOHBB); /*@ * @errortype - * @moduleid MOD_PNORACC_GETHBBSECT - * @reasoncode RC_NO_HBB_IN_TOC + * @moduleid Bootloader::MOD_PNORACC_GETHBBSECT + * @reasoncode Bootloader::RC_NO_HBB_IN_TOC * @userdata1[0:15] TI_WITH_SRC * @userdata1[16:31] TI_BOOTLOADER * @userdata1[32:63] Failing address = 0 diff --git a/src/bootloader/bl_terminate.C b/src/bootloader/bl_terminate.C index 8c2c1ab1f..e0721bc37 100644 --- a/src/bootloader/bl_terminate.C +++ b/src/bootloader/bl_terminate.C @@ -43,8 +43,8 @@ void kernel_std_exception() /*@ * @errortype - * @moduleid MOD_BOOTLOADER_TERMINATE - * @reasoncode RC_STD_EXCEPTION + * @moduleid Bootloader::MOD_BOOTLOADER_TERMINATE + * @reasoncode Bootloader::RC_STD_EXCEPTION * @userdata1[0:15] TI_WITH_SRC * @userdata1[16:31] TI_BOOTLOADER * @userdata1[32:63] Exception vector address @@ -69,8 +69,8 @@ void kernel_std_exception_w_dsisr() /*@ * @errortype - * @moduleid MOD_BOOTLOADER_TERMINATE - * @reasoncode RC_STD_EX_W_DSISR + * @moduleid Bootloader::MOD_BOOTLOADER_TERMINATE + * @reasoncode Bootloader::RC_STD_EX_W_DSISR * @userdata1[0:15] TI_WITH_SRC * @userdata1[16:31] TI_BOOTLOADER * @userdata1[32:63] Exception vector address @@ -97,8 +97,8 @@ void kernel_std_exception_w_srr1() /*@ * @errortype - * @moduleid MOD_BOOTLOADER_TERMINATE - * @reasoncode RC_STD_EX_W_SRR1 + * @moduleid Bootloader::MOD_BOOTLOADER_TERMINATE + * @reasoncode Bootloader::RC_STD_EX_W_SRR1 * @userdata1[0:15] TI_WITH_SRC * @userdata1[16:31] TI_BOOTLOADER * @userdata1[32:63] Exception vector address @@ -124,8 +124,8 @@ void kernel_hype_exception() /*@ * @errortype - * @moduleid MOD_BOOTLOADER_TERMINATE - * @reasoncode RC_HYPE_EXCEPTION + * @moduleid Bootloader::MOD_BOOTLOADER_TERMINATE + * @reasoncode Bootloader::RC_HYPE_EXCEPTION * @userdata1[0:15] TI_WITH_SRC * @userdata1[16:31] TI_BOOTLOADER * @userdata1[32:63] Exception vector address diff --git a/src/bootloader/bootloader.C b/src/bootloader/bootloader.C index be2c2f748..305033f44 100644 --- a/src/bootloader/bootloader.C +++ b/src/bootloader/bootloader.C @@ -216,7 +216,7 @@ namespace Bootloader{ BOOTLOADER_TRACE(BTLDR_TRC_MAIN_VERIFY_FAIL); /*@ * @errortype - * @moduleid MOD_BOOTLOADER_VERIFY + * @moduleid Bootloader::MOD_BOOTLOADER_VERIFY * @reasoncode SECUREBOOT::RC_ROM_VERIFY * @userdata1 ROM return code * @userdata2 ROM_hw_params log @@ -351,8 +351,8 @@ namespace Bootloader{ BOOTLOADER_TRACE_W_BRK(BTLDR_TRC_MAIN_REMOVEECC_FAIL); /*@ * @errortype - * @moduleid MOD_BOOTLOADER_MAIN - * @reasoncode RC_REMOVE_ECC_FAIL + * @moduleid Bootloader::MOD_BOOTLOADER_MAIN + * @reasoncode Bootloader::RC_REMOVE_ECC_FAIL * @userdata1[0:15] TI_WITH_SRC * @userdata1[16:31] TI_BOOTLOADER * @userdata1[32:63] Failing address = 0 |
