summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorcrgeddes <crgeddes@us.ibm.com>2016-05-12 14:09:34 -0500
committerDaniel M. Crowell <dcrowell@us.ibm.com>2016-05-12 16:09:39 -0400
commita12d826bc761e365c0fc8eb203e6779535a6a1d3 (patch)
tree3a9f391c791194660dd6dd063729e5b010aba0af /src
parent5c508caa9c07c98dc802bbca55a5f41777cc5063 (diff)
downloadtalos-hostboot-a12d826bc761e365c0fc8eb203e6779535a6a1d3.tar.gz
talos-hostboot-a12d826bc761e365c0fc8eb203e6779535a6a1d3.zip
Temporarily disable building of poundv HWP in hostboot
In order to get an ekb commit through we need to deactivate this HWP from build in HB until the pending EKB changes have been mirrored and merged into HB. There should be a follow up commit with the same RTC following shortly after this commit Change-Id: I845b1e7c320f0cd7dca31c157ff82d3b55212803 RTC:153882 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/24472 Reviewed-by: Steven B. Janssen <janssens@us.ibm.com> Tested-by: Jenkins Server Reviewed-by: Matt K. Light <mklight@us.ibm.com> Tested-by: FSP CI Jenkins Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src')
-rw-r--r--src/usr/fapi2/attribute_service.C58
-rwxr-xr-xsrc/usr/fapi2/makefile2
-rw-r--r--src/usr/fapi2/test/makefile2
3 files changed, 31 insertions, 31 deletions
diff --git a/src/usr/fapi2/attribute_service.C b/src/usr/fapi2/attribute_service.C
index c45caafe2..3bcbcfd35 100644
--- a/src/usr/fapi2/attribute_service.C
+++ b/src/usr/fapi2/attribute_service.C
@@ -394,35 +394,35 @@ ReturnCode platGetFusedCoreMode(uint8_t & o_isFused)
//******************************************************************************
// fapi2::platAttrSvc::platGetPoundVBucketData function
//******************************************************************************
-ReturnCode platGetPoundVBucketData(const Target<TARGET_TYPE_EQ>& i_fapiTarget,
- uint8_t * o_poundVData)
-{
- fapi2::ReturnCode rc;
- if(i_fapiTarget.getType() != TARGET_TYPE_EQ)
- {
- /*@
- * @errortype ERRORLOG::ERRL_SEV_UNRECOVERABLE
- * @moduleid fapi2::MOD_FAPI2_MVPD_ACCESS
- * @reasoncode RC_INCORRECT_TARGET
- * @userdata1 Actual Target Type
- * @userdata2 Expected Target Type
- * @devdesc Attempted to read attribute from wrong target type
- * @custdesc Firmware Error
- */
- errlHndl_t l_errl = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
- MOD_FAPI2_MVPD_ACCESS,
- RC_INCORRECT_TARGET,
- i_fapiTarget.getType(),
- TARGET_TYPE_EQ,
- true);
- rc.setPlatDataPtr(reinterpret_cast<void *> (l_errl));
- }
- else
- {
- rc = p9_pm_get_poundv_bucket_attr(i_fapiTarget,o_poundVData);
- }
- return rc;
-}
+// ReturnCode platGetPoundVBucketData(const Target<TARGET_TYPE_EQ>& i_fapiTarget,
+// uint8_t * o_poundVData)
+// {
+// fapi2::ReturnCode rc;
+// if(i_fapiTarget.getType() != TARGET_TYPE_EQ)
+// {
+// /*@
+// * @errortype ERRORLOG::ERRL_SEV_UNRECOVERABLE
+// * @moduleid fapi2::MOD_FAPI2_MVPD_ACCESS
+// * @reasoncode RC_INCORRECT_TARGET
+// * @userdata1 Actual Target Type
+// * @userdata2 Expected Target Type
+// * @devdesc Attempted to read attribute from wrong target type
+// * @custdesc Firmware Error
+// */
+// errlHndl_t l_errl = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
+// MOD_FAPI2_MVPD_ACCESS,
+// RC_INCORRECT_TARGET,
+// i_fapiTarget.getType(),
+// TARGET_TYPE_EQ,
+// true);
+// rc.setPlatDataPtr(reinterpret_cast<void *> (l_errl));
+// }
+// else
+// {
+// rc = p9_pm_get_poundv_bucket_attr(i_fapiTarget,o_poundVData);
+// }
+// return rc;
+// }
diff --git a/src/usr/fapi2/makefile b/src/usr/fapi2/makefile
index ef4ee6d90..6ad102c76 100755
--- a/src/usr/fapi2/makefile
+++ b/src/usr/fapi2/makefile
@@ -48,7 +48,7 @@ include ${ROOTPATH}/src/import/tools/build/common.dir/script.rules.mk
include ${ROOTPATH}/src/import/hwpf/fapi2/tools/parseErrorInfo.mk
include ${ROOTPATH}/src/import/hwpf/fapi2/tools/parseAttributeInfo.mk
include ${ROOTPATH}/src/import/hwpf/fapi2/tools/createIfAttrService.mk
-include $(ROOTPATH)/src/import/chips/p9/procedures/hwp/pm/p9_pm_get_poundv_bucket.mk
+# include $(ROOTPATH)/src/import/chips/p9/procedures/hwp/pm/p9_pm_get_poundv_bucket.mk
include ${ROOTPATH}/config.mk
diff --git a/src/usr/fapi2/test/makefile b/src/usr/fapi2/test/makefile
index 472c748e4..e3c974eef 100644
--- a/src/usr/fapi2/test/makefile
+++ b/src/usr/fapi2/test/makefile
@@ -51,7 +51,7 @@ TESTS += fapi2GetChildrenTest.H
TESTS += fapi2BasicTryTest.H
TESTS += fapi2GetOtherEndTest.H
TESTS += fapi2SpdTestCxx.H
-TESTS += fapi2MvpdTestCxx.H
+# TESTS += fapi2MvpdTestCxx.H
include ${ROOTPATH}/config.mk
OpenPOWER on IntegriCloud