summaryrefslogtreecommitdiffstats
path: root/src/usr/pnor
diff options
context:
space:
mode:
authorStephen Cprek <smcprek@us.ibm.com>2017-02-06 12:31:42 -0600
committerDaniel M. Crowell <dcrowell@us.ibm.com>2017-03-01 14:04:03 -0500
commitf0d7c809d23c2cf44c0be0ff594c14aff22d6f04 (patch)
treebbb67150e4e1d2a6309c4bed69ab70473d02e7ce /src/usr/pnor
parentd3d4ae7c89e6b35fffa8857170762992dc3c6538 (diff)
downloadtalos-hostboot-f0d7c809d23c2cf44c0be0ff594c14aff22d6f04.tar.gz
talos-hostboot-f0d7c809d23c2cf44c0be0ff594c14aff22d6f04.zip
Add SecureROM version info and Change SBE update to use max HBBL size
The HBBL also contains the securerom code and hw keys' hash for verification purposes. So looking for the end of the HBBL code leaves out those sections Change-Id: I73a1b5c50e3a5b3f642ca569b90e79dbe4c4ba1e Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35979 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: Martin Gloff <mgloff@us.ibm.com> Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/pnor')
-rw-r--r--src/usr/pnor/pnor_utils.C27
1 files changed, 15 insertions, 12 deletions
diff --git a/src/usr/pnor/pnor_utils.C b/src/usr/pnor/pnor_utils.C
index 1890499bc..5af2993cb 100644
--- a/src/usr/pnor/pnor_utils.C
+++ b/src/usr/pnor/pnor_utils.C
@@ -361,19 +361,22 @@ void PNOR::parseEntries (ffs_hdr* i_ffs_hdr,
bool PNOR::isSecureSection(const uint32_t i_section)
{
-// TODO securebootp9 uncomment these sections as they become ready for
-// inclusion in p9. Remove this comment after the last one.
#ifdef CONFIG_SECUREBOOT
- return i_section == HB_BASE_CODE;
-// return i_section == HB_EXT_CODE ||
-// i_section == HB_DATA ||
-// i_section == SBE_IPL ||
-// i_section == CENTAUR_SBE ||
-// i_section == PAYLOAD ||
-// i_section == SBKT ||
-// i_section == OCC ||
-// i_section == HB_RUNTIME;
- return false;
+ #ifdef BOOTLOADER
+ return i_section == HB_BASE_CODE;
+ // TODO securebootp9 uncomment these sections as they become ready for
+ // inclusion in p9. Remove this comment after the last one.
+ #else
+ // return i_section == HB_EXT_CODE ||
+ // i_section == HB_DATA ||
+ // i_section == SBE_IPL ||
+ // i_section == CENTAUR_SBE ||
+ // i_section == PAYLOAD ||
+ // i_section == SBKT ||
+ // i_section == OCC ||
+ // i_section == HB_RUNTIME;
+ return false;
+ #endif
#else
return false;
#endif
OpenPOWER on IntegriCloud