summaryrefslogtreecommitdiffstats
path: root/src/usr
diff options
context:
space:
mode:
Diffstat (limited to 'src/usr')
-rw-r--r--src/usr/isteps/istep07/call_mss_eff_config.C2
-rwxr-xr-xsrc/usr/targeting/xmltohb/makefile14
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}
OpenPOWER on IntegriCloud