diff options
| author | crgeddes <crgeddes@us.ibm.com> | 2016-03-09 12:28:56 -0600 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2016-03-15 11:48:27 -0400 |
| commit | ca02eade67e4f83fdf895a4e2e2c9404fc0a9006 (patch) | |
| tree | f1b59d49236391fffe20cc8dc5e0d54c8af6a82e /src/usr/fapi2 | |
| parent | c06595679e76988d9403ad62d8539bb1486dee6b (diff) | |
| download | talos-hostboot-ca02eade67e4f83fdf895a4e2e2c9404fc0a9006.tar.gz talos-hostboot-ca02eade67e4f83fdf895a4e2e2c9404fc0a9006.zip | |
Replace "NVBUS" with "NV" everywhere that we can
Change-Id: Ice2e298b5a7679976fbcb677c469d4d5fc27cb40
RTC: 147555
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/21870
Tested-by: Jenkins Server
Tested-by: FSP CI Jenkins
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Reviewed-by: Elizabeth K. Liner <eliner@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/fapi2')
| -rw-r--r-- | src/usr/fapi2/plat_utils.C | 2 | ||||
| -rw-r--r-- | src/usr/fapi2/test/fapi2HwpTest.C | 6 | ||||
| -rw-r--r-- | src/usr/fapi2/test/fapi2TestUtils.C | 10 | ||||
| -rw-r--r-- | src/usr/fapi2/test/fapi2TestUtils.H | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/usr/fapi2/plat_utils.C b/src/usr/fapi2/plat_utils.C index 152491ea9..c9f0a1d93 100644 --- a/src/usr/fapi2/plat_utils.C +++ b/src/usr/fapi2/plat_utils.C @@ -301,7 +301,7 @@ void xlateTargetType(const fapi2::TargetType i_targetType, break; case fapi2::TARGET_TYPE_NV: o_class = TARGETING::CLASS_UNIT; - o_type = TARGETING::TYPE_NVBUS; + o_type = TARGETING::TYPE_NV; break; case fapi2::TARGET_TYPE_SBE: o_class = TARGETING::CLASS_UNIT; diff --git a/src/usr/fapi2/test/fapi2HwpTest.C b/src/usr/fapi2/test/fapi2HwpTest.C index c90431ecb..d8fb23c0c 100644 --- a/src/usr/fapi2/test/fapi2HwpTest.C +++ b/src/usr/fapi2/test/fapi2HwpTest.C @@ -128,8 +128,8 @@ errlHndl_t fapi2HwpTest() targeting_targets[MY_XBUS]); fapi2::Target<fapi2::TARGET_TYPE_OBUS> fapi2_obusTarget( targeting_targets[MY_OBUS]); - fapi2::Target<fapi2::TARGET_TYPE_NV> fapi2_nvbusTarget( - targeting_targets[MY_NVBUS]); + fapi2::Target<fapi2::TARGET_TYPE_NV> fapi2_nvTarget( + targeting_targets[MY_NV]); fapi2::Target<fapi2::TARGET_TYPE_PPE> fapi2_ppeTarget(targeting_targets[MY_PPE]); fapi2::Target<fapi2::TARGET_TYPE_PERV> fapi2_pervTarget( targeting_targets[MY_PERV]); @@ -230,7 +230,7 @@ errlHndl_t fapi2HwpTest() TS_FAIL("Error occured in p9_sample_procedure_obus !!"); } numTests++; - FAPI_INVOKE_HWP(l_errl, p9_sample_procedure_nv, fapi2_nvbusTarget, scratchWriteValue); + FAPI_INVOKE_HWP(l_errl, p9_sample_procedure_nv, fapi2_nvTarget, scratchWriteValue); if(l_errl != NULL) { l_errl = NULL; diff --git a/src/usr/fapi2/test/fapi2TestUtils.C b/src/usr/fapi2/test/fapi2TestUtils.C index 896a94ba8..acf25eeb3 100644 --- a/src/usr/fapi2/test/fapi2TestUtils.C +++ b/src/usr/fapi2/test/fapi2TestUtils.C @@ -47,7 +47,7 @@ #define NUM_PHBS 6 #define NUM_XBUS 1 #define NUM_OBUS 2 -#define NUM_NVBUS 2 +#define NUM_NV 2 #define NUM_PPES 21 #define NUM_PERVS 55 #define NUM_CAPPS 2 @@ -225,14 +225,14 @@ void generateTargets(TARGETING::Target* i_pMasterProcChip, } } - //Setup NVBUS + //Setup NV i_pMasterProcChip->tryGetAttr<TARGETING::ATTR_PHYS_PATH>(l_epath); - for(int i = 0; i < NUM_NVBUS; i++) + for(int i = 0; i < NUM_NV; i++) { - l_epath.addLast(TARGETING::TYPE_NVBUS, i); + l_epath.addLast(TARGETING::TYPE_NV, i); if(TARGETING::targetService().toTarget(l_epath) != NULL) { - o_targetList[MY_NVBUS] = + o_targetList[MY_NV] = TARGETING::targetService().toTarget(l_epath); break; } diff --git a/src/usr/fapi2/test/fapi2TestUtils.H b/src/usr/fapi2/test/fapi2TestUtils.H index fa1ad1353..0a841d6a6 100644 --- a/src/usr/fapi2/test/fapi2TestUtils.H +++ b/src/usr/fapi2/test/fapi2TestUtils.H @@ -55,7 +55,7 @@ enum{ MY_PHB, MY_XBUS, MY_OBUS, - MY_NVBUS, + MY_NV, MY_PPE, MY_PERV, MY_CAPP, |
