BaseTools: Add a keyword FvNameString in FDF

The keyword with value TRUE OR FALSE is used to
indicate whether the FV UI name is included in
FV EXT header as a entry or not.

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@18090 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/BaseTools/Source/Python/CommonDataClass/FdfClass.py b/BaseTools/Source/Python/CommonDataClass/FdfClass.py
index f758d35ba1b7e08dc5fc20e99e3e5b938df0457c..96a630f4d2cc94525371760fdff8b9e638a634c3 100644 (file)
--- a/BaseTools/Source/Python/CommonDataClass/FdfClass.py
+++ b/BaseTools/Source/Python/CommonDataClass/FdfClass.py
@@ -58,6 +58,7 @@ class FvClassObject:
         # FvAttributeDict[attribute] = TRUE/FALSE (1/0)\r
         self.FvAttributeDict = {}\r
         self.FvNameGuid = None\r
+        self.FvNameString = None\r
         self.AprioriSectionList = []\r
         self.FfsList = []\r
         self.BsBaseAddress = None\r

diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index ffc54abc847f80d9742d3958e20584f38cbc22ed..83d3e1935e371e179e5dc73d615f5910060b5668 100644 (file)
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -2068,9 +2068,12 @@ class FdfParser:
             if not (self.__GetBlockStatement(FvObj) or self.__GetFvBaseAddress(FvObj) or \r
                 self.__GetFvForceRebase(FvObj) or self.__GetFvAlignment(FvObj) or \r
                 self.__GetFvAttributes(FvObj) or self.__GetFvNameGuid(FvObj) or \r
-                self.__GetFvExtEntryStatement(FvObj)):\r
+                self.__GetFvExtEntryStatement(FvObj) or self.__GetFvNameString(FvObj)):\r
                 break\r
 \r
+        if FvObj.FvNameString == 'TRUE' and not FvObj.FvNameGuid:\r
+            raise Warning("FvNameString found but FvNameGuid was not found", self.FileName, self.CurrentLineNumber)\r
+\r
         self.__GetAprioriSection(FvObj, FvObj.DefineVarDict.copy())\r
         self.__GetAprioriSection(FvObj, FvObj.DefineVarDict.copy())\r
 \r
@@ -2225,6 +2228,21 @@ class FdfParser:
 \r
         return True\r
 \r
+    def __GetFvNameString(self, FvObj):\r
+\r
+        if not self.__IsKeyword( "FvNameString"):\r
+            return False\r
+\r
+        if not self.__IsToken( "="):\r
+            raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+\r
+        if not self.__GetNextToken() or self.__Token not in ('TRUE', 'FALSE'):\r
+            raise Warning("expected TRUE or FALSE for FvNameString", self.FileName, self.CurrentLineNumber)\r
+\r
+        FvObj.FvNameString = self.__Token\r
+\r
+        return True\r
+\r
     def __GetFvExtEntryStatement(self, FvObj):\r
 \r
         if not self.__IsKeyword( "FV_EXT_ENTRY"):\r

diff --git a/BaseTools/Source/Python/GenFds/Fv.py b/BaseTools/Source/Python/GenFds/Fv.py
index 8f341d3bf1a80623627b8072798d6aa27b91f765..d7705823265912eedf2a03dfa314accdb7c2e7e8 100644 (file)
--- a/BaseTools/Source/Python/GenFds/Fv.py
+++ b/BaseTools/Source/Python/GenFds/Fv.py
@@ -296,25 +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
+            if self.FvNameString == 'TRUE':\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