Sync EDKII BaseTools to BaseTools project r1940
authorqhuang8 <qhuang8@6f19259b-4bc3-4df7-8a09-765794883524>
Tue, 23 Mar 2010 11:46:50 +0000 (11:46 +0000)
committerqhuang8 <qhuang8@6f19259b-4bc3-4df7-8a09-765794883524>
Tue, 23 Mar 2010 11:46:50 +0000 (11:46 +0000)
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk@10307 6f19259b-4bc3-4df7-8a09-765794883524

24 files changed:
edk2/BaseTools/Bin/Win32/BootSectImage.exe
edk2/BaseTools/Bin/Win32/EfiLdrImage.exe
edk2/BaseTools/Bin/Win32/EfiRom.exe
edk2/BaseTools/Bin/Win32/Eot.EfiCompressor.pyd [new file with mode: 0644]
edk2/BaseTools/Bin/Win32/Eot.LzmaCompressor.pyd [new file with mode: 0644]
edk2/BaseTools/Bin/Win32/GenBootSector.exe
edk2/BaseTools/Bin/Win32/GenCrc32.exe
edk2/BaseTools/Bin/Win32/GenFfs.exe
edk2/BaseTools/Bin/Win32/GenFv.exe
edk2/BaseTools/Bin/Win32/GenFw.exe
edk2/BaseTools/Bin/Win32/GenPage.exe
edk2/BaseTools/Bin/Win32/GenSec.exe
edk2/BaseTools/Bin/Win32/GenVtf.exe
edk2/BaseTools/Bin/Win32/LzmaCompress.exe
edk2/BaseTools/Bin/Win32/Split.exe
edk2/BaseTools/Bin/Win32/TianoCompress.exe
edk2/BaseTools/Bin/Win32/VfrCompile.exe
edk2/BaseTools/Bin/Win32/VolInfo.exe
edk2/BaseTools/Bin/Win32/build.exe
edk2/BaseTools/Source/C/GenFv/GenFvInternalLib.c
edk2/BaseTools/Source/C/LzmaCompress/GNUmakefile
edk2/BaseTools/Source/C/LzmaCompress/Makefile
edk2/BaseTools/Source/Python/Eot/c.py
edk2/BaseTools/Source/Python/build/BuildReport.py

index c5f336a..535a8dc 100755 (executable)
Binary files a/edk2/BaseTools/Bin/Win32/BootSectImage.exe and b/edk2/BaseTools/Bin/Win32/BootSectImage.exe differ
index da82f6e..9eee3ff 100755 (executable)
Binary files a/edk2/BaseTools/Bin/Win32/EfiLdrImage.exe and b/edk2/BaseTools/Bin/Win32/EfiLdrImage.exe differ
index 0c39df4..aa9790d 100755 (executable)
Binary files a/edk2/BaseTools/Bin/Win32/EfiRom.exe and b/edk2/BaseTools/Bin/Win32/EfiRom.exe differ
diff --git a/edk2/BaseTools/Bin/Win32/Eot.EfiCompressor.pyd b/edk2/BaseTools/Bin/Win32/Eot.EfiCompressor.pyd
new file mode 100644 (file)
index 0000000..0729100
Binary files /dev/null and b/edk2/BaseTools/Bin/Win32/Eot.EfiCompressor.pyd differ
diff --git a/edk2/BaseTools/Bin/Win32/Eot.LzmaCompressor.pyd b/edk2/BaseTools/Bin/Win32/Eot.LzmaCompressor.pyd
new file mode 100644 (file)
index 0000000..d792a7e
Binary files /dev/null and b/edk2/BaseTools/Bin/Win32/Eot.LzmaCompressor.pyd differ
index f6238a2..f5553b4 100755 (executable)
Binary files a/edk2/BaseTools/Bin/Win32/GenBootSector.exe and b/edk2/BaseTools/Bin/Win32/GenBootSector.exe differ
index f8e28fa..6729a10 100755 (executable)
Binary files a/edk2/BaseTools/Bin/Win32/GenCrc32.exe and b/edk2/BaseTools/Bin/Win32/GenCrc32.exe differ
index 3001ea8..9411bdc 100755 (executable)
Binary files a/edk2/BaseTools/Bin/Win32/GenFfs.exe and b/edk2/BaseTools/Bin/Win32/GenFfs.exe differ
index e00c814..e5882cb 100755 (executable)
Binary files a/edk2/BaseTools/Bin/Win32/GenFv.exe and b/edk2/BaseTools/Bin/Win32/GenFv.exe differ
index 3fe8e47..072d0fe 100755 (executable)
Binary files a/edk2/BaseTools/Bin/Win32/GenFw.exe and b/edk2/BaseTools/Bin/Win32/GenFw.exe differ
index 8e67d77..5af9a32 100755 (executable)
Binary files a/edk2/BaseTools/Bin/Win32/GenPage.exe and b/edk2/BaseTools/Bin/Win32/GenPage.exe differ
index 12f7e6c..deda786 100755 (executable)
Binary files a/edk2/BaseTools/Bin/Win32/GenSec.exe and b/edk2/BaseTools/Bin/Win32/GenSec.exe differ
index 03b731b..82e1a1b 100755 (executable)
Binary files a/edk2/BaseTools/Bin/Win32/GenVtf.exe and b/edk2/BaseTools/Bin/Win32/GenVtf.exe differ
index 2e2624a..8c611f3 100644 (file)
Binary files a/edk2/BaseTools/Bin/Win32/LzmaCompress.exe and b/edk2/BaseTools/Bin/Win32/LzmaCompress.exe differ
index c6efb30..2f58827 100755 (executable)
Binary files a/edk2/BaseTools/Bin/Win32/Split.exe and b/edk2/BaseTools/Bin/Win32/Split.exe differ
index a71fa3b..ec43802 100755 (executable)
Binary files a/edk2/BaseTools/Bin/Win32/TianoCompress.exe and b/edk2/BaseTools/Bin/Win32/TianoCompress.exe differ
index 5f28993..990c2eb 100755 (executable)
Binary files a/edk2/BaseTools/Bin/Win32/VfrCompile.exe and b/edk2/BaseTools/Bin/Win32/VfrCompile.exe differ
index bfdef7e..1700ff2 100755 (executable)
Binary files a/edk2/BaseTools/Bin/Win32/VolInfo.exe and b/edk2/BaseTools/Bin/Win32/VolInfo.exe differ
index d7d48ad..d6ae790 100755 (executable)
Binary files a/edk2/BaseTools/Bin/Win32/build.exe and b/edk2/BaseTools/Bin/Win32/build.exe differ
index 00d0085..7368bbb 100644 (file)
@@ -677,7 +677,7 @@ EFI_STATUS
 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
@@ -692,7 +692,7 @@ Arguments:
 \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
@@ -723,7 +723,6 @@ Returns:
   UINT32                              DataVirtualAddress;\r
   EFI_PHYSICAL_ADDRESS                LinkTimeBaseAddress;\r
 \r
-  \r
   //\r
   // Init local variable\r
   //\r
@@ -731,7 +730,7 @@ Returns:
   //\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
@@ -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, "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
@@ -3094,7 +3098,7 @@ Returns:
       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
@@ -3320,7 +3324,7 @@ Returns:
     WriteMapFile (\r
       FvMapFile, \r
       PdbPointer, \r
-      (EFI_GUID *) FfsFile,\r
+      FfsFile,\r
       NewPe32BaseAddress, \r
       &OrigImageContext\r
       );\r
index de38ea1..db3dbd1 100644 (file)
@@ -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
index b2fc9de..8cc303d 100644 (file)
@@ -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
index 71d2b62..8b11ed3 100644 (file)
@@ -361,7 +361,7 @@ def CreateCCodeDB(FileNameList):
             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
index f805aae..3293522 100644 (file)
@@ -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, "  *M  - Module scoped PCD override in DSC file")\r
+            FileWrite(File, "  *M  - Module scoped PCD override")\r
             FileWrite(File, gSectionSep)\r
         else:\r
             #\r