I2C/EEPROM Fixes for Sprint 7 release

Change-Id: I11c2de66141a5e6fca4606fa4b451b9c44cf7c8b
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/528
Tested-by: Jenkins Server
Reviewed-by: Mark W. Wenning <wenning@us.ibm.com>
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

3 files changed, 15 insertions, 5 deletions

diff --git a/src/usr/i2c/eepromdd.C b/src/usr/i2c/eepromdd.C
index e57647d27..b046d109a 100755
--- a/src/usr/i2c/eepromdd.C
+++ b/src/usr/i2c/eepromdd.C
@@ -317,10 +317,6 @@ errlHndl_t eepromWrite ( TARGETING::Target * i_target,
         newBuffer = static_cast<uint8_t*>(malloc( newBufLen ));
         needFree = true;
 
-        TRACFCOMP( g_trac_eeprom,
-                   "OPIET: byteAddrSize: %d, io_buflen: %d, newBufLen: %d",
-                   byteAddrSize, io_buflen, newBufLen );
-
         // If we have an address to add to the buffer, do it now.
         // Add the byte address to the buffer
         memcpy( newBuffer, byteAddr, byteAddrSize );
diff --git a/src/usr/i2c/test/eepromddtest.H b/src/usr/i2c/test/eepromddtest.H
index 1cc815a57..11179afa9 100755
--- a/src/usr/i2c/test/eepromddtest.H
+++ b/src/usr/i2c/test/eepromddtest.H
@@ -80,6 +80,21 @@ class EEPROMTest: public CxxTest::TestSuite
 
             const uint32_t NUM_CMDS = sizeof(testData)/sizeof(testData[0]);
 
+            //@TODO
+            //@VBU workaround - Disable I2C test case on fake target
+            //Test case use fake targets, which will fail when running
+            //on VBU.  Need to fix this.
+            TARGETING::EntityPath syspath(TARGETING::EntityPath::PATH_PHYSICAL);
+            syspath.addLast(TARGETING::TYPE_SYS,0);
+            TARGETING::Target* sys = TARGETING::targetService().toTarget(syspath);
+            uint8_t vpo_mode = 0;
+            if( sys
+                && sys->tryGetAttr<TARGETING::ATTR_VPO_MODE>(vpo_mode)
+                && (vpo_mode == 1) )
+            {
+                return;
+            }
+
             do
             {
                 // Get a processor Target
diff --git a/src/usr/i2c/test/i2ctest.H b/src/usr/i2c/test/i2ctest.H
index f5ed88ca2..b71d45427 100755
--- a/src/usr/i2c/test/i2ctest.H
+++ b/src/usr/i2c/test/i2ctest.H
@@ -58,7 +58,6 @@ class I2CTest: public CxxTest::TestSuite
          */
         void testI2CReadWrite ( void )
         {
-            return;
             errlHndl_t err = NULL;
             int cmds = 0;
             int fails = 0;