From d32a84b5ad8eb5293710ca83dad2b4686479b653 Mon Sep 17 00:00:00 2001 From: "Li, Yi1" Date: Mon, 11 Jul 2022 13:48:14 +0800 Subject: [PATCH] BaseTools: INF should use latest Pcd value instead of default value This patch is a bug fix about FeatureFlagExpression in INF file: INF [Source] section now unconditionally use Pcd default value in DEC when handling FeatureFlagExpression, it is wrong. If a Pcd value has been set in the DSC file, we should use latest value in DSC instead of default value. Cc: Bob Feng Cc: Liming Gao Signed-off-by: Yi Li Reviewed-by: Bob Feng --- BaseTools/Source/Python/Workspace/InfBuildData.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/BaseTools/Source/Python/Workspace/InfBuildData.py b/BaseTools/Source/Python/Workspace/InfBuildData.py index 5b9b3d7b4f..e4ff1c6686 100644 --- a/BaseTools/Source/Python/Workspace/InfBuildData.py +++ b/BaseTools/Source/Python/Workspace/InfBuildData.py @@ -1084,7 +1084,9 @@ class InfBuildData(ModuleBuildClassObject): else: for Name, Guid in self.Pcds: if self.Pcds[(Name, Guid)].Type == 'FeatureFlag' or self.Pcds[(Name, Guid)].Type == 'FixedAtBuild': - Pcds['%s.%s' % (Guid, Name)] = self.Pcds[(Name, Guid)].DefaultValue + PcdFullName = '%s.%s' % (Guid, Name); + if not PcdFullName in Pcds: + Pcds[PcdFullName] = self.Pcds[(Name, Guid)].DefaultValue try: Value = ValueExpression(Instance, Pcds)() if Value == True: