Add call to exp_mss_thermal_init to step 14.2

Change-Id: I85b34168b8a93ea8c744b6a79f207ce924cdf50f
RTC:195557
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/79326
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M Crowell <dcrowell@us.ibm.com>

2 files changed, 14 insertions, 7 deletions

diff --git a/src/usr/isteps/istep14/call_mss_thermal_init.C b/src/usr/isteps/istep14/call_mss_thermal_init.C
index 9d206e104..c11731e1d 100644
--- a/src/usr/isteps/istep14/call_mss_thermal_init.C
+++ b/src/usr/isteps/istep14/call_mss_thermal_init.C
@@ -39,7 +39,7 @@
 #include    <fapi2/plat_hwp_invoker.H>
 
 #ifdef CONFIG_AXONE
-    //@TODO RTC:195557 #include    <exp_thermal_init.H>
+   #include    <exp_mss_thermal_init.H>
     #include    <chipids.H> // for EXPLORER ID
     #include    <p9a_throttle_sync.H>
 #else
@@ -230,11 +230,11 @@ void axone_call_mss_thermal_init(IStepError & io_istepError)
 
             // Dump current run on target
             TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
-                "Running exp_thermal_init HWP on target HUID %.8X",
+                "Running exp_mss_thermal_init HWP on target HUID %.8X",
                 TARGETING::get_huid(l_ocmb_target));
 
             // call the HWP with each fapi2::Target
-            // @todo RTC 195557 FAPI_INVOKE_HWP(l_err, exp_thermal_init, l_fapi_ocmb_target);
+            FAPI_INVOKE_HWP(l_err, exp_mss_thermal_init, l_fapi_ocmb_target);
         }
         else
         {
@@ -247,7 +247,7 @@ void axone_call_mss_thermal_init(IStepError & io_istepError)
         if (l_err)
         {
             TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace,
-                      "ERROR 0x%.8X: exp_thermalinit HWP returns error",
+                      "ERROR 0x%.8X: exp_mss_thermal_init HWP returns error",
                       l_err->reasonCode());
 
             // capture the target data in the elog
@@ -265,7 +265,7 @@ void axone_call_mss_thermal_init(IStepError & io_istepError)
         else if (chipId == POWER_CHIPID::EXPLORER_16)
         {
             TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
-                  "SUCCESS running exp_thermalinit HWP on target HUID %.8X",
+                  "SUCCESS running exp_mss_thermal_init HWP on target HUID %.8X",
                   TARGETING::get_huid(l_ocmb_target));
         }
     } // end OCMB loop
@@ -274,7 +274,7 @@ void axone_call_mss_thermal_init(IStepError & io_istepError)
 void axone_call_mss_thermal_init(IStepError & io_istepError)
 {
     TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
-              "Error: Trying to call 'exp_thermal_init' but Axone code is not compiled in");
+              "Error: Trying to call 'exp_mss_thermal_init' but Axone code is not compiled in");
     assert(0, "Calling wrong Model's HWPs");
 }
 #endif
diff --git a/src/usr/isteps/istep14/makefile b/src/usr/isteps/istep14/makefile
index da5e51812..e34a2b5da 100644
--- a/src/usr/isteps/istep14/makefile
+++ b/src/usr/isteps/istep14/makefile
@@ -29,16 +29,19 @@ PROCEDURE_PATH = ${ROOTPATH}/src/import/chips/p9/procedures
 AXONE_PROCEDURE_PATH = ${ROOTPATH}/src/import/chips/p9a/procedures
 CEN_PROC_PATH = ${ROOTPATH}/src/import/chips/centaur/procedures
 EXP_COMMON_PATH = ${ROOTPATH}/src/import/chips/ocmb/explorer/common
+EXPLORER_HWP_PATH  = ${ROOTPATH}/src/import/chips/ocmb/explorer/procedures/hwp/memory/
 
 #Add all the extra include paths
 EXTRAINCDIR += ${ROOTPATH}/obj/genfiles/
+EXTRAINCDIR += ${ROOTPATH}/obj/genfiles/generic/memory/lib
+EXTRAINCDIR += ${ROOTPATH}/obj/genfiles/chips/ocmb/explorer/procedures/hwp/memory/lib/
+EXTRAINCDIR += ${ROOTPATH}/src/import/
 EXTRAINCDIR += ${ROOTPATH}/src/import/hwpf/fapi2/include
 EXTRAINCDIR += ${ROOTPATH}/src/include/usr/fapi2
 EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/utils
 EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/utils/imageProcs
 EXTRAINCDIR += ${ROOTPATH}/src/import/chips/common/utils/imageProcs
 EXTRAINCDIR += ${PROCEDURE_PATH}/hwp/nest
-EXTRAINCDIR += ${ROOTPATH}/src/import/
 EXTRAINCDIR += ${PROCEDURE_PATH}/hwp/memory
 EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/common/include/
 EXTRAINCDIR += ${PROCEDURE_PATH}/hwp/memory/lib/eff_config/
@@ -53,6 +56,7 @@ EXTRAINCDIR += ${EXP_COMMON_PATH}/include/
 EXTRAINCDIR += ${ROOTPATH}/src/import/chips/ocmb/explorer/procedures/hwp/memory
 EXTRAINCDIR += ${ROOTPATH}/src/import/chips/common/utils
 EXTRAINCDIR += ${AXONE_PROCEDURE_PATH}/hwp/memory/
+EXTRAINCDIR += ${EXPLORER_HWP_PATH}
 
 OBJS += call_mss_memdiag.o
 OBJS += call_mss_thermal_init.o
@@ -108,6 +112,9 @@ VPATH    += ${CEN_PROC_PATH}/hwp/memory/
 VPATH    += ${PROCEDURE_PATH}/hwp/memory/lib/dimm/ddr4/
 
 # Axone vs non-Axone specific HWP
+VPATH += $(if $(CONFIG_AXONE),${EXPLORER_HWP_PATH},)
 OBJS += $(if $(CONFIG_AXONE),p9a_throttle_sync.o,p9_throttle_sync.o)
+OBJS += $(if $(CONFIG_AXONE),exp_mss_thermal_init.o,)
 
 include ${ROOTPATH}/config.mk
+