Change mss build to account for double free in wrappers

Change-Id: I5e12e328d31a1db63b82aa6014775b02e6afefe6
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/25785
Tested-by: Jenkins Server
Reviewed-by: Matt K. Light <mklight@us.ibm.com>
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Reviewed-by: ANDRE A. MARIN <aamarin@us.ibm.com>
Tested-by: Hostboot CI
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/25787
Tested-by: FSP CI Jenkins
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

20 files changed, 35 insertions, 39 deletions

diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/kind.H b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/kind.H
index caab668e9..3f68ce830 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/kind.H
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/kind.H
@@ -32,7 +32,7 @@
 
 #include <fapi2.H>
 
-#include <mss_attribute_accessors.H>
+#include <lib/mss_attribute_accessors.H>
 #include <lib/utils/c_str.H>
 
 namespace mss
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rank.H b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rank.H
index 03a3a2efb..94e252875 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rank.H
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rank.H
@@ -31,7 +31,7 @@
 #define _MSS_RANK_H_
 
 #include <fapi2.H>
-#include <mss_attribute_accessors.H>
+#include <lib/mss_attribute_accessors.H>
 
 namespace mss
 {
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/eff_config/eff_config.C b/src/import/chips/p9/procedures/hwp/memory/lib/eff_config/eff_config.C
index 72f23c995..4fda55370 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/eff_config/eff_config.C
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/eff_config/eff_config.C
@@ -28,8 +28,8 @@
 
 #include <fapi2.H>
 #include <mss.H>
-#include <eff_config/eff_config.H>
-#include <eff_config/timing.H>
+#include <lib/eff_config/eff_config.H>
+#include <lib/eff_config/timing.H>
 #include <lib/dimm/rank.H>
 #include <lib/utils/conversions.H>
 
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/eff_config/memory_size.C b/src/import/chips/p9/procedures/hwp/memory/lib/eff_config/memory_size.C
index 6f6d50995..101837a0e 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/eff_config/memory_size.C
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/eff_config/memory_size.C
@@ -28,7 +28,7 @@
 // *HWP Consumed by: HB:FSP
 
 #include <fapi2.H>
-#include <mss_attribute_accessors.H>
+#include <lib/mss_attribute_accessors.H>
 
 #include <lib/shared/mss_const.H>
 #include <lib/eff_config/memory_size.H>
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/freq/cas_latency.C b/src/import/chips/p9/procedures/hwp/memory/lib/freq/cas_latency.C
index 62d782971..e1e2889aa 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/freq/cas_latency.C
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/freq/cas_latency.C
@@ -32,8 +32,8 @@
 
 #include <fapi2.H>
 #include <mss.H>
-#include <freq/cas_latency.H>
-#include <freq/cycle_time.H>
+#include <lib/freq/cas_latency.H>
+#include <lib/freq/cycle_time.H>
 #include <lib/utils/conversions.H>
 #include <lib/utils/fake_spd.H>
 #include <lib/eff_config/timing.H>
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/freq/cas_latency.H b/src/import/chips/p9/procedures/hwp/memory/lib/freq/cas_latency.H
index 5a8054fbe..13ed5680f 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/freq/cas_latency.H
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/freq/cas_latency.H
@@ -35,7 +35,7 @@
 #include <cstdint>
 
 #include <fapi2.H>
-#include <spd/spd_decoder.H>
+#include <lib/spd/spd_decoder.H>
 
 namespace mss
 {
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/freq/sync.C b/src/import/chips/p9/procedures/hwp/memory/lib/freq/sync.C
index f3f1a3002..299cb4526 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/freq/sync.C
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/freq/sync.C
@@ -31,7 +31,7 @@
 
 #include <fapi2.H>
 #include <mss.H>
-#include <freq/sync.H>
+#include <lib/freq/sync.H>
 #include <lib/utils/find.H>
 
 using fapi2::TARGET_TYPE_DIMM;
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mc/mc.H b/src/import/chips/p9/procedures/hwp/memory/lib/mc/mc.H
index ac52592f6..883e1afc4 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/mc/mc.H
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/mc/mc.H
@@ -34,7 +34,7 @@
 
 #include <p9_mc_scom_addresses.H>
 #include <p9_mc_scom_addresses_fld.H>
-#include <mss_attribute_accessors.H>
+#include <lib/mss_attribute_accessors.H>
 #include <lib/utils/scom.H>
 
 namespace mss
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mc/xlate.C b/src/import/chips/p9/procedures/hwp/memory/lib/mc/xlate.C
index a08ca3b09..0b869a79b 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/mc/xlate.C
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/mc/xlate.C
@@ -32,7 +32,7 @@
 #include <p9_mc_scom_addresses.H>
 #include <p9_mc_scom_addresses_fld.H>
 
-#include <mss_attribute_accessors.H>
+#include <lib/mss_attribute_accessors.H>
 
 #include <lib/mc/mc.H>
 #include <lib/utils/scom.H>
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/apb.C b/src/import/chips/p9/procedures/hwp/memory/lib/phy/apb.C
index f412c623a..e201d1e57 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/apb.C
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/apb.C
@@ -28,7 +28,7 @@
 // *HWP Consumed by: FSP:HB
 
 #include <fapi2.H>
-#include <phy/apb.H>
+#include <lib/phy/apb.H>
 #include <lib/utils/scom.H>
 #include <lib/utils/c_str.H>
 #include <lib/utils/index.H>
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/ddr_phy.C b/src/import/chips/p9/procedures/hwp/memory/lib/phy/ddr_phy.C
index ad0e9eb13..970b14498 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/ddr_phy.C
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/ddr_phy.C
@@ -33,14 +33,14 @@
 #include <fapi2.H>
 #include <mss.H>
 
-#include <phy/ddr_phy.H>
-#include <phy/read_cntrl.H>
-#include <phy/phy_cntrl.H>
-#include <phy/apb.H>
-
-#include <utils/bit_count.H>
-#include <utils/dump_regs.H>
-#include <utils/scom.H>
+#include <lib/phy/ddr_phy.H>
+#include <lib/phy/read_cntrl.H>
+#include <lib/phy/phy_cntrl.H>
+#include <lib/phy/apb.H>
+
+#include <lib/utils/bit_count.H>
+#include <lib/utils/dump_regs.H>
+#include <lib/utils/scom.H>
 
 using fapi2::TARGET_TYPE_MCBIST;
 using fapi2::TARGET_TYPE_PROC_CHIP;
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/ddr_phy.H b/src/import/chips/p9/procedures/hwp/memory/lib/phy/ddr_phy.H
index ddc67d603..b08eac138 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/ddr_phy.H
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/ddr_phy.H
@@ -31,7 +31,7 @@
 #define _MSS_DDR_PHY_H_
 
 #include <fapi2.H>
-#include <mss_attribute_accessors.H>
+#include <lib/mss_attribute_accessors.H>
 
 // Helper macro to condense the checking for PLL lock
 #define CHECK_PLL( __target, __register, __buffer, __mask )             \
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/dp16.C b/src/import/chips/p9/procedures/hwp/memory/lib/phy/dp16.C
index c3687e030..180631291 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/dp16.C
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/dp16.C
@@ -33,14 +33,14 @@
 
 #include <p9_mc_scom_addresses.H>
 #include <p9_mc_scom_addresses_fld.H>
-#include <mss_attribute_accessors.H>
+#include <lib/mss_attribute_accessors.H>
 
-#include <phy/dp16.H>
-#include <phy/write_cntrl.H>
+#include <lib/phy/dp16.H>
+#include <lib/phy/write_cntrl.H>
 
-#include <utils/scom.H>
-#include <utils/pos.H>
-#include <utils/c_str.H>
+#include <lib/utils/scom.H>
+#include <lib/utils/pos.H>
+#include <lib/utils/c_str.H>
 
 using fapi2::TARGET_TYPE_MCA;
 using fapi2::TARGET_TYPE_MCBIST;
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/spd/spd_decoder.C b/src/import/chips/p9/procedures/hwp/memory/lib/spd/spd_decoder.C
index ff284537f..03ef676a1 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/spd/spd_decoder.C
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/spd/spd_decoder.C
@@ -33,9 +33,9 @@
 #include <fapi2.H>
 #include <mss.H>
 #include <lib/spd/spd_decoder.H>
-#include <utils/conversions.H>
-#include <utils/find.H>
-#include <utils/fake_spd.H>
+#include <lib/utils/conversions.H>
+#include <lib/utils/find.H>
+#include <lib/utils/fake_spd.H>
 
 using fapi2::TARGET_TYPE_MCBIST;
 using fapi2::TARGET_TYPE_MCA;
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/utils/c_str.C b/src/import/chips/p9/procedures/hwp/memory/lib/utils/c_str.C
index 9360c2e11..51cc03415 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/utils/c_str.C
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/utils/c_str.C
@@ -28,7 +28,7 @@
 // *HWP Consumed by: HB:FSP
 
 #include <fapi2.H>
-#include <mss_attribute_accessors.H>
+#include <lib/mss_attribute_accessors.H>
 #include <lib/utils/c_str.H>
 
 using fapi2::TARGET_TYPE_MCBIST;
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mss.H b/src/import/chips/p9/procedures/hwp/memory/mss.H
index 0925b4daf..7682f20b3 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/mss.H
+++ b/src/import/chips/p9/procedures/hwp/memory/mss.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: chips/p9/procedures/hwp/memory/lib/mss.H $                    */
+/* $Source: chips/p9/procedures/hwp/memory/mss.H $                        */
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
diff --git a/src/import/chips/p9/procedures/hwp/memory/p9_mss_draminit_training.mk b/src/import/chips/p9/procedures/hwp/memory/p9_mss_draminit_training.mk
index 23336582f..e9b87a202 100644
--- a/src/import/chips/p9/procedures/hwp/memory/p9_mss_draminit_training.mk
+++ b/src/import/chips/p9/procedures/hwp/memory/p9_mss_draminit_training.mk
@@ -7,7 +7,7 @@
 #
 # EKB Project
 #
-# COPYRIGHT 2015
+# COPYRIGHT 2015,2016
 # [+] International Business Machines Corp.
 #
 #
@@ -22,5 +22,4 @@
 
 PROCEDURE=p9_mss_draminit_training
 $(eval $(call ADD_MEMORY_INCDIRS,$(PROCEDURE)))
-lib$(PROCEDURE)_DEPLIBS+=mss
 $(call BUILD_PROCEDURE)
diff --git a/src/import/chips/p9/procedures/hwp/memory/p9_mss_freq.mk b/src/import/chips/p9/procedures/hwp/memory/p9_mss_freq.mk
index 5681e6b64..d74bacb7b 100644
--- a/src/import/chips/p9/procedures/hwp/memory/p9_mss_freq.mk
+++ b/src/import/chips/p9/procedures/hwp/memory/p9_mss_freq.mk
@@ -7,7 +7,7 @@
 #
 # EKB Project
 #
-# COPYRIGHT 2015
+# COPYRIGHT 2015,2016
 # [+] International Business Machines Corp.
 #
 #
@@ -22,5 +22,4 @@
 
 PROCEDURE=p9_mss_freq
 $(eval $(call ADD_MEMORY_INCDIRS,$(PROCEDURE)))
-lib$(PROCEDURE)_DEPLIBS+=mss
 $(call BUILD_PROCEDURE)
diff --git a/src/import/chips/p9/procedures/hwp/memory/p9_mss_freq_system.mk b/src/import/chips/p9/procedures/hwp/memory/p9_mss_freq_system.mk
index aaba7a88c..cb3cfcb3d 100644
--- a/src/import/chips/p9/procedures/hwp/memory/p9_mss_freq_system.mk
+++ b/src/import/chips/p9/procedures/hwp/memory/p9_mss_freq_system.mk
@@ -22,5 +22,4 @@
 
 PROCEDURE=p9_mss_freq_system
 $(eval $(call ADD_MEMORY_INCDIRS,$(PROCEDURE)))
-lib$(PROCEDURE)_DEPLIBS+=mss
 $(call BUILD_PROCEDURE)
diff --git a/src/import/chips/p9/procedures/hwp/memory/p9_mss_volt.mk b/src/import/chips/p9/procedures/hwp/memory/p9_mss_volt.mk
index c668a7cc7..c69894d32 100644
--- a/src/import/chips/p9/procedures/hwp/memory/p9_mss_volt.mk
+++ b/src/import/chips/p9/procedures/hwp/memory/p9_mss_volt.mk
@@ -7,7 +7,7 @@
 #
 # EKB Project
 #
-# COPYRIGHT 2015
+# COPYRIGHT 2015,2016
 # [+] International Business Machines Corp.
 #
 #
@@ -22,5 +22,4 @@
 
 PROCEDURE=p9_mss_volt
 $(eval $(call ADD_MEMORY_INCDIRS,$(PROCEDURE)))
-lib$(PROCEDURE)_DEPLIBS+=mss
 $(call BUILD_PROCEDURE)