diff options
| author | Dan Crowell <dcrowell@us.ibm.com> | 2019-07-01 16:41:48 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2019-07-10 15:29:32 -0500 |
| commit | 80a0d27f8ab7e02643d69c1fcf9316963500b73e (patch) | |
| tree | 8609c87699f4ebf988e2653acfee8447c2e81401 /src/usr | |
| parent | c1030f009e8a439da8496ca58a0fe2ab0327e77b (diff) | |
| download | blackbird-hostboot-80a0d27f8ab7e02643d69c1fcf9316963500b73e.tar.gz blackbird-hostboot-80a0d27f8ab7e02643d69c1fcf9316963500b73e.zip | |
Fix NVDIMM linker errors caused by PRD
Removed extra object inclusion from the PRD runtime code and
added an additional CONFIG_NVDIMM check to the PRD code to avoid
some link errors that we saw when compiling in non-NVDIMM
configurations.
Change-Id: I84f8ce6b4ff0ec007ee0bdd419879683b3414aea
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/79872
Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com>
Reviewed-by: Brian J. Stegmiller <bjs@us.ibm.com>
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr')
| -rw-r--r-- | src/usr/diag/prdf/plat/prdfPlatServices_rt.C | 2 | ||||
| -rw-r--r-- | src/usr/diag/prdf/prdf_hb_only.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/usr/diag/prdf/plat/prdfPlatServices_rt.C b/src/usr/diag/prdf/plat/prdfPlatServices_rt.C index fc9128643..0751fb693 100644 --- a/src/usr/diag/prdf/plat/prdfPlatServices_rt.C +++ b/src/usr/diag/prdf/plat/prdfPlatServices_rt.C @@ -112,6 +112,7 @@ uint32_t nvdimmNotifyPhypProtChange( TARGETING::TargetHandle_t i_target, uint32_t o_rc = SUCCESS; +#ifdef CONFIG_NVDIMM errlHndl_t errl = NVDIMM::notifyNvdimmProtectionChange( i_target, i_state ); if ( nullptr != errl ) { @@ -120,6 +121,7 @@ uint32_t nvdimmNotifyPhypProtChange( TARGETING::TargetHandle_t i_target, PRDF_COMMIT_ERRL( errl, ERRL_ACTION_REPORT ); o_rc = FAIL; } +#endif return o_rc; diff --git a/src/usr/diag/prdf/prdf_hb_only.mk b/src/usr/diag/prdf/prdf_hb_only.mk index 50ecb42df..666171efa 100644 --- a/src/usr/diag/prdf/prdf_hb_only.mk +++ b/src/usr/diag/prdf/prdf_hb_only.mk @@ -134,8 +134,6 @@ prd_obj += prdfPlatServices_rt.o # nvdimm prd_vpath += ${ROOTPATH}/src/usr/isteps/nvdimm/ prd_vpath += ${ROOTPATH}/src/usr/isteps/nvdimm/runtime -prd_obj_no_sim += nvdimm.o -prd_obj_no_sim += nvdimm_rt.o endif |
