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

24 files changed, 37 insertions, 9 deletions

diff --git a/BaseTools/Bin/Win32/BootSectImage.exe b/BaseTools/Bin/Win32/BootSectImage.exe
index c5f336a99..535a8dc23 100755
--- a/BaseTools/Bin/Win32/BootSectImage.exe
+++ b/BaseTools/Bin/Win32/BootSectImage.exe
diff --git a/BaseTools/Bin/Win32/EfiLdrImage.exe b/BaseTools/Bin/Win32/EfiLdrImage.exe
index da82f6eb9..9eee3ff62 100755
--- a/BaseTools/Bin/Win32/EfiLdrImage.exe
+++ b/BaseTools/Bin/Win32/EfiLdrImage.exe
diff --git a/BaseTools/Bin/Win32/EfiRom.exe b/BaseTools/Bin/Win32/EfiRom.exe
index 0c39df46e..aa9790df5 100755
--- a/BaseTools/Bin/Win32/EfiRom.exe
+++ b/BaseTools/Bin/Win32/EfiRom.exe
diff --git a/BaseTools/Bin/Win32/Eot.EfiCompressor.pyd b/BaseTools/Bin/Win32/Eot.EfiCompressor.pyd
new file mode 100644
index 000000000..0729100b9
--- /dev/null
+++ b/BaseTools/Bin/Win32/Eot.EfiCompressor.pyd
diff --git a/BaseTools/Bin/Win32/Eot.LzmaCompressor.pyd b/BaseTools/Bin/Win32/Eot.LzmaCompressor.pyd
new file mode 100644
index 000000000..d792a7e9f
--- /dev/null
+++ b/BaseTools/Bin/Win32/Eot.LzmaCompressor.pyd
diff --git a/BaseTools/Bin/Win32/GenBootSector.exe b/BaseTools/Bin/Win32/GenBootSector.exe
index f6238a2ac..f5553b429 100755
--- a/BaseTools/Bin/Win32/GenBootSector.exe
+++ b/BaseTools/Bin/Win32/GenBootSector.exe
diff --git a/BaseTools/Bin/Win32/GenCrc32.exe b/BaseTools/Bin/Win32/GenCrc32.exe
index f8e28fa3b..6729a108c 100755
--- a/BaseTools/Bin/Win32/GenCrc32.exe
+++ b/BaseTools/Bin/Win32/GenCrc32.exe
diff --git a/BaseTools/Bin/Win32/GenFfs.exe b/BaseTools/Bin/Win32/GenFfs.exe
index 3001ea860..9411bdc50 100755
--- a/BaseTools/Bin/Win32/GenFfs.exe
+++ b/BaseTools/Bin/Win32/GenFfs.exe
diff --git a/BaseTools/Bin/Win32/GenFv.exe b/BaseTools/Bin/Win32/GenFv.exe
index e00c814a3..e5882cb33 100755
--- a/BaseTools/Bin/Win32/GenFv.exe
+++ b/BaseTools/Bin/Win32/GenFv.exe
diff --git a/BaseTools/Bin/Win32/GenFw.exe b/BaseTools/Bin/Win32/GenFw.exe
index 3fe8e4798..072d0fe27 100755
--- a/BaseTools/Bin/Win32/GenFw.exe
+++ b/BaseTools/Bin/Win32/GenFw.exe
diff --git a/BaseTools/Bin/Win32/GenPage.exe b/BaseTools/Bin/Win32/GenPage.exe
index 8e67d77c6..5af9a323e 100755
--- a/BaseTools/Bin/Win32/GenPage.exe
+++ b/BaseTools/Bin/Win32/GenPage.exe
diff --git a/BaseTools/Bin/Win32/GenSec.exe b/BaseTools/Bin/Win32/GenSec.exe
index 12f7e6c21..deda7866e 100755
--- a/BaseTools/Bin/Win32/GenSec.exe
+++ b/BaseTools/Bin/Win32/GenSec.exe
diff --git a/BaseTools/Bin/Win32/GenVtf.exe b/BaseTools/Bin/Win32/GenVtf.exe
index 03b731b14..82e1a1b23 100755
--- a/BaseTools/Bin/Win32/GenVtf.exe
+++ b/BaseTools/Bin/Win32/GenVtf.exe
diff --git a/BaseTools/Bin/Win32/LzmaCompress.exe b/BaseTools/Bin/Win32/LzmaCompress.exe
index 2e2624a03..8c611f382 100644
--- a/BaseTools/Bin/Win32/LzmaCompress.exe
+++ b/BaseTools/Bin/Win32/LzmaCompress.exe
diff --git a/BaseTools/Bin/Win32/Split.exe b/BaseTools/Bin/Win32/Split.exe
index c6efb302a..2f5882785 100755
--- a/BaseTools/Bin/Win32/Split.exe
+++ b/BaseTools/Bin/Win32/Split.exe
diff --git a/BaseTools/Bin/Win32/TianoCompress.exe b/BaseTools/Bin/Win32/TianoCompress.exe
index a71fa3b12..ec43802ab 100755
--- a/BaseTools/Bin/Win32/TianoCompress.exe
+++ b/BaseTools/Bin/Win32/TianoCompress.exe
diff --git a/BaseTools/Bin/Win32/VfrCompile.exe b/BaseTools/Bin/Win32/VfrCompile.exe
index 5f289936f..990c2ebe9 100755
--- a/BaseTools/Bin/Win32/VfrCompile.exe
+++ b/BaseTools/Bin/Win32/VfrCompile.exe
diff --git a/BaseTools/Bin/Win32/VolInfo.exe b/BaseTools/Bin/Win32/VolInfo.exe
index bfdef7e23..1700ff2f7 100755
--- a/BaseTools/Bin/Win32/VolInfo.exe
+++ b/BaseTools/Bin/Win32/VolInfo.exe
diff --git a/BaseTools/Bin/Win32/build.exe b/BaseTools/Bin/Win32/build.exe
index d7d48add4..d6ae790c9 100755
--- a/BaseTools/Bin/Win32/build.exe
+++ b/BaseTools/Bin/Win32/build.exe
diff --git a/BaseTools/Source/C/GenFv/GenFvInternalLib.c b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
index 00d008573..7368bbbf9 100644
--- a/BaseTools/Source/C/GenFv/GenFvInternalLib.c
+++ b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
@@ -677,7 +677,7 @@ EFI_STATUS
 WriteMapFile (

   IN OUT FILE                  *FvMapFile,

   IN     CHAR8                 *FileName,

-  IN     EFI_GUID              *FileGuidPtr, 

+  IN     EFI_FFS_FILE_HEADER   *FfsFile, 

   IN     EFI_PHYSICAL_ADDRESS  ImageBaseAddress,

   IN     PE_COFF_LOADER_IMAGE_CONTEXT *pImageContext

   )

@@ -692,7 +692,7 @@ Arguments:
 

   FvMapFile             A pointer to FvMap File

   FileName              Ffs File PathName

-  FileGuidPtr           Guid Value of Ffs file

+  FfsFile               A pointer to Ffs file image.

   ImageBaseAddress      PeImage Base Address.

   pImageContext         Image Context Information.

 

@@ -723,7 +723,6 @@ Returns:
   UINT32                              DataVirtualAddress;

   EFI_PHYSICAL_ADDRESS                LinkTimeBaseAddress;

 

-  

   //

   // Init local variable

   //

@@ -731,7 +730,7 @@ Returns:
   //

   // Print FileGuid to string buffer. 

   //

-  PrintGuidToBuffer (FileGuidPtr, (UINT8 *)FileGuidName, MAX_LINE_LEN, TRUE);

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

   

   //

   // Construct Map file Name 

@@ -808,7 +807,12 @@ Returns:
     fprintf (FvMapFile, "%s (Fixed Flash Address, ", KeyWord);

     fprintf (FvMapFile, "BaseAddress=0x%010llx, ", (unsigned long long) (ImageBaseAddress + Offset));

   }

-  fprintf (FvMapFile, "EntryPoint=0x%010llx", (unsigned long long) (ImageBaseAddress + AddressOfEntryPoint));

+

+  if (FfsFile->Type != EFI_FV_FILETYPE_SECURITY_CORE && pImageContext->Machine == EFI_IMAGE_MACHINE_IA64) {

+    fprintf (FvMapFile, "EntryPoint=0x%010llx", (unsigned long long) (*(UINT64 *)((UINTN) pImageContext->Handle + (UINTN) AddressOfEntryPoint)));

+  } else {

+    fprintf (FvMapFile, "EntryPoint=0x%010llx", (unsigned long long) (ImageBaseAddress + AddressOfEntryPoint));

+  }

   fprintf (FvMapFile, ")\n"); 

   

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

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

     }

 

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

+    WriteMapFile (FvMapFile, PdbPointer, FfsFile, NewPe32BaseAddress, &OrigImageContext);

   }

 

   if (FfsFile->Type != EFI_FV_FILETYPE_SECURITY_CORE &&

@@ -3320,7 +3324,7 @@ Returns:
     WriteMapFile (

       FvMapFile, 

       PdbPointer, 

-      (EFI_GUID *) FfsFile,

+      FfsFile,

       NewPe32BaseAddress, 

       &OrigImageContext

       );

diff --git a/BaseTools/Source/C/LzmaCompress/GNUmakefile b/BaseTools/Source/C/LzmaCompress/GNUmakefile
index de38ea104..db3dbd103 100644
--- a/BaseTools/Source/C/LzmaCompress/GNUmakefile
+++ b/BaseTools/Source/C/LzmaCompress/GNUmakefile
@@ -1,3 +1,15 @@
+## @file

+# Windows makefile for 'LzmaCompress' module build.

+#

+# Copyright (c) 2009 - 2010, Intel Corporation<BR>

+# All rights reserved. This program and the accompanying materials

+# are licensed and made available under the terms and conditions of the BSD License

+# which accompanies this distribution.  The full text of the license may be found at

+# http://opensource.org/licenses/bsd-license.php

+#

+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

+#

 ARCH ?= IA32

 MAKEROOT ?= ..

 

diff --git a/BaseTools/Source/C/LzmaCompress/Makefile b/BaseTools/Source/C/LzmaCompress/Makefile
index b2fc9de75..8cc303dd6 100644
--- a/BaseTools/Source/C/LzmaCompress/Makefile
+++ b/BaseTools/Source/C/LzmaCompress/Makefile
@@ -1,3 +1,15 @@
+## @file

+# Windows makefile for 'LzmaCompress' module build.

+#

+# Copyright (c) 2009 - 2010, Intel Corporation<BR>

+# All rights reserved. This program and the accompanying materials

+# are licensed and made available under the terms and conditions of the BSD License

+# which accompanies this distribution.  The full text of the license may be found at

+# http://opensource.org/licenses/bsd-license.php

+#

+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

+#

 !INCLUDE ..\Makefiles\ms.common

 

 APPNAME = LzmaCompress

diff --git a/BaseTools/Source/Python/Eot/c.py b/BaseTools/Source/Python/Eot/c.py
index 71d2b626d..8b11ed378 100644
--- 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)

             try:

                 collector.ParseFile()

-            except UnicodeError:

+            except:

                 ParseErrorFileList.append(FullName)

             BaseName = os.path.basename(FullName)

             DirName = os.path.dirname(FullName)

diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Source/Python/build/BuildReport.py
index f805aae5c..329352204 100644
--- 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")

             FileWrite(File, "  *P  - Platform scoped PCD override in DSC file")

             FileWrite(File, "  *F  - Platform scoped PCD override in FDF file")

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

+            FileWrite(File, "  *M  - Module scoped PCD override")

             FileWrite(File, gSectionSep)

         else:

             #