diff options
| author | Stephen M. Cprek <smcprek@us.ibm.com> | 2017-04-12 10:32:24 -0400 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-04-25 13:57:24 -0400 |
| commit | c291a4a8283d4f098d0c442f138279a226c9fcc4 (patch) | |
| tree | ea77bed1ac2c67eec94d503f6fbe678d26c96cdc /src/usr/sbe/sbe_update.C | |
| parent | 5799315afe7246ffb3609819cb27224e6e91c378 (diff) | |
| download | talos-hostboot-c291a4a8283d4f098d0c442f138279a226c9fcc4.tar.gz talos-hostboot-c291a4a8283d4f098d0c442f138279a226c9fcc4.zip | |
Fix for Add header and verify Hostboot Bootloader for sbe update
Also enable the use of the FSP specific pnor layout.
CMVC-prereq:1021911
Change-Id: If346c59537928d12af1dfbd085b2a492398cbf27
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/39159
Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Martin Gloff <mgloff@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: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/sbe/sbe_update.C')
| -rw-r--r-- | src/usr/sbe/sbe_update.C | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/usr/sbe/sbe_update.C b/src/usr/sbe/sbe_update.C index 86869bff9..8d045a85b 100644 --- a/src/usr/sbe/sbe_update.C +++ b/src/usr/sbe/sbe_update.C @@ -1846,6 +1846,7 @@ namespace SBE } const void* hbblPnorPtr = reinterpret_cast<const void*>( pnorInfo.vaddr); + // Use max hbbl size and not the PNOR size. The PNOR size can grow // to add a secure header, but the code size limit is still 20K. TRACFCOMP( g_trac_sbe, "getSbeInfoState() - " @@ -3709,6 +3710,12 @@ namespace SBE break; } + err = loadSecureSection(PNOR::HB_BOOTLOADER); + if(err) + { + TRACFCOMP( g_trac_sbe, ERR_MRK,"createSbeImageVmmSpace() - Error from loadSecureSection(PNOR::HB_BOOTLOADER)"); + break; + } #endif }while(0); @@ -3813,6 +3820,13 @@ namespace SBE TRACFCOMP( g_trac_sbe, ERR_MRK"cleanupSbeImageVmmSpace() - Error from unloadSecureSection(PNOR::SBE_IPL)"); break; } + + err = unloadSecureSection(PNOR::HB_BOOTLOADER); + if (err) + { + TRACFCOMP( g_trac_sbe, ERR_MRK,"cleanupSbeImageVmmSpace() - Error from unloadSecureSection(PNOR::HB_BOOTLOADER)"); + break; + } #endif }while(0); |
