diff options
| author | Mike Baiocchi <mbaiocch@us.ibm.com> | 2017-05-09 13:51:43 -0500 |
|---|---|---|
| committer | William G. Hoffa <wghoffa@us.ibm.com> | 2017-05-15 08:53:18 -0400 |
| commit | 9f8db13fa628edccf3c81fc9a0467fe75d5f23ca (patch) | |
| tree | 79f8728078e8617d55920c32ae9f1d924e0a6644 /src/usr/util | |
| parent | 5d6ef02f7aaae15ec2cccaae05ddc160beca6972 (diff) | |
| download | talos-hostboot-9f8db13fa628edccf3c81fc9a0467fe75d5f23ca.tar.gz talos-hostboot-9f8db13fa628edccf3c81fc9a0467fe75d5f23ca.zip | |
Sign and Verify the HCODE partition
Change-Id: If594c350ed52ee6b40a5aa9e021c8e5ede8fb8aa
RTC:51086
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40294
Reviewed-by: Marshall J. Wilks <mjwilks@us.ibm.com>
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Diffstat (limited to 'src/usr/util')
| -rw-r--r-- | src/usr/util/utillidmgr.C | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/usr/util/utillidmgr.C b/src/usr/util/utillidmgr.C index 872ec4363..767b2df23 100644 --- a/src/usr/util/utillidmgr.C +++ b/src/usr/util/utillidmgr.C @@ -38,11 +38,6 @@ #include <config.h> #ifdef CONFIG_SECUREBOOT #include <pnor/pnorif.H> -#endif - -#include <config.h> -#ifdef CONFIG_SECUREBOOT -#include <pnor/pnorif.H> #include <secureboot/service.H> #endif @@ -736,6 +731,7 @@ errlHndl_t UtilLidMgr::cleanup() bool skip_remove_pages = false; #ifdef CONFIG_SECUREBOOT +#ifndef __HOSTBOOT_RUNTIME // If in SECUREBOOT the lid could be securely signed in PNOR (like OCC) // If so, unload it securely below rather than call mm_remove_pages if (iv_lidPnorInfo.secure) @@ -743,6 +739,7 @@ errlHndl_t UtilLidMgr::cleanup() skip_remove_pages = true; } #endif +#endif if (skip_remove_pages == false) { @@ -784,9 +781,9 @@ errlHndl_t UtilLidMgr::cleanup() if (l_err) { UTIL_FT(ERR_MRK"UtilLidMgr::cleanup: Error from " - "unloadSecureSection(PNOR::OCC): " + "unloadSecureSection(0x%X): " "unloading module : %s (id=0x%X)", - iv_lidFileName, iv_lidId); + iv_lidPnorInfo.id, iv_lidFileName, iv_lidId); } } #endif |
