public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Gao, Liming" <liming.gao@intel.com>
To: "Zhu, Yonghong" <yonghong.zhu@intel.com>,
	"edk2-devel@lists.01.org" <edk2-devel@lists.01.org>
Subject: Re: [Patch] BaseTools: Add back the cc71d8 version's fix
Date: Mon, 8 Jan 2018 06:11:30 +0000	[thread overview]
Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E1A0326@SHSMSX104.ccr.corp.intel.com> (raw)
In-Reply-To: <1515057893-9536-1-git-send-email-yonghong.zhu@intel.com>

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


      reply	other threads:[~2018-01-08  6:06 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-04  9:24 [Patch] BaseTools: Add back the cc71d8 version's fix Yonghong Zhu
2018-01-08  6:11 ` Gao, Liming [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4A89E2EF3DFEDB4C8BFDE51014F606A14E1A0326@SHSMSX104.ccr.corp.intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox