BaseTools/Source/Python/build/BuildReport.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
The version cc71d8's fix was washed out by structure pcd report patch.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
---
BaseTools/Source/Python/build/BuildReport.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Source/Python/build/BuildReport.py
index d2ac044..d6e943d 100644
--- a/BaseTools/Source/Python/build/BuildReport.py
+++ b/BaseTools/Source/Python/build/BuildReport.py
@@ -869,11 +869,11 @@ class PcdReport(object):
# Collect PCDs defined in DSC common section
#
self.DscPcdDefault = {}
for Pa in Wa.AutoGenObjectList:
for (TokenCName, TokenSpaceGuidCName) in Pa.Platform.Pcds:
- DscDefaultValue = Pa.Platform.Pcds[(TokenCName, TokenSpaceGuidCName)].DefaultValue
+ DscDefaultValue = Pa.Platform.Pcds[(TokenCName, TokenSpaceGuidCName)].DscDefaultValue
if DscDefaultValue:
self.DscPcdDefault[(TokenCName, TokenSpaceGuidCName)] = DscDefaultValue
def GenerateReport(self, File, ModulePcdSet):
if self.ConditionalPcds:
@@ -1032,21 +1032,21 @@ class PcdReport(object):
DecMatch = False
#
# Report PCD item according to their override relationship
#
if DecMatch and InfMatch:
- self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName, IsStructure, DscMatch, DscDefaultValue, InfMatch, InfDefaultValue, DecMatch, DecDefaultValue, ' ')
+ self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName, IsStructure, DscMatch, DscDefaultValBak, InfMatch, InfDefaultValue, DecMatch, DecDefaultValue, ' ')
elif BuildOptionMatch:
- self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName, IsStructure, DscMatch, DscDefaultValue, InfMatch, InfDefaultValue, DecMatch, DecDefaultValue, '*B')
+ self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName, IsStructure, DscMatch, DscDefaultValBak, InfMatch, InfDefaultValue, DecMatch, DecDefaultValue, '*B')
else:
if DscMatch:
if (Pcd.TokenCName, Key) in self.FdfPcdSet:
- self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName, IsStructure, DscMatch, DscDefaultValue, InfMatch, InfDefaultValue, DecMatch, DecDefaultValue, '*F')
+ self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName, IsStructure, DscMatch, DscDefaultValBak, InfMatch, InfDefaultValue, DecMatch, DecDefaultValue, '*F')
else:
- self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName, IsStructure, DscMatch, DscDefaultValue, InfMatch, InfDefaultValue, DecMatch, DecDefaultValue, '*P')
+ self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName, IsStructure, DscMatch, DscDefaultValBak, InfMatch, InfDefaultValue, DecMatch, DecDefaultValue, '*P')
else:
- self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName, IsStructure, DscMatch, DscDefaultValue, InfMatch, InfDefaultValue, DecMatch, DecDefaultValue, '*M')
+ self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName, IsStructure, DscMatch, DscDefaultValBak, InfMatch, InfDefaultValue, DecMatch, DecDefaultValue, '*M')
if ModulePcdSet == None:
if IsStructure:
continue
if not TypeName in ('PATCH', 'FLAG', 'FIXED'):
--
2.6.1.windows.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Reviewed-by: Liming Gao <liming.gao@intel.com> >-----Original Message----- >From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of >Yonghong Zhu >Sent: Thursday, January 04, 2018 5:25 PM >To: edk2-devel@lists.01.org >Subject: [edk2] [Patch] BaseTools: Add back the cc71d8 version's fix > >The version cc71d8's fix was washed out by structure pcd report patch. > >Contributed-under: TianoCore Contribution Agreement 1.1 >Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com> >--- > BaseTools/Source/Python/build/BuildReport.py | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > >diff --git a/BaseTools/Source/Python/build/BuildReport.py >b/BaseTools/Source/Python/build/BuildReport.py >index d2ac044..d6e943d 100644 >--- a/BaseTools/Source/Python/build/BuildReport.py >+++ b/BaseTools/Source/Python/build/BuildReport.py >@@ -869,11 +869,11 @@ class PcdReport(object): > # Collect PCDs defined in DSC common section > # > self.DscPcdDefault = {} > for Pa in Wa.AutoGenObjectList: > for (TokenCName, TokenSpaceGuidCName) in Pa.Platform.Pcds: >- DscDefaultValue = Pa.Platform.Pcds[(TokenCName, >TokenSpaceGuidCName)].DefaultValue >+ DscDefaultValue = Pa.Platform.Pcds[(TokenCName, >TokenSpaceGuidCName)].DscDefaultValue > if DscDefaultValue: > self.DscPcdDefault[(TokenCName, TokenSpaceGuidCName)] = >DscDefaultValue > > def GenerateReport(self, File, ModulePcdSet): > if self.ConditionalPcds: >@@ -1032,21 +1032,21 @@ class PcdReport(object): > DecMatch = False > # > # Report PCD item according to their override relationship > # > if DecMatch and InfMatch: >- self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName, >IsStructure, DscMatch, DscDefaultValue, InfMatch, InfDefaultValue, >DecMatch, DecDefaultValue, ' ') >+ self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName, >IsStructure, DscMatch, DscDefaultValBak, InfMatch, InfDefaultValue, >DecMatch, DecDefaultValue, ' ') > elif BuildOptionMatch: >- self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName, >IsStructure, DscMatch, DscDefaultValue, InfMatch, InfDefaultValue, >DecMatch, DecDefaultValue, '*B') >+ self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName, >IsStructure, DscMatch, DscDefaultValBak, InfMatch, InfDefaultValue, >DecMatch, DecDefaultValue, '*B') > else: > if DscMatch: > if (Pcd.TokenCName, Key) in self.FdfPcdSet: >- self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName, >IsStructure, DscMatch, DscDefaultValue, InfMatch, InfDefaultValue, >DecMatch, DecDefaultValue, '*F') >+ self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName, >IsStructure, DscMatch, DscDefaultValBak, InfMatch, InfDefaultValue, >DecMatch, DecDefaultValue, '*F') > else: >- self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName, >IsStructure, DscMatch, DscDefaultValue, InfMatch, InfDefaultValue, >DecMatch, DecDefaultValue, '*P') >+ self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName, >IsStructure, DscMatch, DscDefaultValBak, InfMatch, InfDefaultValue, >DecMatch, DecDefaultValue, '*P') > else: >- self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName, >IsStructure, DscMatch, DscDefaultValue, InfMatch, InfDefaultValue, >DecMatch, DecDefaultValue, '*M') >+ self.PrintPcdValue(File, Pcd, PcdTokenCName, TypeName, >IsStructure, DscMatch, DscDefaultValBak, InfMatch, InfDefaultValue, >DecMatch, DecDefaultValue, '*M') > > if ModulePcdSet == None: > if IsStructure: > continue > if not TypeName in ('PATCH', 'FLAG', 'FIXED'): >-- >2.6.1.windows.1 > >_______________________________________________ >edk2-devel mailing list >edk2-devel@lists.01.org >https://lists.01.org/mailman/listinfo/edk2-devel _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
© 2016 - 2024 Red Hat, Inc.