summaryrefslogtreecommitdiffstats
path: root/src/include
diff options
context:
space:
mode:
Diffstat (limited to 'src/include')
-rw-r--r--src/include/bootloader/bootloader_trace.H4
-rw-r--r--src/include/bootloader/hbblreasoncodes.H2
-rw-r--r--src/include/usr/secureboot/service.H2
-rw-r--r--src/include/usr/util/util_reasoncodes.H2
4 files changed, 4 insertions, 6 deletions
diff --git a/src/include/bootloader/bootloader_trace.H b/src/include/bootloader/bootloader_trace.H
index 3b3fa262a..18b5417bf 100644
--- a/src/include/bootloader/bootloader_trace.H
+++ b/src/include/bootloader/bootloader_trace.H
@@ -77,10 +77,10 @@ enum BootloaderTraces
/** Bootloader main verifyContainer skip verification - SAB unset */
BTLDR_TRC_MAIN_VERIFY_SAB_UNSET = 0x19,
- /** Bootloader main verifyComponent succeeded */
+ /** Bootloader main verifyComponentId succeeded */
BTLDR_TRC_COMP_ID_VERIFY_SUCCESS = 0x1A,
- /** Bootloader main verifyComponent failed */
+ /** Bootloader main verifyComponentId failed */
BTLDR_TRC_COMP_ID_VERIFY_FAILED = 0x1B,
/** Bootloader handleMMIO started */
diff --git a/src/include/bootloader/hbblreasoncodes.H b/src/include/bootloader/hbblreasoncodes.H
index 1a4dbc98f..213e3dfe9 100644
--- a/src/include/bootloader/hbblreasoncodes.H
+++ b/src/include/bootloader/hbblreasoncodes.H
@@ -49,7 +49,7 @@ namespace Bootloader
MOD_PNORACC_GETHBBSECT = 0x04, /**< bl_pnorAccess.C : get HBB sect */
MOD_BOOTLOADER_VERIFY = 0x05, /**< bootloader.C : verifyContainer */
MOD_BOOTLOADER_ASSERT = 0x06, /**< bootloader.H assert */
- MOD_BOOTLOADER_VERIFY_COMP_ID = 0x07, /**< bootloader.C : verifyComponent */
+ MOD_BOOTLOADER_VERIFY_COMP_ID = 0x07, /**< bootloader.C : verifyComponentId */
};
/**
diff --git a/src/include/usr/secureboot/service.H b/src/include/usr/secureboot/service.H
index 7203ae879..638c23505 100644
--- a/src/include/usr/secureboot/service.H
+++ b/src/include/usr/secureboot/service.H
@@ -238,7 +238,7 @@ namespace SECUREBOOT
* @retval nullptr Component ID verification succeeded
* @retval !nullptr Error; component ID verification failed
*/
- errlHndl_t verifyComponent(
+ errlHndl_t verifyComponentId(
const ContainerHeader& i_containerHeader,
const char* i_pComponentId);
diff --git a/src/include/usr/util/util_reasoncodes.H b/src/include/usr/util/util_reasoncodes.H
index 8b1e90e8a..2b43b6757 100644
--- a/src/include/usr/util/util_reasoncodes.H
+++ b/src/include/usr/util/util_reasoncodes.H
@@ -50,7 +50,6 @@ namespace Util
UTIL_MCL_INIT_MEM = 0x10, // MasterContainerLidMgr::initMem
UTIL_MCL_REL_MEM = 0x11, // MasterContainerLidMgr::releaseMem
UTIL_MCL_PROCESS_COMP = 0x12, // MasterContainerLidMgr::processComponent
- UTIL_MCL_VERIFY_EXT = 0x13, // MasterContainerLidMgr::verifyExtend
UTIL_MOD_GET_OBUS_PLL_BUCKET = 0x14, // UtilCommonAttr::getObusPllBucket
};
@@ -80,7 +79,6 @@ namespace Util
UTIL_MM_BLOCK_MAP_FAILED = UTIL_COMP_ID | 0x16,
UTIL_MM_BLOCK_UNMAP_FAILED = UTIL_COMP_ID | 0x17,
UTIL_MCL_SIZE_MISMATCH = UTIL_COMP_ID | 0x18,
- UTIL_MCL_COMPID_MISMATCH = UTIL_COMP_ID | 0x19,
UTIL_ERC_NO_FREQ_LIST = UTIL_COMP_ID | 0x1A,
UTIL_ERC_NO_MATCHING_FREQ = UTIL_COMP_ID | 0x1B,
};
OpenPOWER on IntegriCloud