diff --git a/tools/marvell/bin_hdr/src_ddr/ddr3libv2/h/Driver/ddr3/mvDdr3TrainingIpDef.h b/tools/marvell/bin_hdr/src_ddr/ddr3libv2/h/Driver/ddr3/mvDdr3TrainingIpDef.h
index be53af8..2746fad 100755
--- a/tools/marvell/bin_hdr/src_ddr/ddr3libv2/h/Driver/ddr3/mvDdr3TrainingIpDef.h
+++ b/tools/marvell/bin_hdr/src_ddr/ddr3libv2/h/Driver/ddr3/mvDdr3TrainingIpDef.h
@@ -46,6 +46,10 @@
 #include "common/siliconIf/mvSiliconIf.h"
 
 #if defined(CHX_FAMILY) || defined(EXMXPM_FAMILY)
+#define CPSS_BUILD
+#endif
+
+#if defined(CHX_FAMILY) || defined(EXMXPM_FAMILY)
 #define osMemCpy	hwsOsMemCopyFuncPtr
 #else
 #include <gtOs/gtOsMem.h>
diff --git a/tools/marvell/bin_hdr/src_ddr/ddr3libv2/h/Driver/ddr3/mvDdr3TrainingIpFlow.h b/tools/marvell/bin_hdr/src_ddr/ddr3libv2/h/Driver/ddr3/mvDdr3TrainingIpFlow.h
index 1ee2d93..0f7b5da 100755
--- a/tools/marvell/bin_hdr/src_ddr/ddr3libv2/h/Driver/ddr3/mvDdr3TrainingIpFlow.h
+++ b/tools/marvell/bin_hdr/src_ddr/ddr3libv2/h/Driver/ddr3/mvDdr3TrainingIpFlow.h
@@ -131,7 +131,7 @@
 #define  DISABLE_DDR_TUNING_DATA          (0x02294285)
 #define  ENABLE_DDR_TUNING_DATA           (0x12294285)
 
-#if !defined(CONFIG_BOBCAT2)
+#if !defined(CPSS_BUILD) && !defined(CONFIG_BOBCAT2)
 #define ODPG_TRAINING_STATUS_REG          (0x18488)
 #else
 #define ODPG_TRAINING_STATUS_REG          (0x1030)
@@ -205,7 +205,7 @@
 #define CS_ENABLE_REG                     (0x16D8)
 #define WR_LEVELING_DQS_PATTERN_REG       (0x16DC)
 
-#if !defined(CONFIG_BOBCAT2)
+#if !defined(CPSS_BUILD) && !defined(CONFIG_BOBCAT2)
 #define ODPG_BIST_DONE                    (0x186D4)
 #else
 #define ODPG_BIST_DONE                    (0x16FC)
@@ -214,7 +214,7 @@
 #define ODPG_BIST_DONE_BIT_VALUE_REV2          (1)
 #define ODPG_BIST_DONE_BIT_VALUE_REV3          (0)
 
-#if !defined(CONFIG_BOBCAT2)
+#if !defined(CPSS_BUILD) && !defined(CONFIG_BOBCAT2)
 #define RESULT_CONTROL_BYTE_PUP_0_REG     (0x1830)
 #define RESULT_CONTROL_BYTE_PUP_1_REG     (0x1834)
 #define RESULT_CONTROL_BYTE_PUP_2_REG     (0x1838)