Make MURANO config work in Simics

This is work for Task 38048
-Updated bbuild to an 810 build with the latest Simics support
-Pulled support for Salerno from build tools
-Changed DEFAULT_MACHINE to MURANO
-Updated testcases to follow error logging guidelines
-Fixed up some FSI error handling bugs
-Disabled FSI loopback on VENICE (fix with Task 39187)
-Disabled a few testcases (see Impediment 39188)

Verified both MURANO and VENICE configurations

Change-Id: Ie7761f49c9e653489c8c4dad261b1c8852fa7548
RTC: 35596
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/791
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

2 files changed, 2 insertions, 2 deletions

diff --git a/src/usr/errl/test/errltest.H b/src/usr/errl/test/errltest.H
index 9fbc02fcc..2abca0d09 100644
--- a/src/usr/errl/test/errltest.H
+++ b/src/usr/errl/test/errltest.H
@@ -251,7 +251,7 @@ public:
 
 
             // Commit error log with different component ID.
-            errlCommit(l_err, FSI_COMP_ID);
+            errlCommit(l_err, CXXTEST_COMP_ID);
 
             // Make sure error log has been deleted by manager
             if (l_err != NULL)
diff --git a/src/usr/errl/test/errluserdetailtest.H b/src/usr/errl/test/errluserdetailtest.H
index 5ac4e9084..8fb1f3ed5 100644
--- a/src/usr/errl/test/errluserdetailtest.H
+++ b/src/usr/errl/test/errluserdetailtest.H
@@ -73,7 +73,7 @@ public:
         ErrlUserDetailsString(l_pString).addToLog(l_errl);
 
         // commit the errorlog
-        errlCommit(l_errl, HBERRL_COMP_ID);
+        errlCommit(l_errl, CXXTEST_COMP_ID);
     }
 
 };