BaseTools: Support PCD flexible values format

https://bugzilla.tianocore.org/show_bug.cgi?id=541

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yunhua Feng <yunhuax.feng@intel.com>
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

1 files changed, 6 insertions, 0 deletions

diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Source/Python/build/BuildReport.py
index 75e8ec97ab..5da9914544 100644
--- a/BaseTools/Source/Python/build/BuildReport.py
+++ b/BaseTools/Source/Python/build/BuildReport.py
@@ -45,6 +45,7 @@ from Common.Misc import PathClass
 from Common.String import NormPath

 from Common.DataType import *

 import collections

+from Common.Expression import ValueExpressionEx

 

 ## Pattern to extract contents in EDK DXS files

 gDxsDependencyPattern = re.compile(r"DEPENDENCY_START(.+)DEPENDENCY_END", re.DOTALL)

@@ -849,8 +850,11 @@ class PcdReport(object):
         # Collect PCD DEC default value.

         #

         self.DecPcdDefault = {}

+        self._GuidDict = {}

         for Pa in Wa.AutoGenObjectList:

             for Package in Pa.PackageList:

+                Guids = Package.Guids

+                self._GuidDict.update(Guids)

                 for (TokenCName, TokenSpaceGuidCName, DecType) in Package.Pcds:

                     DecDefaultValue = Package.Pcds[TokenCName, TokenSpaceGuidCName, DecType].DefaultValue

                     self.DecPcdDefault.setdefault((TokenCName, TokenSpaceGuidCName, DecType), DecDefaultValue)

@@ -943,6 +947,8 @@ class PcdReport(object):
                     DscDefaultValue = self.DscPcdDefault.get((Pcd.TokenCName, Pcd.TokenSpaceGuidCName))

                     DscDefaultValBak= DscDefaultValue

                     DscDefaultValue = self.FdfPcdSet.get((Pcd.TokenCName, Key), DscDefaultValue)

+                    if DscDefaultValue:

+                        DscDefaultValue = ValueExpressionEx(DscDefaultValue, Pcd.DatumType, self._GuidDict)(True)

                     InfDefaultValue = None

                     

                     PcdValue = DecDefaultValue