Sync EDKII BaseTools to BaseTools project r2065.

[mirror_edk2.git] / BaseTools / Source / Python / Common / VpdInfoFile.py

diff --git a/BaseTools/Source/Python/Common/VpdInfoFile.py b/BaseTools/Source/Python/Common/VpdInfoFile.py
index 0111744cc045cc6c1a344f24ac28d82494315348..5f92fa5cdda6f6b970b183f0605a75c0d898691a 100644 (file)
--- a/BaseTools/Source/Python/Common/VpdInfoFile.py
+++ b/BaseTools/Source/Python/Common/VpdInfoFile.py
@@ -219,28 +219,23 @@ class VpdInfoFile:
 #  @param ToolPath      The string path name for BPDG tool\r
 #  @param VpdFileName   The string path name for VPD information guid.txt\r
 # \r
-def CallExtenalBPDGTool(ToolPath, VpdFilePath, VpdFileName):\r
+def CallExtenalBPDGTool(ToolPath, VpdFileName):\r
     assert ToolPath != None, "Invalid parameter ToolPath"\r
-    assert VpdFilePath != None and os.path.exists(VpdFilePath), "Invalid parameter VpdFileName"\r
+    assert VpdFileName != None and os.path.exists(VpdFileName), "Invalid parameter VpdFileName"\r
     \r
-    OutputDir = os.path.dirname(VpdFilePath)\r
-    if (VpdFileName == None or VpdFileName == "") :\r
-        FileName = os.path.basename(VpdFilePath)\r
-        BaseName, ext = os.path.splitext(FileName)\r
-        OutputMapFileName = os.path.join(OutputDir, "%s.map" % BaseName)\r
-        OutputBinFileName = os.path.join(OutputDir, "%s.bin" % BaseName)\r
-    else :\r
-        OutputMapFileName = os.path.join(OutputDir, "%s.map" % VpdFileName)\r
-        OutputBinFileName = os.path.join(OutputDir, "%s.bin" % VpdFileName)\r
+    OutputDir = os.path.dirname(VpdFileName)\r
+    FileName = os.path.basename(VpdFileName)\r
+    BaseName, ext = os.path.splitext(FileName)\r
+    OutputMapFileName = os.path.join(OutputDir, "%s.map" % BaseName)\r
+    OutputBinFileName = os.path.join(OutputDir, "%s.bin" % BaseName)\r
           \r
     try:\r
         PopenObject = subprocess.Popen([ToolPath,\r
                                         '-o', OutputBinFileName, \r
                                         '-m', OutputMapFileName,\r
-                                        '-s',\r
+                                        '-q',\r
                                         '-f',\r
-                                        '-v',\r
-                                        VpdFilePath],\r
+                                        VpdFileName],\r
                                         stdout=subprocess.PIPE, \r
                                         stderr= subprocess.PIPE)\r
     except Exception, X:\r