From aae922c1132fa71bd4ffb711296420755c7c0098 Mon Sep 17 00:00:00 2001 From: Andre Marin Date: Wed, 22 Mar 2017 23:04:12 -0500 Subject: Add base spd decoder to share among controllers Reorganized files and names to make room for DDR3 SPD decoder to be used for Cumulus. Change-Id: Id3e7a8f4bb60fd0ae0cdf36b8298a1d00257205a Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/36319 Tested-by: Jenkins Server Tested-by: Hostboot CI Reviewed-by: Brian R. Silver Reviewed-by: STEPHEN GLANCY Reviewed-by: Louis Stermole Reviewed-by: Jennifer A. Stofer Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/36326 Reviewed-by: Hostboot Team Tested-by: Jenkins OP Build CI Reviewed-by: Daniel M. Crowell --- src/usr/isteps/mss/makefile | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'src/usr/isteps/mss/makefile') diff --git a/src/usr/isteps/mss/makefile b/src/usr/isteps/mss/makefile index b605a6f53..9ad847c4a 100644 --- a/src/usr/isteps/mss/makefile +++ b/src/usr/isteps/mss/makefile @@ -31,9 +31,7 @@ EXTRAINCDIR += ${ROOTPATH}/src/import/hwpf/fapi2/include EXTRAINCDIR += ${ROOTPATH}/src/include/usr/fapi2/ EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/utils/ EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/utils/imageProcs/ -EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/common/include -EXTRAINCDIR += ${ROOTPATH}/src/import/generic/memory -EXTRAINCDIR += ${ROOTPATH}/src/import/ +EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/common/include/ MSS_LIB += ${PROCEDURES_PATH}/hwp/memory MSS_LIB += ${PROCEDURES_PATH}/hwp/memory/lib @@ -49,12 +47,12 @@ MSS_LIB += ${PROCEDURES_PATH}/hwp/memory/lib/mcbist/ MSS_LIB += ${PROCEDURES_PATH}/hwp/memory/lib/phy/ MSS_LIB += ${PROCEDURES_PATH}/hwp/memory/lib/power_thermal/ MSS_LIB += ${PROCEDURES_PATH}/hwp/memory/lib/spd/ -MSS_LIB += ${PROCEDURES_PATH}/hwp/memory/lib/spd/common/ -MSS_LIB += ${PROCEDURES_PATH}/hwp/memory/lib/spd/lrdimm/ -MSS_LIB += ${PROCEDURES_PATH}/hwp/memory/lib/spd/rdimm/ -MSS_LIB += ${PROCEDURES_PATH}/hwp/memory/lib/termination/ MSS_LIB += ${PROCEDURES_PATH}/hwp/memory/lib/utils/ MSS_LIB += ${PROCEDURES_PATH}/hwp/memory/lib/workarounds/ +MSS_LIB += ${ROOTPATH}/src/import/ +MSS_LIB += ${ROOTPATH}/src/import/generic/memory/lib/spd/lrdimm/ddr4/ +MSS_LIB += ${ROOTPATH}/src/import/generic/memory/lib/spd/rdimm/ddr4/ +MSS_LIB += ${ROOTPATH}/src/import/generic/memory/lib/spd/common/ddr4/ EXTRAINCDIR += ${MSS_LIB} @@ -64,6 +62,10 @@ MSS_PATH := $(PROCEDURES_PATH)/hwp/memory/lib MSS_SOURCE := $(shell find $(MSS_PATH) -name '*.C' -exec basename {} \;) MSS_MODULE_OBJS += $(patsubst %.C,%.o,$(MSS_SOURCE)) +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)) + MODULE = isteps_mss OBJS += $(MSS_MODULE_OBJS) $(call BUILD_MODULE) -- cgit v1.2.1