diff options
Diffstat (limited to 'src/include/usr/pnor')
| -rw-r--r-- | src/include/usr/pnor/pnor_const.H | 7 | ||||
| -rw-r--r-- | src/include/usr/pnor/pnor_reasoncodes.H | 7 | ||||
| -rw-r--r-- | src/include/usr/pnor/pnorif.H | 2 |
3 files changed, 7 insertions, 9 deletions
diff --git a/src/include/usr/pnor/pnor_const.H b/src/include/usr/pnor/pnor_const.H index 801fa34aa..c975c684c 100644 --- a/src/include/usr/pnor/pnor_const.H +++ b/src/include/usr/pnor/pnor_const.H @@ -27,7 +27,6 @@ #include <stdint.h> #include <builtins.h> -#include <config.h> namespace PNOR { @@ -41,7 +40,6 @@ enum SectionId // Value of HB_EXT_CODE must be 1 for debug framework. #ifndef BOOTLOADER HB_EXT_CODE, /**< Hostboot Extended Image */ - GLOBAL_DATA, /**< Global Data */ #endif HB_BASE_CODE, /**< Hostboot Base Image */ #ifndef BOOTLOADER @@ -77,6 +75,7 @@ enum SectionId HDAT, /**< HDAT data */ EECACHE, OCMBFW, /**< OCMB image */ + BOOTKERNEL, /**< Bootkernel -- HB uses for PHYP */ #endif NUM_SECTIONS, /**< Number of defined sections */ @@ -112,7 +111,8 @@ struct SectionInfo_t reprovision(false), Volatile(false), secure(false), - clearOnEccErr(false) + clearOnEccErr(false), + hasHashTable(false) {} SectionId id; /**< Identifier for this section */ const char* name; /**< Name of the section */ @@ -127,6 +127,7 @@ struct SectionInfo_t bool Volatile; /**< Section loses contents on non HB reboots */ bool secure; /**< Indicates if a section is secure */ bool clearOnEccErr; /**< Indicates on ECC errors, clear and reboot*/ + bool hasHashTable; /**< Indicates if there exists a hash page table*/ size_t secureProtectedPayloadSize; /**< Cache the secure payload size so that the secure container only needs to be parsed once */ diff --git a/src/include/usr/pnor/pnor_reasoncodes.H b/src/include/usr/pnor/pnor_reasoncodes.H index fb7435a33..10c3e7b22 100644 --- a/src/include/usr/pnor/pnor_reasoncodes.H +++ b/src/include/usr/pnor/pnor_reasoncodes.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2011,2018 */ +/* Contributors Listed Below - COPYRIGHT 2011,2019 */ /* [+] Google Inc. */ /* [+] International Business Machines Corp. */ /* */ @@ -98,8 +98,7 @@ namespace PNOR MOD_PNORCOMMON_PARSETOC = 0xC0, /**< PNOR::parseTOC */ // spnorrp.C - // Note: 0xD0 is available, so should be the next one used for spnorrp. - // Remove this comment after doing so. + MOD_SPNORRP_VERIFY_PAGE = 0xD0, /**< SPnorRP::verify_page */ MOD_SPNORRP_DIDSTARTUPFAIL = 0xD1, /**< didSecureStartupFail(rc) */ MOD_SPNORRP_ALLOCATE_BLOCK = 0xD2, /**< SPnorRP::initDaemon */ MOD_SPNORRP_WAITFORMESSAGE = 0xD3, /**< SPnorRP::waitForMessage */ @@ -192,7 +191,7 @@ namespace PNOR RC_NOT_PAGE_ALIGNED = PNOR_COMP_ID | 0x3B, RC_SECURE_PRO_SIZE_MISMATCH = PNOR_COMP_ID | 0x3C, RC_READ_ONLY_PERM_FAIL = PNOR_COMP_ID | 0x3D, - + RC_VERIFY_PAGE_FAILED = PNOR_COMP_ID | 0x3E, //@fixme-RTC:131607-Temporary value to allow HWSV compile //termination_rc RC_PNOR_CORRUPTION = PNOR_COMP_ID | 0x99, diff --git a/src/include/usr/pnor/pnorif.H b/src/include/usr/pnor/pnorif.H index 11cc98a10..9a2fb39fc 100644 --- a/src/include/usr/pnor/pnorif.H +++ b/src/include/usr/pnor/pnorif.H @@ -31,7 +31,6 @@ #include <pnor/pnor_const.H> #include <errl/errlentry.H> #include <utility> -#include <config.h> namespace PNOR { @@ -269,7 +268,6 @@ bool cmpSecurebootMagicNumber(const uint8_t* i_vaddr); * False otherwise. */ bool isSectionEmpty(const PNOR::SectionId i_section); - } // PNOR #endif |
