Revert the change in r19137.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19138 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/BaseTools/Source/C/Include/Common/BuildVersion.h b/BaseTools/Source/C/Include/Common/BuildVersion.h
index 8bfa741140221959efd446a91d32cad3db3a65cd..d5bc56cb873c18d734bbe06f4ec22f6a2584f713 100644 (file)
--- a/BaseTools/Source/C/Include/Common/BuildVersion.h
+++ b/BaseTools/Source/C/Include/Common/BuildVersion.h
@@ -12,4 +12,4 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 **/\r
 \r
-#define __BUILD_VERSION "Build 99862"\r
+#define __BUILD_VERSION ""\r

diff --git a/BaseTools/Source/Python/GenFds/Fv.py b/BaseTools/Source/Python/GenFds/Fv.py
index df97ccbab6484fd74d85b09c8429d11d26bd5055..163ccd37f1582a03a3056bae04e587801dfa51a7 100644 (file)
--- a/BaseTools/Source/Python/GenFds/Fv.py
+++ b/BaseTools/Source/Python/GenFds/Fv.py
@@ -181,33 +181,30 @@ class FV (FvClassObject):
         #\r
         # Write the Fv contents to Buffer\r
         #\r
-        if os.path.isfile(FvOutputFile):\r
-            FvFileObj = open ( FvOutputFile,'r+b')\r
+        FvFileObj = open ( FvOutputFile,'r+b')\r
 \r
-            GenFdsGlobalVariable.VerboseLogger( "\nGenerate %s FV Successfully" %self.UiFvName)\r
-            GenFdsGlobalVariable.SharpCounter = 0\r
+        GenFdsGlobalVariable.VerboseLogger( "\nGenerate %s FV Successfully" %self.UiFvName)\r
+        GenFdsGlobalVariable.SharpCounter = 0\r
 \r
-            Buffer.write(FvFileObj.read())\r
-            FvFileObj.seek(0)\r
-            # PI FvHeader is 0x48 byte\r
-            FvHeaderBuffer = FvFileObj.read(0x48)\r
-            # FV alignment position.\r
-            FvAlignmentValue = 1 << (ord (FvHeaderBuffer[0x2E]) & 0x1F)\r
-            # FvAlignmentValue is larger than or equal to 1K\r
-            if FvAlignmentValue >= 0x400:\r
-                if FvAlignmentValue >= 0x10000:\r
-                    #The max alignment supported by FFS is 64K.\r
-                    self.FvAlignment = "64K"\r
-                else:\r
-                    self.FvAlignment = str (FvAlignmentValue / 0x400) + "K"\r
+        Buffer.write(FvFileObj.read())\r
+        FvFileObj.seek(0)\r
+        # PI FvHeader is 0x48 byte\r
+        FvHeaderBuffer = FvFileObj.read(0x48)\r
+        # FV alignment position.\r
+        FvAlignmentValue = 1 << (ord (FvHeaderBuffer[0x2E]) & 0x1F)\r
+        # FvAlignmentValue is larger than or equal to 1K\r
+        if FvAlignmentValue >= 0x400:\r
+            if FvAlignmentValue >= 0x10000:\r
+                #The max alignment supported by FFS is 64K.\r
+                self.FvAlignment = "64K"\r
             else:\r
-                # FvAlignmentValue is less than 1K\r
-                self.FvAlignment = str (FvAlignmentValue)\r
-            FvFileObj.close()\r
-            GenFds.ImageBinDict[self.UiFvName.upper() + 'fv'] = FvOutputFile\r
-            GenFdsGlobalVariable.LargeFileInFvFlags.pop()\r
+                self.FvAlignment = str (FvAlignmentValue / 0x400) + "K"\r
         else:\r
-            GenFdsGlobalVariable.ErrorLogger("Failed to generate %s FV file." %self.UiFvName)\r
+            # FvAlignmentValue is less than 1K\r
+            self.FvAlignment = str (FvAlignmentValue)\r
+        FvFileObj.close()\r
+        GenFds.ImageBinDict[self.UiFvName.upper() + 'fv'] = FvOutputFile\r
+        GenFdsGlobalVariable.LargeFileInFvFlags.pop()\r
         return FvOutputFile\r
 \r
     ## _GetBlockSize()\r