From: Yunhua Feng <yunhuax.f...@intel.com>

DSC Components section support flexible PCD, and for binary driver, we
need patch this value. Update the split char ',' not ', ' because some
value may have space, while others may not have this space.

Cc: Liming Gao <liming....@intel.com>
Cc: Yonghong Zhu <yonghong....@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yunhua Feng <yunhuax.f...@intel.com>
Signed-off-by: Yonghong Zhu <yonghong....@intel.com>
---
 BaseTools/Source/Python/GenFds/FfsInfStatement.py      | 15 +++++++++++++++
 BaseTools/Source/Python/PatchPcdValue/PatchPcdValue.py |  3 ++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/BaseTools/Source/Python/GenFds/FfsInfStatement.py 
b/BaseTools/Source/Python/GenFds/FfsInfStatement.py
index b0b242b..dfff892 100644
--- a/BaseTools/Source/Python/GenFds/FfsInfStatement.py
+++ b/BaseTools/Source/Python/GenFds/FfsInfStatement.py
@@ -44,10 +44,11 @@ from PatchPcdValue.PatchPcdValue import PatchBinaryFile
 from Common.LongFilePathSupport import CopyLongFilePath
 from Common.LongFilePathSupport import OpenLongFilePath as open
 import Common.GlobalData as GlobalData
 from DepexSection import DepexSection
 from Common.Misc import SaveFileOnChange
+from Common.Expression import *
 
 ## generate FFS from INF
 #
 #
 class FfsInfStatement(FfsInfStatementClassObject):
@@ -277,10 +278,24 @@ class FfsInfStatement(FfsInfStatementClassObject):
                         BuildOptionOverride = True
                         break
 
             if not DscOverride and not FdfOverride and not BuildOptionOverride:
                 continue
+
+            # Support Flexible PCD format
+            if DefaultValue:
+                try:
+                    DefaultValue = ValueExpressionEx(DefaultValue, 
Pcd.DatumType, Platform._GuidDict)(True)
+                except BadExpression:
+                    EdkLogger.error("GenFds", GENFDS_ERROR, 'PCD [%s.%s] Value 
"%s"' %(Pcd.TokenSpaceGuidCName, Pcd.TokenCName, DefaultValue), 
File=self.InfFileName)
+
+            if Pcd.DefaultValue:
+                try:
+                    Pcd.DefaultValue = ValueExpressionEx(Pcd.DefaultValue, 
Pcd.DatumType, Platform._GuidDict)(True)
+                except BadExpression:
+                    EdkLogger.error("GenFds", GENFDS_ERROR, 'PCD [%s.%s] Value 
"%s"' %(Pcd.TokenSpaceGuidCName, Pcd.TokenCName, 
Pcd.DefaultValue),File=self.InfFileName)
+
             # Check value, if value are equal, no need to patch
             if Pcd.DatumType == "VOID*":
                 if Pcd.DefaultValue == DefaultValue or DefaultValue in [None, 
'']:
                     continue
                 # Get the string size from FDF or DSC
diff --git a/BaseTools/Source/Python/PatchPcdValue/PatchPcdValue.py 
b/BaseTools/Source/Python/PatchPcdValue/PatchPcdValue.py
index 882da81..942ba88 100644
--- a/BaseTools/Source/Python/PatchPcdValue/PatchPcdValue.py
+++ b/BaseTools/Source/Python/PatchPcdValue/PatchPcdValue.py
@@ -159,14 +159,15 @@ def PatchBinaryFile(FileName, ValueOffset, TypeName, 
ValueString, MaxSize=0):
                 Index = Index + 2
         elif ValueString.startswith("{") and ValueString.endswith("}"):
             #
             # Patch {0x1, 0x2, ...} byte by byte
             #
-            ValueList = ValueString[1 : len(ValueString) - 1].split(', ')
+            ValueList = ValueString[1 : len(ValueString) - 1].split(',')
             Index = 0
             try:
                 for ByteString in ValueList:
+                    ByteString = ByteString.strip()
                     if ByteString.upper().startswith('0X'):
                         ByteValue = int(ByteString, 16)
                     else:
                         ByteValue = int(ByteString)
                     ByteList[ValueOffset + Index] = ByteValue % 0x100
-- 
2.6.1.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Reply via email to