Compile Explorer MSS libs in our istepsmss lib

We added P9A awhile back but forgot to add in the explorer libs.
Some of the MSS hwps are requiring these so we need to add them.
When we pulled this in it caused the HBI image for the Nimbus
and Cumulus standalone layouts to be too large. To get around this
we will not compile any Axone/Explorer HWP code in non-axone system
configurations.

Change-Id: I041f5f160a6e530995bbb1b350a1b2362704fbc8
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/75224
Reviewed-by: Matt Derksen <mderkse1@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Tested-by: Christian R. Geddes <crgeddes@us.ibm.com>

4 files changed, 24 insertions, 5 deletions

diff --git a/src/usr/isteps/istep12/call_dmi_io_run_training.C b/src/usr/isteps/istep12/call_dmi_io_run_training.C
index d1322482a..064a63a94 100644
--- a/src/usr/isteps/istep12/call_dmi_io_run_training.C
+++ b/src/usr/isteps/istep12/call_dmi_io_run_training.C
@@ -45,8 +45,11 @@
 
 //HWP
 #include    <p9_io_dmi_linktrain.H>
+
+#ifdef CONFIG_AXONE
 #include    <exp_omi_setup.H>
 #include    <exp_omi_train.H>
+#endif
 
 using   namespace   ISTEP;
 using   namespace   ISTEP_ERROR;
@@ -105,6 +108,7 @@ void* call_dmi_io_run_training (void *io_pArgs)
 
     }
 
+#ifdef CONFIG_AXONE
     TARGETING::TargetHandleList l_ocmbTargetList;
     getAllChips(l_ocmbTargetList, TYPE_OCMB_CHIP);
 
@@ -168,6 +172,7 @@ void* call_dmi_io_run_training (void *io_pArgs)
 
     }
 
+#endif
 
     TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_dmi_io_run_training exit" );
 
diff --git a/src/usr/isteps/istep12/call_dmi_post_trainadv.C b/src/usr/isteps/istep12/call_dmi_post_trainadv.C
index e5fc8b564..8f5e34106 100644
--- a/src/usr/isteps/istep12/call_dmi_post_trainadv.C
+++ b/src/usr/isteps/istep12/call_dmi_post_trainadv.C
@@ -45,7 +45,10 @@
 
 //HWP
 #include    <p9_io_dmi_post_trainadv.H>
+
+#ifdef CONFIG_AXONE
 #include    <p9a_omi_train_check.H>
+#endif
 
 using   namespace   ISTEP;
 using   namespace   ISTEP_ERROR;
@@ -125,6 +128,7 @@ void* call_dmi_post_trainadv (void *io_pArgs)
 
     }
 
+#ifdef CONFIG_AXONE
     // Find omi targets
     TARGETING::TargetHandleList l_omiTargetList;
     getAllChiplets(l_omiTargetList, TYPE_OMI);
@@ -162,7 +166,7 @@ void* call_dmi_post_trainadv (void *io_pArgs)
                        TARGETING::get_huid(l_omi_target));
         }
     }
-
+#endif
     TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_dmi_post_trainadv exit" );
 
     // end task, returning any errorlogs to IStepDisp
diff --git a/src/usr/isteps/istep12/call_dmi_pre_trainadv.C b/src/usr/isteps/istep12/call_dmi_pre_trainadv.C
index 4e127ef62..da8a9bb96 100644
--- a/src/usr/isteps/istep12/call_dmi_pre_trainadv.C
+++ b/src/usr/isteps/istep12/call_dmi_pre_trainadv.C
@@ -45,7 +45,9 @@
 
 //HWP
 #include    <p9_io_dmi_pre_trainadv.H>
+#ifdef CONFIG_AXONE
 #include    <p9a_omi_train.H>
+#endif
 
 using   namespace   ISTEP;
 using   namespace   ISTEP_ERROR;
@@ -125,6 +127,7 @@ void* call_dmi_pre_trainadv (void *io_pArgs)
 
     }
 
+#ifdef CONFIG_AXONE
     TARGETING::TargetHandleList l_omiTargetList;
     getAllChiplets(l_omiTargetList, TYPE_OMI);
 
@@ -164,6 +167,7 @@ void* call_dmi_pre_trainadv (void *io_pArgs)
                       "SUCCESS :  p9a_omi_train HWP on 0x%.08X", TARGETING::get_huid(l_omi_target));
         }
     }
+#endif
 
 
     TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_dmi_pre_trainadv exit" );
diff --git a/src/usr/isteps/istep12/makefile b/src/usr/isteps/istep12/makefile
index 8e0b37368..1908ae378 100644
--- a/src/usr/isteps/istep12/makefile
+++ b/src/usr/isteps/istep12/makefile
@@ -68,9 +68,6 @@ VPATH += $(P9_INITFILE_PATH)
 VPATH += $(CENT_MEM_HWP_PATH)
 VPATH += $(CENT_INITFILE_PATH)
 VPATH += $(CENT_IO_HWP_PATH)
-VPATH += ${P9A_MSS_HWP_PATH}
-VPATH += ${EXPLORER_HWP_PATH}
-VPATH += ${EXPLORER_OMI_HWP_PATH}
 VAPTH += ${ROOTPATH}/src/usr/fapi2
 
 OBJS += call_mss_getecid.o
@@ -95,7 +92,6 @@ OBJS+=p9c_mss_unmask_errors.o
 
 # HWP files we do not have .mks for
 
-OBJS+=exp_omi_utils.o
 
 #Required before all the <procedure>.mk are included
 include ${ROOTPATH}/procedure.rules.mk
@@ -119,10 +115,20 @@ include $(CENT_IO_HWP_PATH)/p9_io_cen_pdwn_lanes.mk
 include $(P9_IO_HWP_PATH)/p9_io_dmi_clear_firs.mk
 include $(CENT_INITFILE_PATH)/centaur_dmi_scom.mk
 include $(P9_IO_HWP_PATH)/p9_io_erepairAccessorHwpFuncs.mk
+
+
+ifdef CONFIG_AXONE_BRINGUP
+VPATH += ${P9A_MSS_HWP_PATH}
+VPATH += ${EXPLORER_HWP_PATH}
+VPATH += ${EXPLORER_OMI_HWP_PATH}
+
+OBJS+=exp_omi_utils.o
+
 include ${EXPLORER_HWP_PATH}/exp_omi_setup.mk
 include ${EXPLORER_HWP_PATH}/exp_omi_train.mk
 include ${P9A_MSS_HWP_PATH}/p9a_omi_train.mk
 include ${P9A_MSS_HWP_PATH}/p9a_omi_train_check.mk
+endif
 
 
 include ${ROOTPATH}/config.mk