DscDefaultValue from Dsc file has been parsed by ValueExpressionEx
when Dsc file parse, so only DscDefaultValue from FDF file need
ValueExpressionEx parse
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>
---
BaseTools/Source/Python/build/BuildReport.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/BaseTools/Source/Python/build/BuildReport.py
b/BaseTools/Source/Python/build/BuildReport.py
index d6e943d2f1..f2a6e6d87e 100644
--- a/BaseTools/Source/Python/build/BuildReport.py
+++ b/BaseTools/Source/Python/build/BuildReport.py
@@ -950,13 +950,13 @@ class PcdReport(object):
#
# Get PCD default value and their override relationship
#
DecDefaultValue = self.DecPcdDefault.get((Pcd.TokenCName,
Pcd.TokenSpaceGuidCName, DecType))
DscDefaultValue = self.DscPcdDefault.get((Pcd.TokenCName,
Pcd.TokenSpaceGuidCName))
- DscDefaultValBak= DscDefaultValue
+ DscDefaultValBak = DscDefaultValue
DscDefaultValue = self.FdfPcdSet.get((Pcd.TokenCName,
Key), DscDefaultValue)
- if DscDefaultValue:
+ if DscDefaultValue != DscDefaultValBak:
DscDefaultValue = ValueExpressionEx(DscDefaultValue,
Pcd.DatumType, self._GuidDict)(True)
InfDefaultValue = None
PcdValue = DecDefaultValue
if DscDefaultValue:
--
2.12.2.windows.2
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
