From efb976fc64fc447d93015d3bb950431f341b6c19 Mon Sep 17 00:00:00 2001 From: Nick Bofferding Date: Tue, 8 Mar 2016 08:33:57 -0600 Subject: Support association between pervasive targets and other unit targets - Updated attribute compiler to link targets based on pervasive association - Updated attribute compiler to support virtual attributes - Added virtual attribute describing a unit's pervasive association - Updated Nimbus system XML with pervasive/unit associations - Fixed various errors compiling with debug trace enabled - Updated FSP attribute generator to create perv/unit links - Fixed FSP bad path character in attribute generator - Fixed PHB chip unit numbering in attribute generator - Replaced some NVBUS references with NV RTC: 148577 CMVC-Prereq: 988338 Change-Id: I6f3c4aa806e465dd9f09859c4911ff70db782a4f Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/21943 Tested-by: Jenkins Server Tested-by: FSP CI Jenkins Reviewed-by: Martin Gloff Reviewed-by: Christian R. Geddes Reviewed-by: Daniel M. Crowell --- src/usr/fapi2/test/fapi2TestUtils.C | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/usr/fapi2/test/fapi2TestUtils.C') diff --git a/src/usr/fapi2/test/fapi2TestUtils.C b/src/usr/fapi2/test/fapi2TestUtils.C index acf25eeb3..e3d07ec0e 100644 --- a/src/usr/fapi2/test/fapi2TestUtils.C +++ b/src/usr/fapi2/test/fapi2TestUtils.C @@ -45,7 +45,7 @@ #define NUM_MCBISTS 2 #define NUM_PECS 3 #define NUM_PHBS 6 -#define NUM_XBUS 1 +#define NUM_XBUS 2 #define NUM_OBUS 2 #define NUM_NV 2 #define NUM_PPES 21 @@ -195,7 +195,8 @@ void generateTargets(TARGETING::Target* i_pMasterProcChip, i_pMasterProcChip->tryGetAttr(l_epath); for(int i = 0; i < NUM_XBUS; i++) { - l_epath.addLast(TARGETING::TYPE_XBUS, i); + // Nimbus doesn't have the 0th xbus, so index from 1 for now + l_epath.addLast(TARGETING::TYPE_XBUS, i+1); if(TARGETING::targetService().toTarget(l_epath) != NULL) { o_targetList[MY_XBUS] = -- cgit v1.2.3