diff options
| author | Ben Gass <bgass@us.ibm.com> | 2018-10-19 07:32:27 -0500 |
|---|---|---|
| committer | Christian R. Geddes <crgeddes@us.ibm.com> | 2019-04-04 09:25:38 -0500 |
| commit | b823dd50837a9f05cf69dc75d5942319f537024d (patch) | |
| tree | 7414d5b461004c3d475ba2cb0ed25bd11c5b71c6 /src/usr | |
| parent | e5622fb032dc8b23627d8ca06d82a10b612d5435 (diff) | |
| download | talos-hostboot-b823dd50837a9f05cf69dc75d5942319f537024d.tar.gz talos-hostboot-b823dd50837a9f05cf69dc75d5942319f537024d.zip | |
Update p9_mss_eff_grouping for Axone support
Add p9a_omi_setup_bars procedure
Add eclipse project files to .gitignore
Change-Id: Ia18cd213ac8b3682e5718b3c631dad631b97170f
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/67755
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: HWSV CI <hwsv-ci+hostboot@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://rchgit01.rchland.ibm.com/gerrit1/67764
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Tested-by: Christian R. Geddes <crgeddes@us.ibm.com>
Diffstat (limited to 'src/usr')
| -rw-r--r-- | src/usr/isteps/istep07/makefile | 4 | ||||
| -rw-r--r-- | src/usr/isteps/istep14/makefile | 2 | ||||
| -rw-r--r-- | src/usr/isteps/mss/makefile | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/src/usr/isteps/istep07/makefile b/src/usr/isteps/istep07/makefile index 06c4ad162..6a850a37a 100644 --- a/src/usr/isteps/istep07/makefile +++ b/src/usr/isteps/istep07/makefile @@ -36,6 +36,8 @@ HWP_PATH_EXP += ${ROOTPATH}/src/import/chips/ocmb/explorer/procedures/hwp/memory HWP_PATH += ${HWP_PATH_P9}/ ${HWP_PATH_CEN}/ ${HWP_PATH_P9A}/ ${HWP_PATH_EXP}/ +EXP_COMMON_PATH = ${ROOTPATH}/src/import/chips/ocmb/explorer/common + #Add all the object files required for istep07 module OBJS += call_mss_volt.o OBJS += call_mss_freq.o @@ -70,7 +72,7 @@ EXTRAINCDIR += ${HWP_PATH_CEN}/lib/shared/ EXTRAINCDIR += ${HWP_PATH_CEN}/lib/utils/ EXTRAINCDIR += ${HWP_PATH_EXP}/lib/eff_config/ EXTRAINCDIR += ${ROOTPATH}/obj/genfiles/chips/ocmb/explorer/procedures/hwp/memory/ - +EXTRAINCDIR += ${EXP_COMMON_PATH}/include/ VPATH += ${HWP_PATH} ${HWP_PATH_P9}/lib/spd VPATH += $(PROCEDURES_PATH)/hwp/nest ${ROOTPATH}/src/usr/fapi2 diff --git a/src/usr/isteps/istep14/makefile b/src/usr/isteps/istep14/makefile index 253ee9c38..ca7a68a5a 100644 --- a/src/usr/isteps/istep14/makefile +++ b/src/usr/isteps/istep14/makefile @@ -27,6 +27,7 @@ MODULE = istep14 PROCEDURE_PATH = ${ROOTPATH}/src/import/chips/p9/procedures CEN_PROC_PATH = ${ROOTPATH}/src/import/chips/centaur/procedures +EXP_COMMON_PATH = ${ROOTPATH}/src/import/chips/ocmb/explorer/common #Add all the extra include paths EXTRAINCDIR += ${ROOTPATH}/obj/genfiles/ @@ -47,6 +48,7 @@ EXTRAINCDIR += ${CEN_PROC_PATH}/hwp/memory EXTRAINCDIR += ${CEN_PROC_PATH}/hwp/memory/lib/shared/ EXTRAINCDIR += ${ROOTPATH}/src/import/chips/centaur/common/include/ EXTRAINCDIR += ${PROCEDURE_PATH}/hwp/memory/lib/dimm/ddr4/ +EXTRAINCDIR += ${EXP_COMMON_PATH}/include/ OBJS += call_mss_memdiag.o OBJS += call_mss_thermal_init.o diff --git a/src/usr/isteps/mss/makefile b/src/usr/isteps/mss/makefile index b72a84e4d..122905c34 100644 --- a/src/usr/isteps/mss/makefile +++ b/src/usr/isteps/mss/makefile @@ -195,6 +195,9 @@ MSS_EXPLORER_SOURCE := $(filter-out memdiags.C,$(MSS_EXPLORER_SOURCE)) MSS_EXPLORER_SOURCE := $(filter-out mcbist.C,$(MSS_EXPLORER_SOURCE)) MSS_EXPLORER_SOURCE := $(filter-out memory_size.C,$(MSS_EXPLORER_SOURCE)) MSS_MODULE_OBJS += $(patsubst %.C,%.o,$(MSS_EXPLORER_SOURCE)) +else +#must bring this in even in Nimbus/Cumulus builds because of p9_mss_grouping nest HWP +MSS_MODULE_OBJS += explorer_memory_size.o endif MODULE = isteps_mss OBJS += $(MSS_MODULE_OBJS) |
