diff options
Diffstat (limited to 'src/usr/pnor/pnor_utils.C')
| -rw-r--r-- | src/usr/pnor/pnor_utils.C | 31 |
1 files changed, 4 insertions, 27 deletions
diff --git a/src/usr/pnor/pnor_utils.C b/src/usr/pnor/pnor_utils.C index cd7c9f98f..83ff90450 100644 --- a/src/usr/pnor/pnor_utils.C +++ b/src/usr/pnor/pnor_utils.C @@ -53,7 +53,6 @@ extern trace_desc_t* g_trac_pnor; #include "common/ffs_hb.H" #include <util/align.H> -#include <config.h> #include <securerom/ROM.H> #include <pnor/pnorif.H> @@ -110,30 +109,6 @@ void PNOR::initializeSections(PNOR::SectionData_t io_toc[NUM_SECTIONS]) } } - - -/** - * @brief Ensure the buffer is not NULL, if it is, then return - * the appropriate err code from the o_errCode param. - * if the buffer is not NULL then cast it to a ffs_hdr - * and return that out through the respective o_param - */ -void PNOR::checkForNullBuffer(uint8_t* i_tocBuffer, - uint32_t& o_errCode, - ffs_hdr*& o_ffs_hdr) -{ - if(!i_tocBuffer) - { - o_errCode |= BUFF_IS_NULL; - o_ffs_hdr = NULL; - } - else - { - o_ffs_hdr = (ffs_hdr*)i_tocBuffer; - } -} - - /** * @brief Perform a series of checks on the header of the table of contents * These checks include: looking for valid magic #, valid block size, @@ -369,6 +344,7 @@ bool PNOR::isEnforcedSecureSection(const uint32_t i_section) i_section == HB_DATA || i_section == SBE_IPL || i_section == PAYLOAD || + i_section == BOOTKERNEL || i_section == SBKT || i_section == OCC || i_section == HCODE || @@ -378,7 +354,8 @@ bool PNOR::isEnforcedSecureSection(const uint32_t i_section) i_section == MEMD || i_section == CAPP || i_section == TESTLOAD || - i_section == VERSION; + i_section == VERSION || + i_section == OCMBFW; #endif #else return false; @@ -415,7 +392,6 @@ const char * PNOR::SectionIdToString( uint32_t i_secIdIndex ) "part", /**< PNOR::TOC : Table of Contents */ #ifndef BOOTLOADER "HBI", /**< PNOR::HB_EXT_CODE : Hostboot Extended Image */ - "GLOBAL", /**< PNOR::GLOBAL_DATA : Global Data */ #endif "HBB", /**< PNOR::HB_BASE_CODE : Hostboot Base Image */ #ifndef BOOTLOADER @@ -451,6 +427,7 @@ const char * PNOR::SectionIdToString( uint32_t i_secIdIndex ) "HDAT", /**< PNOR::HDAT : Hdat Data */ "EECACHE", /**< PNOR::EECACHE : Cached data from various EEPROMs */ "OCMBFW", /**< PNOR::OCMBFW : OCMB image */ + "BOOTKERNEL", /**< PNOR::BOOTKERNEL : OPAL == petitboot,PHYP == PowerVM */ #endif }; |
