diff options
| author | Stephen Cprek <smcprek@us.ibm.com> | 2017-02-06 12:31:42 -0600 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-03-01 14:04:03 -0500 |
| commit | f0d7c809d23c2cf44c0be0ff594c14aff22d6f04 (patch) | |
| tree | bbb67150e4e1d2a6309c4bed69ab70473d02e7ce /src/build | |
| parent | d3d4ae7c89e6b35fffa8857170762992dc3c6538 (diff) | |
| download | talos-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/build')
| -rw-r--r-- | src/build/debug/Hostboot/BlTrace.pm | 9 | ||||
| -rwxr-xr-x | src/build/mkrules/hbfw/img/makefile | 10 |
2 files changed, 11 insertions, 8 deletions
diff --git a/src/build/debug/Hostboot/BlTrace.pm b/src/build/debug/Hostboot/BlTrace.pm index 5ce06d13c..12c9873cc 100644 --- a/src/build/debug/Hostboot/BlTrace.pm +++ b/src/build/debug/Hostboot/BlTrace.pm @@ -34,11 +34,12 @@ my %traceText = ( "11" => "Main getHBBSection returned", "12" => "Main handleMMIO to working location returned", "13" => "Main removeECC returned", + "14" => "Main verify started", + "15" => "Main verify succeeded", + "16" => "Main copy HBB to running location done", + "17" => "Main verify skip verification - no eyecatch ", # @TODO RTC:167740 remove magic number check once fsp/op signs HBB - "14" => "main verifyBaseImage skip verification - no magic number ", - "15" => "main verifyBaseImage started", - "16" => "main verifyBaseImage succeeded", - "17" => "Main copy HBB to running location done", + "18" => "Main verify skip verification - no magic number ", "20" => "HandleMMIO started", "21" => "HandleMMIO started using BYTESIZE", "24" => "HandleMMIO started using WORDSIZE", diff --git a/src/build/mkrules/hbfw/img/makefile b/src/build/mkrules/hbfw/img/makefile index 037e3592e..ac2a6b2af 100755 --- a/src/build/mkrules/hbfw/img/makefile +++ b/src/build/mkrules/hbfw/img/makefile @@ -95,9 +95,6 @@ FINAL_OUTPUT_IMAGES = ${HBBL_FINAL_IMG} ${HBB_FINAL_IMG} ${HBI_FINAL_IMG} \ ${PAYLOAD_FINAL_IMG} ${RINGOVD_FINAL_IMG} ${SBKT_FINAL_IMG} \ ${WOFDATA_FINAL_IMG} -# Temp images -HB_TEMP_IMG = hb_temp.bin - # Aggregate ALL_DEFAULT_IMAGES = ${DEFAULT_INPUT_IMAGES} ${FINAL_OUTPUT_IMAGES} @@ -138,10 +135,15 @@ gen_default_images: cp_hbfiles # Remove offset from start of Bootloader image for HBBL partition # Actual code is offset from HRMOR by 12k = 12 1k-blocks (space # reserved for exception vectors) + # Note: ibs=8 conv=sync to ensure this ends at an 8byte boundary for the + # securerom code to start at. dd if=${BOOTLDR_IMG} of=${HBBL_IMG} ibs=8 skip=1536 conv=sync - # Append Hostboot securerom code to the HBBL section + # Append Hostboot securerom code size to HBBL + du -b ${HB_SECROM_IMG} | cut -f1 | xargs printf "%016x" | sed 's/.\{2\}/\\\\x&/g' | xargs echo -n -e >> ${HBBL_IMG} + # Append Hostboot securerom code after its size cat ${HB_SECROM_IMG} >> ${HBBL_IMG} + # result [hbbl][pad:8:if-applicable][securerom-size:8][securerom] # Call script to generate final bin files for default images ${GEN_PNOR_IMAGE_SCRIPT} ${DEFAULT_PARAMS} |
