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: Fix a bug for Size incorrect of Void* Fixatbuild Pcd
Date: Mon, 9 Apr 2018 05:44:16 +0000 [thread overview]
Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E20A4E6@SHSMSX104.ccr.corp.intel.com> (raw)
In-Reply-To: <1521784651-7280-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: Friday, March 23, 2018 1:58 PM
>To: edk2-devel@lists.01.org
>Subject: [edk2] [Patch] BaseTools: Fix a bug for Size incorrect of Void*
>Fixatbuild Pcd
>
>when driver link library and there have pcd override in DSC component
>section, in the library autogen file, the pcd's size is incorrect, the
>size value is from DSC [pcd] section, but not from the override pcd
>value that in the [component] section.
>
>Contributed-under: TianoCore Contribution Agreement 1.1
>Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
>---
> BaseTools/Source/Python/AutoGen/AutoGen.py | 4 ++--
> BaseTools/Source/Python/AutoGen/GenC.py | 2 ++
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
>diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py
>b/BaseTools/Source/Python/AutoGen/AutoGen.py
>index 439e360..8682217 100644
>--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
>+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
>@@ -1281,11 +1281,11 @@ class PlatformAutoGen(AutoGen):
> def CollectFixedAtBuildPcds(self):
> for LibAuto in self.LibraryAutoGenList:
> FixedAtBuildPcds = {}
> ShareFixedAtBuildPcdsSameValue = {}
> for Module in LibAuto._ReferenceModules:
>- for Pcd in Module.FixedAtBuildPcds + LibAuto.FixedAtBuildPcds:
>+ for Pcd in Module.FixedAtBuildPcds:
> key = ".".join((Pcd.TokenSpaceGuidCName,Pcd.TokenCName))
> if key not in FixedAtBuildPcds:
> ShareFixedAtBuildPcdsSameValue[key] = True
> FixedAtBuildPcds[key] = Pcd.DefaultValue
> else:
>@@ -1298,11 +1298,11 @@ class PlatformAutoGen(AutoGen):
> else:
> DscPcd =
>self.NonDynamicPcdDict[(Pcd.TokenCName,Pcd.TokenSpaceGuidCName)]
> if DscPcd.Type != "FixedAtBuild":
> continue
> if key in ShareFixedAtBuildPcdsSameValue and
>ShareFixedAtBuildPcdsSameValue[key]:
>- LibAuto.ConstPcd[key] = Pcd.DefaultValue
>+ LibAuto.ConstPcd[key] = FixedAtBuildPcds[key]
>
> def CollectVariables(self, DynamicPcdSet):
>
> VpdRegionSize = 0
> VpdRegionBase = 0
>diff --git a/BaseTools/Source/Python/AutoGen/GenC.py
>b/BaseTools/Source/Python/AutoGen/GenC.py
>index fbf892f..0509a9f 100644
>--- a/BaseTools/Source/Python/AutoGen/GenC.py
>+++ b/BaseTools/Source/Python/AutoGen/GenC.py
>@@ -1354,10 +1354,12 @@ def CreateLibraryPcdCode(Info, AutoGenC,
>AutoGenH, Pcd):
> AutoGenH.Append('//#define %s ASSERT(FALSE) // It is not allowed to
>set value for a FIXED_AT_BUILD PCD\n' % SetModeName)
>
> ConstFixedPcd = False
> if PcdItemType == TAB_PCDS_FIXED_AT_BUILD and (key in Info.ConstPcd
>or (Info.IsLibrary and not Info._ReferenceModules)):
> ConstFixedPcd = True
>+ if key in Info.ConstPcd:
>+ Pcd.DefaultValue = Info.ConstPcd[key]
> if Pcd.DatumType not in ['UINT8', 'UINT16', 'UINT32', 'UINT64',
>'BOOLEAN']:
> AutoGenH.Append('#define
>_PCD_VALUE_%s %s%s\n' %(TokenCName, Type, PcdVariableName))
> else:
> AutoGenH.Append('#define _PCD_VALUE_%s %s\n' %(TokenCName,
>Pcd.DefaultValue))
> PcdDataSize = GetPcdSize(Pcd)
>--
>2.6.1.windows.1
>
>_______________________________________________
>edk2-devel mailing list
>edk2-devel@lists.01.org
>https://lists.01.org/mailman/listinfo/edk2-devel
prev parent reply other threads:[~2018-04-09 5:44 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-23 5:57 [Patch] BaseTools: Fix a bug for Size incorrect of Void* Fixatbuild Pcd Yonghong Zhu
2018-04-09 5:44 ` 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=4A89E2EF3DFEDB4C8BFDE51014F606A14E20A4E6@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