BaseTools: Generate a FV EXT entry for FV UI name.

This patch also removed a warning message.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yingke Liu <yingke.d.liu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17627 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index 996b654943cccc544dd54d8309e5be8037c897e3..0e7482a87a832033c62dd06b0643d226505b7ecb 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -2297,7 +2297,6 @@ class ModuleAutoGen(AutoGen):
             if Module.MetaFile == self.MetaFile:\r
                 continue\r
             if Module.Name == self.Name:\r
-                EdkLogger.warn('build', 'Modules have same BaseName:\n  %s\n  %s' % (Module.MetaFile, self.MetaFile))\r
                 if uuid.UUID(Module.Guid) == uuid.UUID(self.Guid):\r
                     EdkLogger.error("build", FILE_DUPLICATED, 'Modules have same BaseName and FILE_GUID:\n'\r
                                     '  %s\n  %s' % (Module.MetaFile, self.MetaFile))\r

diff --git a/BaseTools/Source/Python/GenFds/Fv.py b/BaseTools/Source/Python/GenFds/Fv.py
index 03a742696fa169721854491b1efc87a69f4fc146..8f341d3bf1a80623627b8072798d6aa27b91f765 100644 (file)
--- a/BaseTools/Source/Python/GenFds/Fv.py
+++ b/BaseTools/Source/Python/GenFds/Fv.py
@@ -30,6 +30,7 @@ from Common.LongFilePathSupport import CopyLongFilePath
 from Common.LongFilePathSupport import OpenLongFilePath as open\r
 \r
 T_CHAR_LF = '\n'\r
+FV_UI_EXT_ENTY_GUID = 'A67DF1FA-8DE8-4E98-AF09-4BDF2EFFBC7C'\r
 \r
 ## generate FV\r
 #\r
@@ -295,6 +296,26 @@ class FV (FvClassObject):
         if self.FvNameGuid <> None and self.FvNameGuid <> '':\r
             TotalSize = 16 + 4\r
             Buffer = ''\r
+            #\r
+            # Create EXT entry for FV UI name\r
+            # This GUID is used: A67DF1FA-8DE8-4E98-AF09-4BDF2EFFBC7C\r
+            #\r
+            FvUiLen = len(self.UiFvName)\r
+            TotalSize += (FvUiLen + 16 + 4)\r
+            Guid = FV_UI_EXT_ENTY_GUID.split('-')\r
+            #\r
+            # Layout:\r
+            #   EFI_FIRMWARE_VOLUME_EXT_ENTRY : size 4\r
+            #   GUID                          : size 16\r
+            #   FV UI name\r
+            #\r
+            Buffer += (pack('HH', (FvUiLen + 16 + 4), 0x0002)\r
+                       + pack('=LHHBBBBBBBB', int(Guid[0], 16), int(Guid[1], 16), int(Guid[2], 16),\r
+                              int(Guid[3][-4:-2], 16), int(Guid[3][-2:], 16), int(Guid[4][-12:-10], 16),\r
+                              int(Guid[4][-10:-8], 16), int(Guid[4][-8:-6], 16), int(Guid[4][-6:-4], 16),\r
+                              int(Guid[4][-4:-2], 16), int(Guid[4][-2:], 16))\r
+                       + self.UiFvName)\r
+\r
             for Index in range (0, len(self.FvExtEntryType)):\r
                 if self.FvExtEntryType[Index] == 'FILE':\r
                     # check if the path is absolute or relative\r