diff options
| author | Andre Marin <aamarin@us.ibm.com> | 2017-03-06 15:31:18 -0600 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-07-26 00:27:20 -0400 |
| commit | 744e6f5bfad695271fa681d390dcc2c883b0e4b2 (patch) | |
| tree | 42c3d2ac59aaba82de19850349768311e8ae23e1 /src/import/chips | |
| parent | 7b5b072e03694fa9f9b72cfd761b8b384734541a (diff) | |
| download | talos-hostboot-744e6f5bfad695271fa681d390dcc2c883b0e4b2.tar.gz talos-hostboot-744e6f5bfad695271fa681d390dcc2c883b0e4b2.zip | |
Add pos API to be shared among controllers, move generic files to utils
Change-Id: I389399853347260fc479eda3f8a062e8958d25b3
Original-Change-Id: I7daedddf83c6a34f28417c97a28e78d88ec5c9af
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/37562
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Brian R. Silver <bsilver@us.ibm.com>
Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com>
Reviewed-by: LUCAS W. MULKEY <lwmulkey@us.ibm.com>
Reviewed-by: Louis Stermole <stermole@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/43534
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/import/chips')
6 files changed, 6 insertions, 8 deletions
diff --git a/src/import/chips/centaur/procedures/hwp/memory/01common.mk b/src/import/chips/centaur/procedures/hwp/memory/01common.mk index e4b824fe8..a86e718ca 100644 --- a/src/import/chips/centaur/procedures/hwp/memory/01common.mk +++ b/src/import/chips/centaur/procedures/hwp/memory/01common.mk @@ -23,7 +23,7 @@ # # IBM_PROLOG_END_TAG CEN_INCLUDES := $(GENPATH) -CEN_INCLUDES += $(ROOTPATH)/generic/memory +CEN_INCLUDES += $(ROOTPATH) CEN_INCLUDES += $(ROOTPATH)/chips/centaur/common/include CEN_INCLUDES += $(ROOTPATH)/chips/centaur/procedures/hwp/memory CEN_INCLUDES += $(ROOTPATH)/chips/centaur/procedures/hwp/memory/lib diff --git a/src/import/chips/centaur/procedures/hwp/memory/lib/cen.mk b/src/import/chips/centaur/procedures/hwp/memory/lib/cen.mk index 0819858e1..1c6d77f15 100644 --- a/src/import/chips/centaur/procedures/hwp/memory/lib/cen.mk +++ b/src/import/chips/centaur/procedures/hwp/memory/lib/cen.mk @@ -28,7 +28,6 @@ # # Add common and generated parts to object list. - MSS_PATH := $(ROOTPATH)/chips/centaur/procedures/hwp/memory/lib MSS_SOURCE := $(shell find $(MSS_PATH) -name '*.C' -exec basename {} \;) @@ -40,11 +39,10 @@ MSS_SOURCE_DIRS := $(shell find $(MSS_PATH) -type d) define MSS_MODULE_INCLUDES $(foreach dir, $(MSS_SOURCE_DIRS), $(call ADD_MODULE_SRCDIR,$(1),$(dir))) $(call ADD_MODULE_INCDIR,$(1),$(ROOTPATH)/chips/centaur/procedures/hwp/memory) -$(call ADD_MODULE_INCDIR,$(1),$(ROOTPATH)/generic/memory) $(call ADD_MODULE_INCDIR,$(1),$(FAPI2_PATH)/include) $(call ADD_MODULE_INCDIR,$(1),$(GENPATH)) -$(call ADD_MODULE_INCDIR,$(1),$(FAPI2_PATH)/include) $(call ADD_MODULE_INCDIR,$(1),$(FAPI2_PLAT_INCLUDE)) +$(call ADD_MODULE_INCDIR,$(1),$(ROOTPATH)) endef MODULE = cen OBJS += $(MSS_MODULE_OBJS) diff --git a/src/import/chips/centaur/procedures/hwp/memory/p9c_dimmBadDqBitmapFuncs.C b/src/import/chips/centaur/procedures/hwp/memory/p9c_dimmBadDqBitmapFuncs.C index d29ebf4d8..42fd91ec0 100755 --- a/src/import/chips/centaur/procedures/hwp/memory/p9c_dimmBadDqBitmapFuncs.C +++ b/src/import/chips/centaur/procedures/hwp/memory/p9c_dimmBadDqBitmapFuncs.C @@ -37,7 +37,7 @@ #include <p9c_dimmBadDqBitmapFuncs.H> #include <p9c_dimmBadDqBitmapAccessHwp.H> #include <string.h> -#include <c_str.H> +#include <generic/memory/lib/utils/c_str.H> extern "C" diff --git a/src/import/chips/centaur/procedures/hwp/memory/p9c_mss_ddr_phy_reset.C b/src/import/chips/centaur/procedures/hwp/memory/p9c_mss_ddr_phy_reset.C index efbf25d6f..8a3f88864 100644 --- a/src/import/chips/centaur/procedures/hwp/memory/p9c_mss_ddr_phy_reset.C +++ b/src/import/chips/centaur/procedures/hwp/memory/p9c_mss_ddr_phy_reset.C @@ -41,7 +41,7 @@ #include <p9c_mss_unmask_errors.H> #include <p9c_mss_slew.H> #include <p9c_dimmBadDqBitmapFuncs.H> -#include <c_str.H> +#include <generic/memory/lib/utils/c_str.H> #include <dimmConsts.H> enum phy diff --git a/src/import/chips/centaur/procedures/hwp/memory/tests/mss_example_ut.C b/src/import/chips/centaur/procedures/hwp/memory/tests/mss_example_ut.C index 510263af8..346023484 100644 --- a/src/import/chips/centaur/procedures/hwp/memory/tests/mss_example_ut.C +++ b/src/import/chips/centaur/procedures/hwp/memory/tests/mss_example_ut.C @@ -37,7 +37,7 @@ #include <fapi2.H> #include <catch.hpp> #include <target_fixture.H> -#include <c_str.H> +#include <generic/memory/lib/utils/c_str.H> using fapi2::TARGET_TYPE_MEMBUF_CHIP; using fapi2::TARGET_TYPE_MBA; diff --git a/src/import/chips/centaur/procedures/hwp/memory/tests/p9c_mss_ut.C b/src/import/chips/centaur/procedures/hwp/memory/tests/p9c_mss_ut.C index 6cfb0ce67..5cd7e32b1 100644 --- a/src/import/chips/centaur/procedures/hwp/memory/tests/p9c_mss_ut.C +++ b/src/import/chips/centaur/procedures/hwp/memory/tests/p9c_mss_ut.C @@ -48,7 +48,7 @@ #include <target_fixture.H> #include <mss_lab_tools.H> -#include <c_str.H> +#include <generic/memory/lib/utils/c_str.H> using fapi2::TARGET_TYPE_MEMBUF_CHIP; using fapi2::TARGET_TYPE_PROC_CHIP; |
