From 2ccacdf494ec8ee562772dbc5c507ee791244373 Mon Sep 17 00:00:00 2001
From: Andre Marin <aamarin@us.ibm.com>
Date: Fri, 3 Feb 2017 04:00:10 -0600
Subject: [PATCH] Add c_str generic API and update makefiles

Change-Id: I0813cc538db01856d36f7a81fb51e08ab5203b60
Original-Change-Id: I95e3b9013d3ab0c352d3614c12ee4ef0d26965d0
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35924
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Louis Stermole <stermole@us.ibm.com>
Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Brian R. Silver <bsilver@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/37416
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Tested-by: Daniel M. Crowell <dcrowell@us.ibm.com>
---
 .../p9/procedures/hwp/memory/lib/dimm/ddr4/control_word_ddr4.H  | 2 +-
 .../p9/procedures/hwp/memory/lib/dimm/ddr4/data_buffer_ddr4.H   | 2 +-
 src/import/chips/p9/procedures/hwp/memory/lib/mc/xlate.H        | 2 +-
 src/import/chips/p9/procedures/hwp/memory/lib/spd/spd_factory.C | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/control_word_ddr4.H b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/control_word_ddr4.H
index a7ff192e0cd..c17322c0585 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/control_word_ddr4.H
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/control_word_ddr4.H
@@ -41,7 +41,7 @@
 
 #include <p9_mc_scom_addresses.H>
 
-#include <lib/utils/c_str.H>
+#include <c_str.H>
 #include <lib/ccs/ccs.H>
 
 namespace mss
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/data_buffer_ddr4.H b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/data_buffer_ddr4.H
index bbfd6b3f9ff..26b9403ddf6 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/data_buffer_ddr4.H
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ddr4/data_buffer_ddr4.H
@@ -38,7 +38,7 @@
 
 #include <vector>
 #include <fapi2.H>
-#include <lib/utils/c_str.H>
+#include <c_str.H>
 #include <lib/shared/mss_const.H>
 #include <lib/dimm/bcw_load_ddr4.H>
 #include <lib/phy/dp16.H>
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mc/xlate.H b/src/import/chips/p9/procedures/hwp/memory/lib/mc/xlate.H
index ab85bb6a650..1ae8905d0a2 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/mc/xlate.H
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/mc/xlate.H
@@ -43,7 +43,7 @@
 
 #include <lib/shared/mss_const.H>
 #include <lib/utils/scom.H>
-#include <lib/utils/c_str.H>
+#include <c_str.H>
 #include <lib/dimm/kind.H>
 
 namespace mss
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/spd/spd_factory.C b/src/import/chips/p9/procedures/hwp/memory/lib/spd/spd_factory.C
index 10dd37fbe5e..b8ddcb2a20b 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/spd/spd_factory.C
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/spd/spd_factory.C
@@ -47,7 +47,7 @@
 #include <lib/spd/rdimm/rdimm_raw_cards.H>
 #include <lib/spd/lrdimm/lrdimm_raw_cards.H>
 #include <lib/utils/checker.H>
-#include <lib/utils/c_str.H>
+#include <c_str.H>
 #include <lib/utils/conversions.H>
 #include <lib/utils/find.H>