BMC: Fixes to enable ISDIMM support with live vpd

Change-Id: I914d2ad7b43e33f5e51bd1748284d60cf6dc3255
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14167
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

2 files changed, 9 insertions, 3 deletions

diff --git a/src/usr/hwpf/hwp/mc_config/makefile b/src/usr/hwpf/hwp/mc_config/makefile
index aa9c9f31e..07a8d838b 100644
--- a/src/usr/hwpf/hwp/mc_config/makefile
+++ b/src/usr/hwpf/hwp/mc_config/makefile
@@ -26,8 +26,8 @@ ROOTPATH = ../../../../..
 
 MODULE = mc_config
 
-CFLAGS += $(if $(CONFIG_PALMETTO_VDDR), -D FAPI_MSSLABONLY -D FAPI_LRDIMM)
-EXTRAINCDIR += $(if $(CONFIG_PALMETTO_VDDR), ${ROOTPATH}/src/usr/hwpf/hwp/dram_training/mss_draminit)
+CFLAGS += $(if $(CONFIG_VPD_GETMACRO_USE_EFF_ATTR), -D FAPI_MSSLABONLY -D FAPI_LRDIMM)
+EXTRAINCDIR += $(if $(CONFIG_VPD_GETMACRO_USE_EFF_ATTR), ${ROOTPATH}/src/usr/hwpf/hwp/dram_training/mss_draminit)
 
 ##      support for Targeting and fapi
 EXTRAINCDIR += ${ROOTPATH}/src/include/usr/ecmddatabuffer
diff --git a/src/usr/hwpf/hwp/mc_config/mss_eff_config/mss_eff_config.C b/src/usr/hwpf/hwp/mc_config/mss_eff_config/mss_eff_config.C
index 294054b78..fb8d2c78c 100644
--- a/src/usr/hwpf/hwp/mc_config/mss_eff_config/mss_eff_config.C
+++ b/src/usr/hwpf/hwp/mc_config/mss_eff_config/mss_eff_config.C
@@ -2315,6 +2315,12 @@ fapi::ReturnCode mss_eff_config(const fapi::Target i_target_mba)
         // Removed call to mss_eff_config_cke_map(), 
         //rc = mss_eff_config_cke_map(i_target_mba); if(rc) break;
 
+        // @fixme - this change is in v1.48 of the HWP
+        // @todo - RTC:117484 replace with v1.49 from ekb
+        // Removed call to mss_eff_config_termination() for Palmetto and
+        // Habanero using ifdef "FAPI_MSSLABONLY", moving to liveVPD.
+        // Note: Stradale, KG3, and DDR4 will still need ifdef "FAPI_MSSLABONLY"
+#ifdef FAPI_MSSLABONLY
         // If MSS Lab/Development override, for now everything except DDR3 CDIMMs
         if ((p_l_atts->eff_custom_dimm == fapi::ENUM_ATTR_EFF_CUSTOM_DIMM_NO) || (p_l_atts->eff_dram_gen == fapi::ENUM_ATTR_EFF_DRAM_GEN_DDR4)) {
            rc = mss_eff_config_termination(i_target_mba); if(rc) break;
@@ -2324,7 +2330,7 @@ fapi::ReturnCode mss_eff_config(const fapi::Target i_target_mba)
                break;
            }
         }
-
+#endif
         // Removed call to mss_eff_config_thermal(), it is now called externally.
         //rc = mss_eff_config_thermal(i_target_mba); if(rc) break;