Fixes Centaur training advanced to unmask errors when disabled

Change-Id: I928f5adf5963dbce409a9c5c34796a06f155631a
CQ:SW441346
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/64187
Dev-Ready: STEPHEN GLANCY <sglancy@us.ibm.com>
Reviewed-by: Louis Stermole <stermole@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/64192
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: Christian R. Geddes <crgeddes@us.ibm.com>

src/import/chips/centaur/procedures/hwp/memory/p9c_mss_draminit_training_advanced.C

@@ -193,7 +193,8 @@ fapi2::ReturnCode p9c_mss_draminit_training_advanced(const fapi2::Target<fapi2::
     // Skips training advanced completely if VREF cal control is disable
     if(vref_cal_control == fapi2::ENUM_ATTR_CEN_MSS_VREF_CAL_CNTL_DISABLE)
     {
-        FAPI_INF("%s has training advanced disabled, skipping it.", mss::c_str(i_target_mba));
+        FAPI_INF("%s has training advanced disabled. Only running unmask errors.", mss::c_str(i_target_mba));
+        FAPI_TRY(mss_unmask_draminit_training_advanced_errors(i_target_mba), "Unmask Function Failed");
         return fapi2::FAPI2_RC_SUCCESS;
     }
 

src/import/chips/centaur/procedures/hwp/memory/p9c_mss_draminit_training_advanced.mk

@@ -27,10 +27,10 @@
 -include 01common.mk
 PROCEDURE=p9c_mss_draminit_training_advanced
 $(eval $(call ADD_MEMORY_INCDIRS,$(PROCEDURE)))
-OBJS+=p9c_mss_mcbist.o
-OBJS+=p9c_mss_mcbist_common.o
-OBJS+=p9c_mss_mcbist_address.o
-OBJS+=p9c_mss_generic_shmoo.o
+lib${PROCEDURE}_DEPLIBS+=p9c_mss_mcbist
+lib${PROCEDURE}_DEPLIBS+=p9c_mss_mcbist_common
+lib${PROCEDURE}_DEPLIBS+=p9c_mss_mcbist_address
+lib${PROCEDURE}_DEPLIBS+=p9c_mss_generic_shmoo
 lib${PROCEDURE}_DEPLIBS+=p9c_dimmBadDqBitmapFuncs
 lib${PROCEDURE}_DEPLIBS+=p9c_mss_termination_control
 lib${PROCEDURE}_DEPLIBS+=p9c_mss_unmask_errors

src/usr/isteps/istep13/makefile

@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2015,2017
+# Contributors Listed Below - COPYRIGHT 2015,2018
 # [+] International Business Machines Corp.
 #
 #
@@ -99,6 +99,10 @@ include ${PROCEDURES_PATH}/hwp/memory/p9_mss_draminit_mc.mk
 include ${PROCEDURES_PATH}/hwp/memory/p9_mss_ddr_phy_reset.mk
 include ${PROCEDURES_PATH}/hwp/memory/p9_mss_draminit_training_adv.mk
 
+include ${CEN_PROCEDURES_PATH}/hwp/memory/p9c_mss_mcbist.mk
+include ${CEN_PROCEDURES_PATH}/hwp/memory/p9c_mss_mcbist_common.mk
+include ${CEN_PROCEDURES_PATH}/hwp/memory/p9c_mss_mcbist_address.mk
+include ${CEN_PROCEDURES_PATH}/hwp/memory/p9c_mss_generic_shmoo.mk
 include ${CEN_PROCEDURES_PATH}/hwp/memory/p9c_mss_draminit.mk
 include ${CEN_PROCEDURES_PATH}/hwp/memory/p9c_mss_draminit_mc.mk
 include ${CEN_PROCEDURES_PATH}/hwp/memory/p9c_mss_draminit_training.mk