Revision: 17627
http://sourceforge.net/p/edk2/code/17627
Author: yingke
Date: 2015-06-12 00:58:18 +0000 (Fri, 12 Jun 2015)
Log Message:
-----------
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 <[email protected]>
Reviewed-by: Liming Gao <[email protected]>
Modified Paths:
--------------
trunk/edk2/BaseTools/Source/Python/AutoGen/AutoGen.py
trunk/edk2/BaseTools/Source/Python/GenFds/Fv.py
Modified: trunk/edk2/BaseTools/Source/Python/AutoGen/AutoGen.py
===================================================================
--- trunk/edk2/BaseTools/Source/Python/AutoGen/AutoGen.py 2015-06-11
10:24:36 UTC (rev 17626)
+++ trunk/edk2/BaseTools/Source/Python/AutoGen/AutoGen.py 2015-06-12
00:58:18 UTC (rev 17627)
@@ -2297,7 +2297,6 @@
if Module.MetaFile == self.MetaFile:
continue
if Module.Name == self.Name:
- EdkLogger.warn('build', 'Modules have same BaseName:\n %s\n
%s' % (Module.MetaFile, self.MetaFile))
if uuid.UUID(Module.Guid) == uuid.UUID(self.Guid):
EdkLogger.error("build", FILE_DUPLICATED, 'Modules have
same BaseName and FILE_GUID:\n'
' %s\n %s' % (Module.MetaFile,
self.MetaFile))
Modified: trunk/edk2/BaseTools/Source/Python/GenFds/Fv.py
===================================================================
--- trunk/edk2/BaseTools/Source/Python/GenFds/Fv.py 2015-06-11 10:24:36 UTC
(rev 17626)
+++ trunk/edk2/BaseTools/Source/Python/GenFds/Fv.py 2015-06-12 00:58:18 UTC
(rev 17627)
@@ -30,6 +30,7 @@
from Common.LongFilePathSupport import OpenLongFilePath as open
T_CHAR_LF = '\n'
+FV_UI_EXT_ENTY_GUID = 'A67DF1FA-8DE8-4E98-AF09-4BDF2EFFBC7C'
## generate FV
#
@@ -295,6 +296,26 @@
if self.FvNameGuid <> None and self.FvNameGuid <> '':
TotalSize = 16 + 4
Buffer = ''
+ #
+ # Create EXT entry for FV UI name
+ # This GUID is used: A67DF1FA-8DE8-4E98-AF09-4BDF2EFFBC7C
+ #
+ FvUiLen = len(self.UiFvName)
+ TotalSize += (FvUiLen + 16 + 4)
+ Guid = FV_UI_EXT_ENTY_GUID.split('-')
+ #
+ # Layout:
+ # EFI_FIRMWARE_VOLUME_EXT_ENTRY : size 4
+ # GUID : size 16
+ # FV UI name
+ #
+ Buffer += (pack('HH', (FvUiLen + 16 + 4), 0x0002)
+ + pack('=LHHBBBBBBBB', int(Guid[0], 16), int(Guid[1],
16), int(Guid[2], 16),
+ int(Guid[3][-4:-2], 16), int(Guid[3][-2:], 16),
int(Guid[4][-12:-10], 16),
+ int(Guid[4][-10:-8], 16), int(Guid[4][-8:-6],
16), int(Guid[4][-6:-4], 16),
+ int(Guid[4][-4:-2], 16), int(Guid[4][-2:], 16))
+ + self.UiFvName)
+
for Index in range (0, len(self.FvExtEntryType)):
if self.FvExtEntryType[Index] == 'FILE':
# check if the path is absolute or relative
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
