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/usr | |
| 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/usr')
| -rw-r--r-- | src/usr/isteps/istep07/call_mss_eff_config.C | 2 | ||||
| -rwxr-xr-x | src/usr/targeting/xmltohb/makefile | 14 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/usr/isteps/istep07/call_mss_eff_config.C b/src/usr/isteps/istep07/call_mss_eff_config.C index 5c55e2663..904425da9 100644 --- a/src/usr/isteps/istep07/call_mss_eff_config.C +++ b/src/usr/isteps/istep07/call_mss_eff_config.C @@ -156,7 +156,9 @@ void* call_mss_eff_config( void *io_pArgs ) { IStepError l_StepError; errlHndl_t l_err = nullptr; +#ifdef CONFIG_SECUREBOOT auto memdLoaded = false; +#endif do { diff --git a/src/usr/targeting/xmltohb/makefile b/src/usr/targeting/xmltohb/makefile index eaf50a587..ffe66821f 100755 --- a/src/usr/targeting/xmltohb/makefile +++ b/src/usr/targeting/xmltohb/makefile @@ -187,15 +187,11 @@ VMM_CONSTS_FILE = \ GENFILES = ${XMLTOHB_TARGETS} -XMLTOHB_SYSTEM_BINARIES += \ - $(if $(CONFIG_SECUREBOOT),simics_NIMBUS_targeting.bin.protected) -XMLTOHB_SYSTEM_BINARIES += \ - $(if $(CONFIG_SECUREBOOT),simics_NIMBUS_targeting.bin.unprotected) - -XMLTOHB_SYSTEM_BINARIES += \ - $(if $(CONFIG_SECUREBOOT),simics_CUMULUS_targeting.bin.protected) -XMLTOHB_SYSTEM_BINARIES += \ - $(if $(CONFIG_SECUREBOOT),simics_CUMULUS_targeting.bin.unprotected) +XMLTOHB_SYSTEM_BINARIES += simics_NIMBUS_targeting.bin.protected +XMLTOHB_SYSTEM_BINARIES += simics_NIMBUS_targeting.bin.unprotected + +XMLTOHB_SYSTEM_BINARIES += simics_CUMULUS_targeting.bin.protected +XMLTOHB_SYSTEM_BINARIES += simics_CUMULUS_targeting.bin.unprotected #debug : # @echo COMMON_TARGETING_PATH_PREFIX = ${COMMON_TARGETING_PATH_PREFIX} |
