Changes for P9 SBE - General clean-up

This story is for general clean-up after the SBE Update work.
It will be used to turn off unit test traces, make changes that
were deferred from prior reviews, finalize selection of best
cores and handling of cores for p9_xip_customize, and turn off
performUpdateActions() call in sbeupdatetest.

Change-Id: I04747bd3897d84a6b3c3c6c7791b28a0708842f9
RTC:161074
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/29955
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

1 files changed, 3 insertions, 9 deletions

diff --git a/src/usr/i2c/eepromdd.C b/src/usr/i2c/eepromdd.C
index 3a2808d93..5fb418ba4 100755
--- a/src/usr/i2c/eepromdd.C
+++ b/src/usr/i2c/eepromdd.C
@@ -65,8 +65,8 @@ trace_desc_t* g_trac_eepromr = NULL;
 TRAC_INIT( & g_trac_eepromr, "EEPROMR", KILOBYTE );
 
 // Easy macro replace for unit testing
-#define TRACUCOMP(args...)  TRACFCOMP(args) // @TODO RTC: 138226
-//#define TRACUCOMP(args...)
+//#define TRACUCOMP(args...)  TRACFCOMP(args)
+#define TRACUCOMP(args...)
 
 // ----------------------------------------------
 // Defines
@@ -575,7 +575,7 @@ errlHndl_t eepromRead ( TARGETING::Target * i_target,
                                                        l_pageTwoBuflen,
                                                        i_i2cInfo );
 
-       // Set addressing parameters
+        // Set addressing parameters
         err = eepromPrepareAddress( i_target,
                                     &byteAddr,
                                     byteAddrSize,
@@ -1091,15 +1091,11 @@ errlHndl_t eepromWrite ( TARGETING::Target * i_target,
                 l_originalPage = l_desiredPage;
             }
 
-
-            if(0 == total_bytes_written) { // @TODO RTC:138226
             TRACUCOMP(g_trac_eeprom,"eepromWrite() Loop: %d/%d/0x%X "
                 "writeBuflen=%d, offset=0x%X, bAS=%d, diffs=%d/%d",
                 i_i2cInfo.port, i_i2cInfo.engine, i_i2cInfo.devAddr,
                 l_writeBuflen, i_i2cInfo.offset, byteAddrSize,
                 data_left, diff_wps);
-            } // @TODO RTC:138226
-
 
             // Perform the requested write operation
             err = eepromWriteData( i_target,
@@ -1129,12 +1125,10 @@ errlHndl_t eepromWrite ( TARGETING::Target * i_target,
             // Update offset
             i_i2cInfo.offset += l_writeBuflen;
 
-            if(total_bytes_written >= io_buflen) { // @TODO RTC:138226
             TRACUCOMP(g_trac_eeprom,"eepromWrite() Loop End: "
                       "writeBuflen=%d, offset=0x%X, t_b_w=%d, io_buflen=%d",
                       l_writeBuflen, i_i2cInfo.offset,
                       total_bytes_written, io_buflen);
-            } // @TODO RTC:138226
         } // end of write for-loop
 
         // Release mutex lock