From bcbe74a0770581a51e827291d93201d0fd1f8251 Mon Sep 17 00:00:00 2001 From: Sachin Gupta Date: Wed, 31 May 2017 01:47:00 -0500 Subject: [PATCH] Enable tools to take fsp-trace from system path fsp-trace is not created as part of sbe build output. So will use system path for fsp-trace. It can be overridden by manually putting fsp-trace in sbe build output. Change-Id: Ia27de410f3c705e7fc9f6d0604977e0074849a46 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41154 Tested-by: Jenkins Server Reviewed-by: RAJA DAS Tested-by: FSP CI Jenkins Reviewed-by: Shakeeb A. Pasha B K Reviewed-by: Sachin Gupta --- src/tools/debug/sbe-debug.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/tools/debug/sbe-debug.py b/src/tools/debug/sbe-debug.py index db3b424ed..f4359b955 100755 --- a/src/tools/debug/sbe-debug.py +++ b/src/tools/debug/sbe-debug.py @@ -32,6 +32,7 @@ import binascii err = False +baseAddr = 0xfffe8000 syms = {}; if 'SBE_TOOLS_PATH' in os.environ: SBE_TOOLS_PATH = os.environ['SBE_TOOLS_PATH']; @@ -39,7 +40,12 @@ print "SBE_TOOLS_PATH not defined" exit(1) -baseAddr = 0xfffe8000 +def getTraceFilePath(): + fspTrace = SBE_TOOLS_PATH + "/fsp-trace" + if(not os.path.isfile(fspTrace)): + fspTrace = "fsp-trace" + return fspTrace + def fillSymTable(sbeObjDir, target, ddsuffix ): if (target == 'AWAN'): @@ -84,7 +90,7 @@ def collectTrace( sbeObjDir, target, node, proc, ddsuffix, file_path ): print "ERROR running %s: %d " % ( cmd1, rc ) return 1 cmd2 = sbeObjDir + "/ppe2fsp DumpPIBMEM sbetrace.bin " - cmd3 = (sbeObjDir + "/fsp-trace -s " + sbeObjDir +\ + cmd3 = (getTraceFilePath() + " -s " + sbeObjDir +\ "/sbeStringFile_"+ddsuffix+" sbetrace.bin > "+\ "sbe_"+str(proc)+"_tracMERG") cmd4 = "mv DumpPIBMEM dumpPibMem_trace" @@ -150,7 +156,8 @@ def forcedCollectTrace( sbeObjDir, target, node, proc, ddsuffix, file_path ): len = "0x1000" createPibmemDumpFile("DumpPIBMEM", offset, len); cmd2 = sbeObjDir + "/ppe2fsp DumpPIBMEM sbetrace.bin " - cmd3 = (sbeObjDir + "/fsp-trace -s " + sbeObjDir +\ + + cmd3 = (getTraceFilePath() + " -s " + sbeObjDir +\ "/sbeStringFile_"+ddsuffix+" sbetrace.bin > "+\ "sbe_"+str(proc)+"_tracMERG") cmd4 = "mv DumpPIBMEM dumpPibMem_trace"