diff options
| author | Andre Marin <aamarin@us.ibm.com> | 2017-06-11 21:32:04 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-08-18 10:52:03 -0400 |
| commit | d4c08be2b76339d60f098968bfe05f5a34a19c0b (patch) | |
| tree | 7172f0d5dd28238121bafd489be0618c46258b1c /src/usr | |
| parent | a6109ca9369683e80c2d3e20bd3e1435c594b25f (diff) | |
| download | talos-hostboot-d4c08be2b76339d60f098968bfe05f5a34a19c0b.tar.gz talos-hostboot-d4c08be2b76339d60f098968bfe05f5a34a19c0b.zip | |
Fix duplicate symbol error when linking mss and cen libs
Change-Id: I010b7fb2a7efbc5e9d2ec20206e82723514b631c
Original-Change-Id: Ib643f56d66f844d9ac59a86712622ed9f7453703
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41662
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-by: JACOB L. HARVEY <jlharvey@us.ibm.com>
Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com>
Reviewed-by: Richard J. Knight <rjknight@us.ibm.com>
Reviewed-by: Louis Stermole <stermole@us.ibm.com>
Reviewed-by: LUCAS W. MULKEY <lwmulkey@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/44371
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: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr')
| -rw-r--r-- | src/usr/diag/prdf/prdf_hb_only.mk | 6 | ||||
| -rw-r--r-- | src/usr/isteps/mss/makefile | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/usr/diag/prdf/prdf_hb_only.mk b/src/usr/diag/prdf/prdf_hb_only.mk index 82859c237..00d060f1f 100644 --- a/src/usr/diag/prdf/prdf_hb_only.mk +++ b/src/usr/diag/prdf/prdf_hb_only.mk @@ -65,6 +65,7 @@ prd_incpath += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/io/ prd_incpath += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/cache/ prd_incpath += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/perv/ prd_incpath += ${ROOTPATH}/src/import/chips/p9/procedures/utils/stopreg/ +prd_incpath += ${ROOTPATH}/src/import/generic/memory/lib/utils/ prd_incpath += ${ROOTPATH}/src/import/chips/p9/utils/imageProcs/ prd_incpath += ${ROOTPATH}/src/import/hwpf/fapi2/include prd_incpath += ${ROOTPATH}/src/import/ @@ -178,14 +179,15 @@ prd_vpath += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/memory/lib/dimm/ prd_vpath += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/memory/lib/eff_config/ prd_vpath += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/ prd_vpath += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/memory/lib/utils/ +prd_vpath += ${ROOTPATH}/src/import/generic/memory/lib/utils/ +prd_vpath += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/ prd_vpath += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/ -prd_obj_no_sim += pos.o +prd_obj_no_sim += c_str.o prd_obj_no_sim += mcbist.o prd_obj_no_sim += mcbist_workarounds.o prd_obj_no_sim += sim.o prd_obj_no_sim += rank.o -prd_obj_no_sim += c_str.o prd_obj_no_sim += memory_size.o prd_obj_no_sim += patterns.o diff --git a/src/usr/isteps/mss/makefile b/src/usr/isteps/mss/makefile index 9ad847c4a..0748f4a2c 100644 --- a/src/usr/isteps/mss/makefile +++ b/src/usr/isteps/mss/makefile @@ -53,6 +53,7 @@ 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/ +MSS_LIB += ${ROOTPATH}/src/import/generic/memory/lib/utils/ EXTRAINCDIR += ${MSS_LIB} |
