diff options
| author | Jaymes Wilks <mjwilks@us.ibm.com> | 2017-10-31 22:18:11 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-11-14 21:16:15 -0500 |
| commit | f7b3c79d2b2a98d294bde3cdc8d9466dd1ce45f2 (patch) | |
| tree | c3e7d0416dc3841c9e4f0c392789d19e728b5bf6 | |
| parent | 1f187d7b7b44dfc78e2916362bb7678baeffa548 (diff) | |
| download | talos-hostboot-f7b3c79d2b2a98d294bde3cdc8d9466dd1ce45f2.tar.gz talos-hostboot-f7b3c79d2b2a98d294bde3cdc8d9466dd1ce45f2.zip | |
Secure Boot: SBKT partition support [FSP]
SBKT partition support for FSP systems.
Change-Id: Ic2118a047e5e46d6f8e1289ade0cff0a7cbc4987
RTC:171681
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/49086
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com>
Reviewed-by: Stephen M. Cprek <smcprek@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: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
| -rwxr-xr-x | src/build/buildpnor/genPnorImages.pl | 5 | ||||
| -rw-r--r-- | src/build/buildpnor/pnorLayoutFSP.xml | 1 | ||||
| -rwxr-xr-x | src/build/mkrules/hbfw/img/makefile | 9 |
3 files changed, 14 insertions, 1 deletions
diff --git a/src/build/buildpnor/genPnorImages.pl b/src/build/buildpnor/genPnorImages.pl index f610f38a0..06d624c6e 100755 --- a/src/build/buildpnor/genPnorImages.pl +++ b/src/build/buildpnor/genPnorImages.pl @@ -932,6 +932,11 @@ sub manipulateImages } } } + if ($eyeCatch eq "SBKT" && $emitEccless) + { + run_command("cp $tempImages{PAD_PHASE} $bin_dir/sbkt.bin"); + } + } # ECC Phase diff --git a/src/build/buildpnor/pnorLayoutFSP.xml b/src/build/buildpnor/pnorLayoutFSP.xml index 068f5a5fd..6758e8f58 100644 --- a/src/build/buildpnor/pnorLayoutFSP.xml +++ b/src/build/buildpnor/pnorLayoutFSP.xml @@ -208,6 +208,7 @@ Layout Description - Used when building an FSP driver <eyeCatch>SBKT</eyeCatch> <physicalOffset>0x1722000</physicalOffset> <physicalRegionSize>0x4000</physicalRegionSize> + <sha512Version/> <side>sideless</side> <ecc/> </section> diff --git a/src/build/mkrules/hbfw/img/makefile b/src/build/mkrules/hbfw/img/makefile index 60e5ec083..dcc74ab4e 100755 --- a/src/build/mkrules/hbfw/img/makefile +++ b/src/build/mkrules/hbfw/img/makefile @@ -185,6 +185,13 @@ PNOR_LAYOUT = ${pnorLayoutFSP.xml:P} # we can just specify that we want an fspbuild here without any condition. BUILD_TYPE_PARAMS = --build-type fspbuild +# Here we check to see if a key transition mode was set in the environment. +# This can be either 'imprint' or 'production'. The genPnorImages.pl will catch +# cases when it is set incorrectly and report an error. +.if(${SECUREBOOT_KEY_TRANSITION_MODE} != "") # genPnorImages handles bad parm + KEY_TRANSITION_MODE_PARAMS = --key-transition ${SECUREBOOT_KEY_TRANSITION_MODE} +.endif + # Decide which PNOR to build .if(${FAKEPNOR} == "") # Parameters passed into GEN_PNOR_IMAGE_SCRIPT. @@ -235,7 +242,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} ${BUILD_TYPE_PARAMS} + export LD_PRELOAD=${SIGNING_LIBS} && ${GEN_PNOR_IMAGE_SCRIPT} ${DEFAULT_PARAMS} ${BUILD_TYPE_PARAMS} ${KEY_TRANSITION_MODE_PARAMS} clobber_cp_hbfiles: rm -f ${ALL_DEFAULT_IMAGES} |
