diff options
| author | Stephen Cprek <smcprek@us.ibm.com> | 2017-01-04 14:55:22 -0600 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-01-06 15:00:11 -0500 |
| commit | d0b4499de44240f199e54a71b58ea72fa2c4523d (patch) | |
| tree | 7f10f737fd2125e61c9d2921d750a492e3755f26 | |
| parent | fffe871494c7c430e93fc939d15582158c458e3c (diff) | |
| download | talos-hostboot-d0b4499de44240f199e54a71b58ea72fa2c4523d.tar.gz talos-hostboot-d0b4499de44240f199e54a71b58ea72fa2c4523d.zip | |
Add one element to the TOC array to match how pnorrp.H does it.
Also move location where we grab the bootloader trace in citests
CQ:SW375140
Change-Id: I1108bccb930d324bf938051738343744610a1876
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/34375
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Reviewed-by: Martin Gloff <mgloff@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: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
| -rw-r--r-- | src/bootloader/bl_pnorAccess.C | 4 | ||||
| -rwxr-xr-x | src/build/citest/autocitest | 21 |
2 files changed, 13 insertions, 12 deletions
diff --git a/src/bootloader/bl_pnorAccess.C b/src/bootloader/bl_pnorAccess.C index 77f53265c..037b5eb68 100644 --- a/src/bootloader/bl_pnorAccess.C +++ b/src/bootloader/bl_pnorAccess.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -259,7 +259,7 @@ void bl_pnorAccess::getHBBSection(uint64_t i_pnorEnd, BOOTLOADER_TRACE(BTLDR_TRC_PA_GETHBBSECTION_START); do { - PNOR::SectionData_t l_TOC[PNOR::NUM_SECTIONS]; + PNOR::SectionData_t l_TOC[PNOR::NUM_SECTIONS+1]; findTOC(i_pnorEnd, l_TOC, o_errCode, o_tocUsed, o_pnorStart); diff --git a/src/build/citest/autocitest b/src/build/citest/autocitest index f6b3b1afa..f742f60bb 100755 --- a/src/build/citest/autocitest +++ b/src/build/citest/autocitest @@ -6,7 +6,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2011,2016 +# Contributors Listed Below - COPYRIGHT 2011,2017 # [+] International Business Machines Corp. # # @@ -252,6 +252,16 @@ done echo echo +# Grab Bootloader trace before it gets destroyed +echo "====> dump hb-bltrace..." +autosim $NOWIN --simcmd "pipe hb-bltrace \"cat > ${SBXHOME}/hb-bltrace.log \"" --timeout 300 +if [ $? -ne 0 ] ; then +echo "ERROR: Unable to run $?" + stopsim + stopserver + exit 1 +fi + waitkb ## grep for totaltests, etc. These will appear in the hbicore_test.syms file and @@ -402,15 +412,6 @@ if [ $? -ne 0 ] ; then fi warnings=`cat $SBXHOME/warnings.log | awk '/0x/ {print strtonum($1)}'` -echo "====> dump hb-bltrace..." -autosim $NOWIN --simcmd "pipe hb-bltrace \"cat > ${SBXHOME}/hb-bltrace.log \"" --timeout 300 -if [ $? -ne 0 ] ; then -echo "ERROR: Unable to run $?" - stopsim - stopserver - exit 1 -fi - echo "====> dump tracecalls..." autosim $NOWIN --simcmd "print ((system_cmp0.phys_mem).read 0x$tracecalls_addr 0x08)" 1> $SBXHOME/tracecalls.log 2> /dev/null if [ $? -ne 0 ] ; then |
