HWP: Update HWPs with latest good versions

The selection of HWPs to pull into Hostboot was due to either:
1/ Thi needed to pull into Hostboot build for VPO to match Cronus level.
2/ Mike saw that latest code in eKB is a trivial update to current reviewed
version (usually just adding the cvs version number)
These changes have all passed the "HWP Review"

RTC: 46573
Change-Id: I50031a19e5b4f7ad0531cd58df9ec24034207664
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/1499
Tested-by: Jenkins Server
Reviewed-by: Van H. Lee <vanlee@us.ibm.com>
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 3 insertions, 11 deletions

diff --git a/src/usr/hwpf/hwp/bus_training/io_run_training.C b/src/usr/hwpf/hwp/bus_training/io_run_training.C
index 55d79fe9c..222a4b818 100644
--- a/src/usr/hwpf/hwp/bus_training/io_run_training.C
+++ b/src/usr/hwpf/hwp/bus_training/io_run_training.C
@@ -77,28 +77,20 @@ ReturnCode io_run_training(const Target &master_target,const Target &slave_targe
           rc=init.isChipMaster(master_target,master_interface,master_group,is_master);
           if(rc.ok()){
                if(!is_master){
-                    //Swap master and slave targets !!
-                    FAPI_DBG("X Bus ..target swap performed");
-                    for(int i=0;i<5;++i){
-                     master_group=slave_group=i;
-                       FAPI_DBG("X Bus training for group %d",i);
+                     //Swap master and slave targets !!
+                     FAPI_DBG("X Bus ..target swap performed");
                      rc=init.run_training(slave_target,slave_interface,slave_group,master_target,master_interface,master_group);
                      //If one clock group cannot be trained.. bus cannot be used..so return rc to plat
                      if(!rc.ok()){
                          return(rc);
                      }
-                    }
-               }
+			   }
                else{
-                    for(int i=0;i<5;++i){
-                     master_group=slave_group=i;
-                     FAPI_DBG("X Bus training for group %d",i);
                      rc=init.run_training(master_target,master_interface,master_group,slave_target,slave_interface,slave_group);
                      //If one clock group cannot be trained.. bus cannot be used..so return rc to plat
                      if(!rc.ok()){
                          return(rc);
                      }
-                    }
                }
           }
      }