summaryrefslogtreecommitdiffstats
path: root/src/build/buildpnor/genPnorImages.pl
diff options
context:
space:
mode:
authorNick Bofferding <bofferdn@us.ibm.com>2017-06-29 16:34:21 -0500
committerDaniel M. Crowell <dcrowell@us.ibm.com>2017-07-11 16:14:16 -0400
commit866fdde63a2b8f0f766848018e80df25ae7cc2c3 (patch)
tree62198f53210a70853c6f8f71baf7663a0346bd6b /src/build/buildpnor/genPnorImages.pl
parent758d829b631b0d956661ba6d6af6ed1eea83bffe (diff)
downloadtalos-hostboot-866fdde63a2b8f0f766848018e80df25ae7cc2c3.tar.gz
talos-hostboot-866fdde63a2b8f0f766848018e80df25ae7cc2c3.zip
Support open signing tool when inserting a zeroed partition
Change-Id: I043f740fdcb529af81a3c74e01d84613fb1769b0 RTC: 174017 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42626 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Reviewed-by: Stephen M. Cprek <smcprek@us.ibm.com> Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Reviewed-by: Michael Baiocchi <mbaiocch@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: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/build/buildpnor/genPnorImages.pl')
-rwxr-xr-xsrc/build/buildpnor/genPnorImages.pl15
1 files changed, 12 insertions, 3 deletions
diff --git a/src/build/buildpnor/genPnorImages.pl b/src/build/buildpnor/genPnorImages.pl
index b2cf01d1e..19e6c4779 100755
--- a/src/build/buildpnor/genPnorImages.pl
+++ b/src/build/buildpnor/genPnorImages.pl
@@ -845,9 +845,18 @@ sub manipulateImages
if ($secureboot && $secureSupported)
{
$callerHwHdrFields{configure} = 1;
- # @TODO RTC:155374 Remove when official signing
- # supported
- run_command("$SIGNING_DIR/build -good -if $secureboot_hdr -of $tempImages{PAD_PHASE} -bin $tempImages{TEMP_BIN} $SIGN_BUILD_PARAMS");
+ if($openSigningTool)
+ {
+ run_command("$CUR_OPEN_SIGN_REQUEST "
+ . "--protectedPayload $tempImages{TEMP_BIN} "
+ . "--out $tempImages{PAD_PHASE}");
+ }
+ else
+ {
+ # @TODO RTC:155374 Remove when official signing
+ # supported
+ run_command("$SIGNING_DIR/build -good -if $secureboot_hdr -of $tempImages{PAD_PHASE} -bin $tempImages{TEMP_BIN} $SIGN_BUILD_PARAMS");
+ }
setCallerHwHdrFields(\%callerHwHdrFields,
$tempImages{PAD_PHASE});
}
OpenPOWER on IntegriCloud