diff options
| author | Brian Silver <bsilver@us.ibm.com> | 2014-05-28 16:10:05 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2014-06-27 14:47:45 -0500 |
| commit | 98d732a527edc1a422f0f185558a38505a68e74b (patch) | |
| tree | 39f80aab49ec8f60bb1acaf07ee1717ca4b9a7a7 /src/usr/scom/test | |
| parent | 98c223360ea9641fb1ab738b29c858869f5bf31d (diff) | |
| download | talos-hostboot-98d732a527edc1a422f0f185558a38505a68e74b.tar.gz talos-hostboot-98d732a527edc1a422f0f185558a38505a68e74b.zip | |
Add Naples support to the targeting infrastructure
Change-Id: I421e5a456a8d84a844f341e8c6fd462ad557e728
RTC: 107937
Depends-On: Ie748454257938103bdb76d7ac1b5d425bc97d348
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/11330
Tested-by: Jenkins Server
Reviewed-by: STEPHEN M. CPREK <smcprek@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/scom/test')
| -rw-r--r-- | src/usr/scom/test/scomtest.H | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/usr/scom/test/scomtest.H b/src/usr/scom/test/scomtest.H index f74a6b813..bbff268f8 100644 --- a/src/usr/scom/test/scomtest.H +++ b/src/usr/scom/test/scomtest.H @@ -1563,10 +1563,12 @@ public: continue; } // TODO: engd data for s1 supports XBUS1 only. - // For now check if murano chip and target is not XBUS1, then skip this target. + // For now check if murano or naples chip and target is not XBUS1, then skip this target. // Long term solution would be to change HWAS per RTC 45796. - else if ((scom_targets[myProc0]->getAttr<TARGETING::ATTR_MODEL>() == - TARGETING::MODEL_MURANO) && (x != 1)) + else if ( ((scom_targets[myProc0]->getAttr<TARGETING::ATTR_MODEL>() == + TARGETING::MODEL_MURANO) && (x != 1)) || + ((scom_targets[myProc0]->getAttr<TARGETING::ATTR_MODEL>() == + TARGETING::MODEL_NAPLES) && (x != 1)) ) { TRACDCOMP( g_trac_scom, "ScomTest::test_translate_scom_XBUS> Processor is Murano" " - skipping Target %d", x ); @@ -1620,8 +1622,10 @@ public: // TODO: engd data for s1 supports XBUS1 only. // For now check if murano chip and target is not XBUS1, then skip this target. // Long term solution would be to change HWAS per RTC 45796. - else if ((scom_targets[myProc0]->getAttr<TARGETING::ATTR_MODEL>() == - TARGETING::MODEL_MURANO) && (x != 1)) + else if ( ((scom_targets[myProc0]->getAttr<TARGETING::ATTR_MODEL>() == + TARGETING::MODEL_MURANO) && (x != 1)) || + ((scom_targets[myProc0]->getAttr<TARGETING::ATTR_MODEL>() == + TARGETING::MODEL_NAPLES) && (x != 1)) ) { TRACDCOMP( g_trac_scom, "ScomTest::test_TranslateScom_XBUS> Processor is Murano" " - skipping Target %d", x ); |
