summaryrefslogtreecommitdiffstats
path: root/src/bootloader/bootloader.C
diff options
context:
space:
mode:
authorMarty Gloff <mgloff@us.ibm.com>2017-05-17 11:13:32 -0500
committerWilliam G. Hoffa <wghoffa@us.ibm.com>2017-05-26 10:08:21 -0400
commit52ff15cd9297e76ef146363541dba4656d75a7c4 (patch)
tree9a4fc5fa51c3a7644f05af9ecc728ee38ae60c2f /src/bootloader/bootloader.C
parent5e1b4a600a87238a04cb19284e3385a4c73e80e8 (diff)
downloadblackbird-hostboot-52ff15cd9297e76ef146363541dba4656d75a7c4.tar.gz
blackbird-hostboot-52ff15cd9297e76ef146363541dba4656d75a7c4.zip
Bootloader hangs if it can't find first TOC
Revise logic in Bootloader for locating the PNOR TOC if it cannot find the TOC at the end of PNOR or if the TOC there fails verification checks. Use the start of PNOR if it was determined, else search back through PNOR by PAGESIZE decrements. Change-Id: I51d0c0f0319bce12ec40d41df2b03f787a3964fd RTC: 164445 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40638 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: Christian R. Geddes <crgeddes@us.ibm.com> Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com> Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Diffstat (limited to 'src/bootloader/bootloader.C')
-rw-r--r--src/bootloader/bootloader.C2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/bootloader/bootloader.C b/src/bootloader/bootloader.C
index 78300ea63..303b14f86 100644
--- a/src/bootloader/bootloader.C
+++ b/src/bootloader/bootloader.C
@@ -297,7 +297,6 @@ namespace Bootloader{
uint64_t l_pnorStart = 0;
uint32_t l_errCode = PNOR::NO_ERROR;
- uint8_t l_tocUsed = 0;
g_blScratchSpace = reinterpret_cast<uint8_t*>(HBBL_SCRATCH_SPACE_ADDR);
g_blData->secureRomValid = false;
@@ -306,7 +305,6 @@ namespace Bootloader{
bl_pnorAccess::getHBBSection(l_pnorEnd,
g_blData->bl_hbbSection,
l_errCode,
- l_tocUsed,
l_pnorStart);
BOOTLOADER_TRACE(BTLDR_TRC_MAIN_GETHBBSECTION_RTN );
OpenPOWER on IntegriCloud