Sync EDKII BaseTools to BaseTools project r1940

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10307 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/BaseTools/Bin/Win32/BootSectImage.exe b/BaseTools/Bin/Win32/BootSectImage.exe
index c5f336a997936465943022ade0a27f2f176b3828..535a8dc23903fc59db8de834208310394b4bcf39 100755 (executable)
Binary files a/BaseTools/Bin/Win32/BootSectImage.exe and b/BaseTools/Bin/Win32/BootSectImage.exe differ

diff --git a/BaseTools/Bin/Win32/EfiLdrImage.exe b/BaseTools/Bin/Win32/EfiLdrImage.exe
index da82f6eb98fba596251d6fc674c3f6e9d885fd5c..9eee3ff62f90f6ff258510ec7236aab3bcf60334 100755 (executable)
Binary files a/BaseTools/Bin/Win32/EfiLdrImage.exe and b/BaseTools/Bin/Win32/EfiLdrImage.exe differ

diff --git a/BaseTools/Bin/Win32/EfiRom.exe b/BaseTools/Bin/Win32/EfiRom.exe
index 0c39df46e3649bb552aeae720f64af85367dad67..aa9790df50e715bc7edd9ef4c53d21911a3fb893 100755 (executable)
Binary files a/BaseTools/Bin/Win32/EfiRom.exe and b/BaseTools/Bin/Win32/EfiRom.exe differ

diff --git a/BaseTools/Bin/Win32/Eot.EfiCompressor.pyd b/BaseTools/Bin/Win32/Eot.EfiCompressor.pyd
new file mode 100644 (file)
index 0000000..0729100
Binary files /dev/null and b/BaseTools/Bin/Win32/Eot.EfiCompressor.pyd differ

diff --git a/BaseTools/Bin/Win32/Eot.LzmaCompressor.pyd b/BaseTools/Bin/Win32/Eot.LzmaCompressor.pyd
new file mode 100644 (file)
index 0000000..d792a7e
Binary files /dev/null and b/BaseTools/Bin/Win32/Eot.LzmaCompressor.pyd differ

diff --git a/BaseTools/Bin/Win32/GenBootSector.exe b/BaseTools/Bin/Win32/GenBootSector.exe
index f6238a2aca8440a432326a8a6f31ae149b8bd696..f5553b429b57a18385f79fabdd51d733e2d20a07 100755 (executable)
Binary files a/BaseTools/Bin/Win32/GenBootSector.exe and b/BaseTools/Bin/Win32/GenBootSector.exe differ

diff --git a/BaseTools/Bin/Win32/GenCrc32.exe b/BaseTools/Bin/Win32/GenCrc32.exe
index f8e28fa3be8a95c2a86bf7fb0ce04f32eb93e642..6729a108c65f046ffe3007763fef2bc4c1823d25 100755 (executable)
Binary files a/BaseTools/Bin/Win32/GenCrc32.exe and b/BaseTools/Bin/Win32/GenCrc32.exe differ

diff --git a/BaseTools/Bin/Win32/GenFfs.exe b/BaseTools/Bin/Win32/GenFfs.exe
index 3001ea8606b6819075c2f3e82267d77ee29a6c85..9411bdc50c843b321af6a56daddce3b56a29a6f5 100755 (executable)
Binary files a/BaseTools/Bin/Win32/GenFfs.exe and b/BaseTools/Bin/Win32/GenFfs.exe differ

diff --git a/BaseTools/Bin/Win32/GenFv.exe b/BaseTools/Bin/Win32/GenFv.exe
index e00c814a31ad946d3b912269087216e66f22d751..e5882cb33964879711ded41cc51833ac0f0adbd6 100755 (executable)
Binary files a/BaseTools/Bin/Win32/GenFv.exe and b/BaseTools/Bin/Win32/GenFv.exe differ

diff --git a/BaseTools/Bin/Win32/GenFw.exe b/BaseTools/Bin/Win32/GenFw.exe
index 3fe8e4798d724da31ee031398c3e5f7d08f444d3..072d0fe2727bc7ff34ed2c717946733c613f2c18 100755 (executable)
Binary files a/BaseTools/Bin/Win32/GenFw.exe and b/BaseTools/Bin/Win32/GenFw.exe differ

diff --git a/BaseTools/Bin/Win32/GenPage.exe b/BaseTools/Bin/Win32/GenPage.exe
index 8e67d77c6542030c4ca44c6c0f68d7712855df04..5af9a323e64c711d00d6d0ce8b75be261c29a720 100755 (executable)
Binary files a/BaseTools/Bin/Win32/GenPage.exe and b/BaseTools/Bin/Win32/GenPage.exe differ

diff --git a/BaseTools/Bin/Win32/GenSec.exe b/BaseTools/Bin/Win32/GenSec.exe
index 12f7e6c214253bde7b6d0f644528ae4fe19bfb5b..deda7866e15bd86dc599fcd4cb1d885828d12385 100755 (executable)
Binary files a/BaseTools/Bin/Win32/GenSec.exe and b/BaseTools/Bin/Win32/GenSec.exe differ

diff --git a/BaseTools/Bin/Win32/GenVtf.exe b/BaseTools/Bin/Win32/GenVtf.exe
index 03b731b14cbe7d41619dd9566d4293ca7dcfcfa4..82e1a1b23dfe6dd670585e3dc90843eca0cb7122 100755 (executable)
Binary files a/BaseTools/Bin/Win32/GenVtf.exe and b/BaseTools/Bin/Win32/GenVtf.exe differ

diff --git a/BaseTools/Bin/Win32/LzmaCompress.exe b/BaseTools/Bin/Win32/LzmaCompress.exe
index 2e2624a03cb03e181217a44359806cbd8a3824ba..8c611f382bc8a1cfc6a15fa1e509a4c7e522a0d4 100644 (file)
Binary files a/BaseTools/Bin/Win32/LzmaCompress.exe and b/BaseTools/Bin/Win32/LzmaCompress.exe differ

diff --git a/BaseTools/Bin/Win32/Split.exe b/BaseTools/Bin/Win32/Split.exe
index c6efb302a29825e9200a1d61798e8d39dcb3cabf..2f58827858c4ded5b8b0b84ad7292cd195cb13b1 100755 (executable)
Binary files a/BaseTools/Bin/Win32/Split.exe and b/BaseTools/Bin/Win32/Split.exe differ

diff --git a/BaseTools/Bin/Win32/TianoCompress.exe b/BaseTools/Bin/Win32/TianoCompress.exe
index a71fa3b12345a03c2077a8fa9913a810d1454314..ec43802ab8714a11b0ca112668e71cfa0d2f0d06 100755 (executable)
Binary files a/BaseTools/Bin/Win32/TianoCompress.exe and b/BaseTools/Bin/Win32/TianoCompress.exe differ

diff --git a/BaseTools/Bin/Win32/VfrCompile.exe b/BaseTools/Bin/Win32/VfrCompile.exe
index 5f289936fc0eb87f6cf52d6f5e444936e82583ca..990c2ebe9f02fb63e250093d1d4eed1eb5fbe37e 100755 (executable)
Binary files a/BaseTools/Bin/Win32/VfrCompile.exe and b/BaseTools/Bin/Win32/VfrCompile.exe differ

diff --git a/BaseTools/Bin/Win32/VolInfo.exe b/BaseTools/Bin/Win32/VolInfo.exe
index bfdef7e231e6f5f930ab210e805abea59084d292..1700ff2f7c000465c0bea78b3f0ca63bfb04866a 100755 (executable)
Binary files a/BaseTools/Bin/Win32/VolInfo.exe and b/BaseTools/Bin/Win32/VolInfo.exe differ

diff --git a/BaseTools/Bin/Win32/build.exe b/BaseTools/Bin/Win32/build.exe
index d7d48add44590a9cc74c9458790af202e4a762b7..d6ae790c92a1151cb9ee0ddd6ce9741adea18650 100755 (executable)
Binary files a/BaseTools/Bin/Win32/build.exe and b/BaseTools/Bin/Win32/build.exe differ

diff --git a/BaseTools/Source/C/GenFv/GenFvInternalLib.c b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
index 00d008573a3c65f0a0772d7ea068a3e47edce612..7368bbbf9c2dca06517c0ff0280100e699fda662 100644 (file)
--- a/BaseTools/Source/C/GenFv/GenFvInternalLib.c
+++ b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
@@ -677,7 +677,7 @@ EFI_STATUS
 WriteMapFile (\r
   IN OUT FILE                  *FvMapFile,\r
   IN     CHAR8                 *FileName,\r
 WriteMapFile (\r
   IN OUT FILE                  *FvMapFile,\r
   IN     CHAR8                 *FileName,\r

-  IN     EFI_GUID              *FileGuidPtr, \r
+  IN     EFI_FFS_FILE_HEADER   *FfsFile, \r

   IN     EFI_PHYSICAL_ADDRESS  ImageBaseAddress,\r
   IN     PE_COFF_LOADER_IMAGE_CONTEXT *pImageContext\r
   )\r
   IN     EFI_PHYSICAL_ADDRESS  ImageBaseAddress,\r
   IN     PE_COFF_LOADER_IMAGE_CONTEXT *pImageContext\r
   )\r


@@ -692,7 +692,7 @@ Arguments:
 \r
   FvMapFile             A pointer to FvMap File\r
   FileName              Ffs File PathName\r
 \r
   FvMapFile             A pointer to FvMap File\r
   FileName              Ffs File PathName\r

-  FileGuidPtr           Guid Value of Ffs file\r
+  FfsFile               A pointer to Ffs file image.\r

   ImageBaseAddress      PeImage Base Address.\r
   pImageContext         Image Context Information.\r
 \r
   ImageBaseAddress      PeImage Base Address.\r
   pImageContext         Image Context Information.\r
 \r


@@ -723,7 +723,6 @@ Returns:
   UINT32                              DataVirtualAddress;\r
   EFI_PHYSICAL_ADDRESS                LinkTimeBaseAddress;\r
 \r
   UINT32                              DataVirtualAddress;\r
   EFI_PHYSICAL_ADDRESS                LinkTimeBaseAddress;\r
 \r

-  \r

   //\r
   // Init local variable\r
   //\r
   //\r
   // Init local variable\r
   //\r


@@ -731,7 +730,7 @@ Returns:
   //\r
   // Print FileGuid to string buffer. \r
   //\r
   //\r
   // Print FileGuid to string buffer. \r
   //\r

-  PrintGuidToBuffer (FileGuidPtr, (UINT8 *)FileGuidName, MAX_LINE_LEN, TRUE);\r
+  PrintGuidToBuffer (&FfsFile->Name, (UINT8 *)FileGuidName, MAX_LINE_LEN, TRUE);\r

   \r
   //\r
   // Construct Map file Name \r
   \r
   //\r
   // Construct Map file Name \r


@@ -808,7 +807,12 @@ Returns:
     fprintf (FvMapFile, "%s (Fixed Flash Address, ", KeyWord);\r
     fprintf (FvMapFile, "BaseAddress=0x%010llx, ", (unsigned long long) (ImageBaseAddress + Offset));\r
   }\r
     fprintf (FvMapFile, "%s (Fixed Flash Address, ", KeyWord);\r
     fprintf (FvMapFile, "BaseAddress=0x%010llx, ", (unsigned long long) (ImageBaseAddress + Offset));\r
   }\r

-  fprintf (FvMapFile, "EntryPoint=0x%010llx", (unsigned long long) (ImageBaseAddress + AddressOfEntryPoint));\r
+\r
+  if (FfsFile->Type != EFI_FV_FILETYPE_SECURITY_CORE && pImageContext->Machine == EFI_IMAGE_MACHINE_IA64) {\r
+    fprintf (FvMapFile, "EntryPoint=0x%010llx", (unsigned long long) (*(UINT64 *)((UINTN) pImageContext->Handle + (UINTN) AddressOfEntryPoint)));\r
+  } else {\r
+    fprintf (FvMapFile, "EntryPoint=0x%010llx", (unsigned long long) (ImageBaseAddress + AddressOfEntryPoint));\r
+  }\r

   fprintf (FvMapFile, ")\n"); \r
   \r
   fprintf (FvMapFile, "(GUID=%s", FileGuidName);\r
   fprintf (FvMapFile, ")\n"); \r
   \r
   fprintf (FvMapFile, "(GUID=%s", FileGuidName);\r


@@ -3094,7 +3098,7 @@ Returns:
       PdbPointer = FileName;\r
     }\r
 \r
       PdbPointer = FileName;\r
     }\r
 \r

-    WriteMapFile (FvMapFile, PdbPointer, (EFI_GUID *) FfsFile, NewPe32BaseAddress, &OrigImageContext);\r
+    WriteMapFile (FvMapFile, PdbPointer, FfsFile, NewPe32BaseAddress, &OrigImageContext);\r

   }\r
 \r
   if (FfsFile->Type != EFI_FV_FILETYPE_SECURITY_CORE &&\r
   }\r
 \r
   if (FfsFile->Type != EFI_FV_FILETYPE_SECURITY_CORE &&\r


@@ -3320,7 +3324,7 @@ Returns:
     WriteMapFile (\r
       FvMapFile, \r
       PdbPointer, \r
     WriteMapFile (\r
       FvMapFile, \r
       PdbPointer, \r

-      (EFI_GUID *) FfsFile,\r
+      FfsFile,\r

       NewPe32BaseAddress, \r
       &OrigImageContext\r
       );\r
       NewPe32BaseAddress, \r
       &OrigImageContext\r
       );\r

diff --git a/BaseTools/Source/C/LzmaCompress/GNUmakefile b/BaseTools/Source/C/LzmaCompress/GNUmakefile
index de38ea104711e7a00e0c9b1eb7514928dc0ec174..db3dbd1037bc9f755ca274a755cf6ac7e379d8a7 100644 (file)
--- a/BaseTools/Source/C/LzmaCompress/GNUmakefile
+++ b/BaseTools/Source/C/LzmaCompress/GNUmakefile
@@ -1,3 +1,15 @@
+## @file\r
+# Windows makefile for 'LzmaCompress' module build.\r
+#\r
+# Copyright (c) 2009 - 2010, Intel Corporation<BR>\r
+# All rights reserved. This program and the accompanying materials\r
+# are licensed and made available under the terms and conditions of the BSD License\r
+# which accompanies this distribution.  The full text of the license may be found at\r
+# http://opensource.org/licenses/bsd-license.php\r
+#\r
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#\r

 ARCH ?= IA32\r
 MAKEROOT ?= ..\r
 \r
 ARCH ?= IA32\r
 MAKEROOT ?= ..\r
 \r

diff --git a/BaseTools/Source/C/LzmaCompress/Makefile b/BaseTools/Source/C/LzmaCompress/Makefile
index b2fc9de75ee2ea475e124d5286126f83ce37f85d..8cc303dd6957f09fc10a315ce3a3710476b15a04 100644 (file)
--- a/BaseTools/Source/C/LzmaCompress/Makefile
+++ b/BaseTools/Source/C/LzmaCompress/Makefile
@@ -1,3 +1,15 @@
+## @file\r
+# Windows makefile for 'LzmaCompress' module build.\r
+#\r
+# Copyright (c) 2009 - 2010, Intel Corporation<BR>\r
+# All rights reserved. This program and the accompanying materials\r
+# are licensed and made available under the terms and conditions of the BSD License\r
+# which accompanies this distribution.  The full text of the license may be found at\r
+# http://opensource.org/licenses/bsd-license.php\r
+#\r
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#\r

 !INCLUDE ..\Makefiles\ms.common\r
 \r
 APPNAME = LzmaCompress\r
 !INCLUDE ..\Makefiles\ms.common\r
 \r
 APPNAME = LzmaCompress\r

diff --git a/BaseTools/Source/Python/Eot/c.py b/BaseTools/Source/Python/Eot/c.py
index 71d2b626db352dabc70c88bd09fd8857d4b99ba0..8b11ed378f0e74cd1e4fa8fed5877b04c1e1c9ae 100644 (file)
--- a/BaseTools/Source/Python/Eot/c.py
+++ b/BaseTools/Source/Python/Eot/c.py
@@ -361,7 +361,7 @@ def CreateCCodeDB(FileNameList):
             collector = CodeFragmentCollector.CodeFragmentCollector(FullName)\r
             try:\r
                 collector.ParseFile()\r
             collector = CodeFragmentCollector.CodeFragmentCollector(FullName)\r
             try:\r
                 collector.ParseFile()\r

-            except UnicodeError:\r
+            except:\r

                 ParseErrorFileList.append(FullName)\r
             BaseName = os.path.basename(FullName)\r
             DirName = os.path.dirname(FullName)\r
                 ParseErrorFileList.append(FullName)\r
             BaseName = os.path.basename(FullName)\r
             DirName = os.path.dirname(FullName)\r

diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Source/Python/build/BuildReport.py
index f805aae5ca1b637cb7af007e70c298cb82bbe504..329352204dc4267a2965ccd116095de99fd797ef 100644 (file)
--- a/BaseTools/Source/Python/build/BuildReport.py
+++ b/BaseTools/Source/Python/build/BuildReport.py
@@ -601,7 +601,7 @@ class PcdReport(object):
             FileWrite(File, "Platform Configuration Database Report")\r
             FileWrite(File, "  *P  - Platform scoped PCD override in DSC file")\r
             FileWrite(File, "  *F  - Platform scoped PCD override in FDF file")\r
             FileWrite(File, "Platform Configuration Database Report")\r
             FileWrite(File, "  *P  - Platform scoped PCD override in DSC file")\r
             FileWrite(File, "  *F  - Platform scoped PCD override in FDF file")\r

-            FileWrite(File, "  *M  - Module scoped PCD override in DSC file")\r
+            FileWrite(File, "  *M  - Module scoped PCD override")\r

             FileWrite(File, gSectionSep)\r
         else:\r
             #\r
             FileWrite(File, gSectionSep)\r
         else:\r
             #\r