diff options
| author | Jaymes Wilks <mjwilks@us.ibm.com> | 2017-10-26 09:37:07 -0500 |
|---|---|---|
| committer | William G. Hoffa <wghoffa@us.ibm.com> | 2017-11-09 17:50:21 -0500 |
| commit | 5fa02a909075081da87ea537d13cb7a61e543176 (patch) | |
| tree | 5fb5437e9f54d6964f6bdb9c10bb8306b19ad585 /src/build/mkrules | |
| parent | 3378748dbc2e153ed005e832b8398adfb2729a74 (diff) | |
| download | talos-hostboot-5fa02a909075081da87ea537d13cb7a61e543176.tar.gz talos-hostboot-5fa02a909075081da87ea537d13cb7a61e543176.zip | |
Support selecting fips or op-build for signing process
Adds a new '--build-type' option to genPnorImages.pl to specify
either fspbuild or opbuild, which adds the appropriate magic
value to the secure header during the signing process.
Change-Id: I46a97f88666a5cc925797d3ad0e870a5f5bac89a
RTC:163655
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/48930
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Stephen M. Cprek <smcprek@us.ibm.com>
Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Diffstat (limited to 'src/build/mkrules')
| -rwxr-xr-x | src/build/mkrules/hbfw/img/makefile | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/build/mkrules/hbfw/img/makefile b/src/build/mkrules/hbfw/img/makefile index d878a6521..a420b6e3b 100755 --- a/src/build/mkrules/hbfw/img/makefile +++ b/src/build/mkrules/hbfw/img/makefile @@ -176,6 +176,10 @@ PNOR_LAYOUT = ${pnorLayoutFSP.xml:P} PNOR_LAYOUT = ${defaultPnorLayout.xml:P} .endif +# Since this makefile is only ever used for an FSP signing environment, then +# we can just specify that we want an fspbuild here without any condition. +BUILD_TYPE_PARAMS = --build-type fspbuild + # Decide which PNOR to build .if(${FAKEPNOR} == "") # Parameters passed into GEN_PNOR_IMAGE_SCRIPT. @@ -226,7 +230,7 @@ gen_default_images: ${GEN_DEFAULT_IMAGES_DEPS} # result [hbbl][pad:8:if-applicable][securerom-size:8][securerom] # Call script to generate final bin files for default images - export LD_PRELOAD=${SIGNING_LIBS} && ${GEN_PNOR_IMAGE_SCRIPT} ${DEFAULT_PARAMS} + export LD_PRELOAD=${SIGNING_LIBS} && ${GEN_PNOR_IMAGE_SCRIPT} ${DEFAULT_PARAMS} ${BUILD_TYPE_PARAMS} clobber_cp_hbfiles: rm -f ${ALL_DEFAULT_IMAGES} @@ -379,7 +383,7 @@ ZEPPELIN_HBD_FINAL_IMG = ZEPPELIN.HBD.bin gen_system_specific_images_bypass_cache : dump-secureboot-config # Call script to generate final bin file for chip/system specific images - export LD_PRELOAD=${SIGNING_LIBS} && ${GEN_PNOR_IMAGE_SCRIPT} ${SYSTEM_SPECIFIC_PARAMS} + export LD_PRELOAD=${SIGNING_LIBS} && ${GEN_PNOR_IMAGE_SCRIPT} ${SYSTEM_SPECIFIC_PARAMS} ${BUILD_TYPE_PARAMS} #for NIMBUS fake pnor skip version header .if(${FAKEPNOR} != "") |
