HB Improvements: Compiler Issues with Different Config Files

Fixed compiler issues with Witherspoon, Romulus, Zaius, Boston.

Change-Id: Ic4046323eb391be6ec311bc408ef9d858ceff8cd
RTC: 202716
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/75552
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Reviewed-by: Ilya Smirnov <ismirno@us.ibm.com>
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: Daniel M. Crowell <dcrowell@us.ibm.com>

5 files changed, 19 insertions, 6 deletions

diff --git a/src/usr/errl/errlentry.C b/src/usr/errl/errlentry.C
index 1cf309cdc..61eeb15f2 100644
--- a/src/usr/errl/errlentry.C
+++ b/src/usr/errl/errlentry.C
@@ -704,8 +704,14 @@ void ErrlEntry::addVersionInfo()
     if (   !INITSERVICE::spBaseServicesEnabled()
         && PNOR::isSectionAvailable(PNOR::VERSION))
     {
+
+// Setting variables only used in config secureboot
+#ifdef CONFIG_SECUREBOOT
         bool l_secureSectionLoaded = false;
-        errlHndl_t l_errl = nullptr, l_errl_loadSecureSection = nullptr;
+        errlHndl_t l_errl_loadSecureSection = nullptr;
+#endif
+
+        errlHndl_t l_errl = nullptr;
 
         do
         {
diff --git a/src/usr/ipmiext/ipmifruinv.C b/src/usr/ipmiext/ipmifruinv.C
index 606f9a167..e70d5afa0 100644
--- a/src/usr/ipmiext/ipmifruinv.C
+++ b/src/usr/ipmiext/ipmifruinv.C
@@ -1418,7 +1418,12 @@ errlHndl_t systemFwIpmiFruInv::buildBoardInfoArea(std::vector<uint8_t> &io_data)
 errlHndl_t systemFwIpmiFruInv::buildProductInfoArea(std::vector<uint8_t>
                                                                        &io_data)
 {
-    errlHndl_t l_errl = nullptr, l_errl_version = nullptr;
+    errlHndl_t l_errl = nullptr;
+
+// Setting variable only used in config secureboot
+#ifdef CONFIG_SECUREBOOT
+    errlHndl_t l_errl_version = nullptr;
+#endif
 
     do {
         //Set formatting data that goes at the beginning of the record
diff --git a/src/usr/isteps/istep07/call_mss_freq.C b/src/usr/isteps/istep07/call_mss_freq.C
index ca7580d89..c6e6ac038 100644
--- a/src/usr/isteps/istep07/call_mss_freq.C
+++ b/src/usr/isteps/istep07/call_mss_freq.C
@@ -79,7 +79,10 @@ void*    call_mss_freq( void *io_pArgs )
 {
     IStepError l_StepError;
     errlHndl_t l_err = NULL;
+
+    #ifdef CONFIG_SECUREBOOT
     bool l_isMemdLoaded = false;
+    #endif
 
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mss_freq entry" );
 
diff --git a/src/usr/isteps/istep11/call_host_prd_hwreconfig.C b/src/usr/isteps/istep11/call_host_prd_hwreconfig.C
index 0df8a468e..e3a0a434a 100644
--- a/src/usr/isteps/istep11/call_host_prd_hwreconfig.C
+++ b/src/usr/isteps/istep11/call_host_prd_hwreconfig.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2015,2018                        */
+/* Contributors Listed Below - COPYRIGHT 2015,2019                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -37,12 +37,11 @@ void* call_host_prd_hwreconfig (void *io_pArgs)
 {
     TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, ENTER_MRK"call_host_prd_hwreconfig");
 
-    errlHndl_t l_err = NULL;
     ISTEP_ERROR::IStepError l_StepError;
     //@TODO-RTC:158411 call p9_enable_reconfig.C
 
-
 #ifdef CONFIG_SECUREBOOT
+    errlHndl_t l_err = NULL;
     // Load the MEMD section here as the first part of step11, it
     //  will stay loaded until the end of step14
     l_err = loadSecureSection(PNOR::MEMD);
diff --git a/src/usr/secureboot/trusted/base/trustedboot_base.C b/src/usr/secureboot/trusted/base/trustedboot_base.C
index 7cb73b8bf..2e5182d2f 100644
--- a/src/usr/secureboot/trusted/base/trustedboot_base.C
+++ b/src/usr/secureboot/trusted/base/trustedboot_base.C
@@ -528,8 +528,8 @@ errlHndl_t extendBaseImage()
 
 void initBackupTpm()
 {
-    errlHndl_t l_errl = nullptr;
 #ifdef CONFIG_TPMDD
+    errlHndl_t l_errl = nullptr;
     Message* l_msg = Message::factory(MSG_TYPE_INIT_BACKUP_TPM,
                                       0,
                                       nullptr,