diff options
| author | Stephen Cprek <smcprek@us.ibm.com> | 2017-11-06 16:51:54 -0600 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-11-19 15:40:17 -0500 |
| commit | f4d54e9c85b36d7d557003ebdfbeb3182636e904 (patch) | |
| tree | 6ebabc54b1cf9de8bdbf1a8bf11c8a3e1ddb4968 /src/build/mkrules | |
| parent | 1f2edbc95b80c24c9eef2f0be50fbefda7b04780 (diff) | |
| download | talos-hostboot-f4d54e9c85b36d7d557003ebdfbeb3182636e904.tar.gz talos-hostboot-f4d54e9c85b36d7d557003ebdfbeb3182636e904.zip | |
Fix standalone compile and simics when secureboot compiled out
Change-Id: Ia5e50817208eee672c7899441166add7af718c02
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/49329
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: Michael Baiocchi <mbaiocch@us.ibm.com>
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Reviewed-by: Marshall J. Wilks <mjwilks@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/build/mkrules')
| -rwxr-xr-x | src/build/mkrules/dist.targets.mk | 8 | ||||
| -rwxr-xr-x | src/build/mkrules/hbfw/img/makefile | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/build/mkrules/dist.targets.mk b/src/build/mkrules/dist.targets.mk index adf24e579..fea703b09 100755 --- a/src/build/mkrules/dist.targets.mk +++ b/src/build/mkrules/dist.targets.mk @@ -264,10 +264,10 @@ fsp.tar_CONTENTS = \ $(if $(FAKEPNOR), img/dvpd.dat, ) \ img/simics_NIMBUS_targeting.bin \ img/simics_CUMULUS_targeting.bin \ - $(if $(CONFIG_SECUREBOOT),img/simics_NIMBUS_targeting.bin.protected) \ - $(if $(CONFIG_SECUREBOOT),img/simics_NIMBUS_targeting.bin.unprotected) \ - $(if $(CONFIG_SECUREBOOT),img/simics_CUMULUS_targeting.bin.protected) \ - $(if $(CONFIG_SECUREBOOT),img/simics_CUMULUS_targeting.bin.unprotected) \ + img/simics_NIMBUS_targeting.bin.protected \ + img/simics_NIMBUS_targeting.bin.unprotected \ + img/simics_CUMULUS_targeting.bin.protected \ + img/simics_CUMULUS_targeting.bin.unprotected \ obj/genfiles/fapiattrs.xml \ obj/genfiles/attribute_types_sp.xml \ obj/genfiles/target_types_sp.xml \ diff --git a/src/build/mkrules/hbfw/img/makefile b/src/build/mkrules/hbfw/img/makefile index 5aab72e81..7ea1667d0 100755 --- a/src/build/mkrules/hbfw/img/makefile +++ b/src/build/mkrules/hbfw/img/makefile @@ -166,6 +166,7 @@ SIGNING_LIBS%=${SIGNING_DIR}/libssl.so:${SIGNING_DIR}/libcrypto.so PATH%=/usr/bin:${SIGNING_DIR}:${SIGNING_DIR}/../sb-signing-framework/sb-signing-framework/src/client:${PATH} # Dump information about the Secure Boot configuration +# NOTE: fips/$bb/src/Buildconf sets $CONFIG_SECUREBOOT dump-secureboot-config : .FORCEBLD echo -e "\n\n\ Secure Boot Signing Config:\n\ |
