SBE code restructure: Image directory setup

Change-Id: I6305135b930d12ab933e5ddfc946b047ebba3f49
RTC:159709
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/28902
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>

3 files changed, 7 insertions, 141 deletions

diff --git a/src/tools/utils/Debug/sbe-debug.py b/src/tools/utils/Debug/sbe-debug.py
deleted file mode 100755
index c955b266..00000000
--- a/src/tools/utils/Debug/sbe-debug.py
+++ /dev/null
@@ -1,136 +0,0 @@
-#!/usr/bin/python
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: src/tools/utils/Debug/sbe-debug.py $
-#
-# OpenPOWER sbe Project
-#
-# Contributors Listed Below - COPYRIGHT 2016
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-import os
-import subprocess
-import re
-import random
-import argparse
-import sys
-err = False
-
-syms = {};
-
-def fillSymTable(sbeObjDir):
-    symFile = sbeObjDir + "/sbe.syms"
-    f = open( symFile, 'r' )
-    for line in f:
-        words = line.split()
-        if( len( words ) == 4 ):
-            syms[words[3]] = [words[0], words[1]]
-
-def collectTrace( hwpBinDir, sbeObjDir, target, proc ):
-    cmd1 = ("."+hwpBinDir+"/p9_sbe_pibMemDump_wrap.exe " + \
-                          syms['g_pk_trace_buf'][0] +\
-                          " " + syms['g_pk_trace_buf'][1] + " " + target)
-    cmd2 = "." + "/ppe2fsp dumpPibMem sbetrace.bin "
-    cmd3 = ("." + "/fsp-trace -s " + sbeObjDir +\
-                         "/trexStringFile sbetrace.bin > "+\
-                         "sbe_"+str(proc)+"_tracMERG")
-    cmd4 = "mv dumpPibMem dumpPibMem_trace"
-    print "\ncollecting trace with commands -\n"
-    print "cmd1:", cmd1
-    rc = os.system( cmd1 )
-    if ( rc ):
-       print "ERROR running %s: %d " % ( cmd1, rc )
-       return 1
-
-    print "cmd2:", cmd2
-    rc = os.system( cmd2 )
-    if ( rc ):
-       print "ERROR running %s: %d " % ( cmd2, rc )
-       return 1
-
-    print "cmd3:", cmd3
-    rc = os.system( cmd3 )
-    if ( rc ):
-       print "ERROR running %s: %d " % ( cmd3, rc )
-       return 1
-
-    print "cmd4:", cmd4
-    rc = os.system( cmd4 )
-    if ( rc ):
-       print "ERROR running %s: %d " % ( cmd4, rc )
-       return 1
-
-def collectAttr( hwpBinDir, sbeObjDir, target, proc ):
-    cmd1 = ("."+hwpBinDir+"/p9_sbe_pibMemDump_wrap.exe " +\
-                         syms['G_sbe_attrs'][0] + " " + \
-                         syms['G_sbe_attrs'][1] + " " + target)
-    cmd2 = "mv dumpPibMem sbeAttr.bin"
-    cmd3 = ("."+ sbeObjDir + "/p9_xip_tool " +\
-                 sbeObjDir + "/sbe_seeprom.bin -ifs attrdump sbeAttr.bin > "+\
-                 "sbe_"+str(proc)+"_attrs")
-    print "\ncollecting attributes with commands -\n"
-    print "cmd1:", cmd1
-    rc = os.system( cmd1 )
-    if ( rc ):
-       print "ERROR running %s: %d " % ( cmd1, rc )
-       return 1
-
-    print "cmd2:", cmd2
-    rc = os.system( cmd2 )
-    if ( rc ):
-       print "ERROR running %s: %d " % ( cmd2, rc )
-       return 1
-
-    print "cmd3:", cmd3
-    rc = os.system( cmd3 )
-    if ( rc ):
-       print "ERROR running %s: %d " % ( cmd3, rc )
-       return 1
-
-def main( argv ):
-    parser = argparse.ArgumentParser( description = "SBE Dump Parser" )
-
-    parser.add_argument( '-hwpBinDir', type=str, default = os.getcwd(), \
-                                help = 'Path of p9_sbe_pibMemDump_wrap.exe')
-    parser.add_argument( '-sbeObjDir', type=str, default = os.getcwd(), \
-                                help = 'Path of sbe.syms file')
-    parser.add_argument( '-l', '--level', choices = ['all', 'trace', 'attr'],\
-                                default='all', help = 'Parser level' )
-    parser.add_argument( '-t', '--target', choices = ['AWAN', 'HW'], \
-                                required = 'true', help = 'Target type' )
-    parser.add_argument( '-p', '--proc', type=int , default = 0, \
-                                help = 'Proc Number' )
-
-    args = parser.parse_args()
-
-    if ( args.target == 'AWAN' ):
-        target = "1"
-    elif ( args.target == 'HW' ):
-        target = "0"
-
-    fillSymTable(args.sbeObjDir)
-    if ( args.level == 'all' ):
-        print "Parsing everything"
-        collectTrace( args.hwpBinDir, args.sbeObjDir, target, args.proc )
-        collectAttr( args.hwpBinDir, args.sbeObjDir, target, args.proc )
-    elif ( args.level == 'trace' ):
-        collectTrace( args.hwpBinDir, args.sbeObjDir, target, args.proc )
-    elif ( args.level == 'attr' ):
-        collectAttr( args.hwpBinDir, args.sbeObjDir, target, args.proc )
-
-if __name__ == "__main__":
-    main( sys.argv )
diff --git a/src/tools/utils/sbePatchUtility.py b/src/tools/utils/sbePatchUtility.py
index b651af3e..d5af8fa1 100644
--- a/src/tools/utils/sbePatchUtility.py
+++ b/src/tools/utils/sbePatchUtility.py
@@ -7,6 +7,7 @@
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2016
+# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -125,7 +126,7 @@ def utilExecuteShell(i_ppe_root, i_sandbox_path, i_shell_file):
         sb_name=os.path.basename(i_sandbox_path)
 
     # Find the file and execute
-    l_path_name = i_ppe_root + '/src/build/'
+    l_path_name = i_ppe_root + '/src'
     l_shell_path=utilcode.utilFindFile(i_shell_file, l_path_name)
     print "  [ %s ]"%l_shell_path
 
diff --git a/src/tools/utils/sbePrime.py b/src/tools/utils/sbePrime.py
index 0c94ee76..bfbd8ab1 100755
--- a/src/tools/utils/sbePrime.py
+++ b/src/tools/utils/sbePrime.py
@@ -7,6 +7,7 @@
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2016
+# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -189,11 +190,11 @@ def main():
         exit_main(errorcode.ERROR_SETTING)
     else:
         print "  Sandbox root path\t : ",sandbox_root
-    
+
     #---------------------------------------------
     # sim setup if user initiates
     #---------------------------------------------
-    if sim_patch != "None": 
+    if sim_patch != "None":
         #---------------------------------------------
         # Create sandbox for simics
         #---------------------------------------------
@@ -238,7 +239,7 @@ def main():
     #----------------------------------------
     # 4) Copy the files from repo to sandbox
     #----------------------------------------
-    # Find the files and copy to the sanbox dir 
+    # Find the files and copy to the sanbox dir
     # Just take a quick check if the Sandbox exist or not
     if sandbox_path != "None":
         if os.path.isdir(sandbox_path) == True:
@@ -269,7 +270,7 @@ def main():
         hook_file = utilcode.utilWriteShell_hooks(sandbox_path)
 
         #----------------------------------------
-        # 6) Compile the code 
+        # 6) Compile the code
         #----------------------------------------
         # Use the hook script to compile the code
         if sandbox_name == "None":