Skip to content

Commit

Permalink
Compile new Axone/Explorer memory libs in isteps_mss library
Browse files Browse the repository at this point in the history
This commit will make isteps_mss.so contain the required libraries
for Axone and Explorer chips.

Change-Id: I14fee93aecce6d694c1360fbca2d6d24b982ab13
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/74695
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
  • Loading branch information
crgeddes committed Mar 21, 2019
1 parent ca02560 commit 0a0fe1f
Showing 1 changed file with 17 additions and 2 deletions.
19 changes: 17 additions & 2 deletions src/usr/isteps/mss/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@
# IBM_PROLOG_END_TAG
ROOTPATH = ../../../..

IMPORT_PATH = ${ROOTPATH}/src/import
PROCEDURES_PATH = ${IMPORT_PATH}/chips/p9/procedures
IMPORT_PATH = ${ROOTPATH}/src/import
PROCEDURES_PATH = ${IMPORT_PATH}/chips/p9/procedures
AXONE_PROCEDURES_PATH = ${IMPORT_PATH}/chips/p9a/procedures

#Add all the extra include paths
EXTRAINCDIR += ${ROOTPATH}/src/import/hwpf/fapi2/include
Expand All @@ -34,6 +35,9 @@ EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/utils/
EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/utils/imageProcs/
EXTRAINCDIR += ${ROOTPATH}/src/import/chips/common/utils/imageProcs/
EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/common/include/
EXTRAINCDIR += ${ROOTPATH}/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/
EXTRAINCDIR += ${ROOTPATH}/obj/genfiles/chips/ocmb/explorer/procedures/hwp/memory/lib/
EXTRAINCDIR += ${ROOTPATH}/obj/genfiles/generic/memory/lib/

MSS_LIB += ${PROCEDURES_PATH}/hwp/memory
MSS_LIB += ${PROCEDURES_PATH}/hwp/memory/lib
Expand Down Expand Up @@ -61,6 +65,10 @@ MSS_LIB += ${ROOTPATH}/src/import/generic/memory/lib/utils/
MSS_LIB += ${ROOTPATH}/src/import/generic/memory/lib/utils/shared/
MSS_LIB += ${ROOTPATH}/src/import/generic/memory/lib/utils/freq/
MSS_LIB += ${ROOTPATH}/src/import/generic/memory/lib/utils/mcbist/
MSS_LIB += ${AXONE_PROCEDURES_PATH}/hwp/memory/lib/utils/
MSS_LIB += ${AXONE_PROCEDURES_PATH}/hwp/memory/lib/eff_config/
MSS_LIB += ${AXONE_PROCEDURES_PATH}/hwp/memory/lib/freq/
MSS_LIB += ${AXONE_PROCEDURES_PATH}/hwp/memory

EXTRAINCDIR += ${MSS_LIB}

Expand Down Expand Up @@ -141,6 +149,13 @@ MSS_PATH_GENERIC_MEMORY := ${ROOTPATH}/src/import/generic/memory/lib
MSS_GENERIC_MEMORY_SOURCE := $(shell find $(MSS_PATH_GENERIC_MEMORY) -name '*.C' -exec basename {} \;)
MSS_MODULE_OBJS += $(patsubst %.C,%.o,$(MSS_GENERIC_MEMORY_SOURCE))

MSS_PATH_AXONE := $(AXONE_PROCEDURES_PATH)/hwp/memory/lib
MSS_AXONE_SOURCE := $(shell find $(MSS_PATH_AXONE) -name '*.C' -exec basename {} \;)
# TODO RTC:206774 remove when MSS team changes filename
MSS_AXONE_SOURCE := $(filter-out sync.o,$(MSS_AXONE_SOURCE))
MSS_MODULE_OBJS += $(patsubst %.C,%.o,$(MSS_AXONE_SOURCE))


MODULE = isteps_mss
OBJS += $(MSS_MODULE_OBJS)
$(call BUILD_MODULE)
Expand Down

0 comments on commit 0a0fe1f

Please sign in to comment.