Move exp_inband to lib directory

Change-Id: If494c330ce20f6ec96ded6194d705e908198cf8b
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/81882
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@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: STEPHEN GLANCY <sglancy@us.ibm.com>
Reviewed-by: ANDRE A MARIN <aamarin@us.ibm.com>
Reviewed-by: Jennifer A Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/81886
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R Geddes <crgeddes@us.ibm.com>

7 files changed, 10 insertions, 6 deletions

diff --git a/src/usr/expaccess/expaccess.mk b/src/usr/expaccess/expaccess.mk
index 84835c522..34a56d0f6 100644
--- a/src/usr/expaccess/expaccess.mk
+++ b/src/usr/expaccess/expaccess.mk
@@ -22,6 +22,7 @@
 # permissions and limitations under the License.
 #
 # IBM_PROLOG_END_TAG
+
 EXTRAINCDIR += ${ROOTPATH}/src/import
 EXTRAINCDIR += ${ROOTPATH}/src/import/chips/ocmb/explorer/common/include/
 EXTRAINCDIR += ${ROOTPATH}/src/import/chips/ocmb/explorer/procedures/hwp/memory/
@@ -30,9 +31,11 @@ EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/ffdc/
 EXTRAINCDIR += ${ROOTPATH}/src/import/hwpf/fapi2/include
 EXTRAINCDIR += ${ROOTPATH}/src/include/usr/fapi2
 
+VPATH += ${ROOTPATH}/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/inband/
+
 # Need to build exp_indband to use EKB's getMMIO/putMMIO/getCMD/getRSP
 OBJS += exp_inband.o
 OBJS += expscom_trace.o
 OBJS += expscom_utils.o
 OBJS += i2cscomdd.o
-OBJS += mmioscomdd.o
\ No newline at end of file
+OBJS += mmioscomdd.o
diff --git a/src/usr/expaccess/mmioscomdd.C b/src/usr/expaccess/mmioscomdd.C
index bf4513158..00feb38d4 100644
--- a/src/usr/expaccess/mmioscomdd.C
+++ b/src/usr/expaccess/mmioscomdd.C
@@ -31,7 +31,7 @@
 /*****************************************************************************/
 // I n c l u d e s
 /*****************************************************************************/
-#include <exp_inband.H>              // mmio_get_scom
+#include <lib/inband/exp_inband.H>              // mmio_get_scom
 #include <lib/shared/exp_consts.H>   // IBM_SCOM_INDICATOR
 #include <hwpf/fapi2/include/fapi2_hwp_executor.H>// FAPI_EXEC_HWP
 #include "mmioscomdd.H"   //mmioScomPerformOp
diff --git a/src/usr/expaccess/test/ocmbcommtest.H b/src/usr/expaccess/test/ocmbcommtest.H
index f2718b6bb..8c75db298 100644
--- a/src/usr/expaccess/test/ocmbcommtest.H
+++ b/src/usr/expaccess/test/ocmbcommtest.H
@@ -35,7 +35,7 @@
 #include <fapi2.H>
 
 #include <plat_hwp_invoker.H>
-#include <exp_inband.H>
+#include <lib/inband/exp_inband.H>
 #include <exp_data_structs.H>
 #include <generic/memory/lib/utils/endian_utils.H>
 #include "exptest_utils.H"
diff --git a/src/usr/fapi2/test/p9_mmiotests.C b/src/usr/fapi2/test/p9_mmiotests.C
index 6a6d42bbf..1214e20fb 100644
--- a/src/usr/fapi2/test/p9_mmiotests.C
+++ b/src/usr/fapi2/test/p9_mmiotests.C
@@ -38,7 +38,7 @@
 
 
 // Write/Read from the inband response address (shouldn't hurt anything)
-//Constants from #include <exp_inband.H>
+// Constants from #include <lib/inband/exp_inband.H>
 static const uint64_t EXPLR_IB_MMIO_OFFSET   = 0x0000000100000000ull; // 4GB
 static const uint64_t EXPLR_IB_SRAM_BASE     = 0x01000000; // MSCCRNGE 01000000 020FFFFF
 static const uint64_t EXPLR_IB_RSP_SRAM_ADDR  = EXPLR_IB_SRAM_BASE | 0x03FF00;
diff --git a/src/usr/isteps/expupd/test/expupdatetest.H b/src/usr/isteps/expupd/test/expupdatetest.H
index 1cfc919a1..45c70cab2 100644
--- a/src/usr/isteps/expupd/test/expupdatetest.H
+++ b/src/usr/isteps/expupd/test/expupdatetest.H
@@ -37,7 +37,7 @@
 #include <errl/errlentry.H>
 #include <fapi2.H>
 #include <plat_hwp_invoker.H>
-#include <exp_inband.H>
+#include <lib/inband/exp_inband.H>
 #include <exp_data_structs.H>
 #include <exp_fw_update.H>
 #include <generic/memory/lib/utils/endian_utils.H>
diff --git a/src/usr/isteps/mss/makefile b/src/usr/isteps/mss/makefile
index f22ba50ec..51aece49d 100644
--- a/src/usr/isteps/mss/makefile
+++ b/src/usr/isteps/mss/makefile
@@ -83,6 +83,7 @@ MSS_LIB += ${EXPLORER_PROCEDURES_PATH}/hwp/memory/lib/freq/
 MSS_LIB += ${EXPLORER_PROCEDURES_PATH}/hwp/memory/lib/power_thermal/
 MSS_LIB += ${EXPLORER_PROCEDURES_PATH}/hwp/memory/lib/omi/
 MSS_LIB += ${EXPLORER_PROCEDURES_PATH}/hwp/memory/lib/i2c/
+MSS_LIB += ${EXPLORER_PROCEDURES_PATH}/hwp/memory/lib/inband/
 MSS_LIB += ${EXPLORER_PROCEDURES_PATH}/hwp/memory/lib/fir/
 MSS_LIB += ${EXPLORER_PROCEDURES_PATH}/hwp/memory/lib/mcbist/
 MSS_LIB += ${EXPLORER_PROCEDURES_PATH}/hwp/memory/lib/phy/
diff --git a/src/usr/mmio/mmio_explorer.C b/src/usr/mmio/mmio_explorer.C
index b86a7b88b..9565c8341 100644
--- a/src/usr/mmio/mmio_explorer.C
+++ b/src/usr/mmio/mmio_explorer.C
@@ -28,7 +28,7 @@
 #include <errl/errludtarget.H>
 #include <errl/errludlogregister.H>
 #include <explorer_scom_addresses.H>
-#include <exp_inband.H>
+#include <lib/inband/exp_inband.H>
 #include <mmio/mmio_reasoncodes.H>
 
 // Trace definition