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 --pcd used in ConditionalStatement calculate
Date: Thu, 8 Mar 2018 01:52:34 +0000 [thread overview]
Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E1D90A2@SHSMSX104.ccr.corp.intel.com> (raw)
In-Reply-To: <1520411648-5908-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: Wednesday, March 7, 2018 4:34 PM
> To: edk2-devel@lists.01.org
> Subject: [edk2] [Patch] BaseTools: Fix a bug for --pcd used in ConditionalStatement calculate
>
> Move the GlobalData.BuildOptionPcd before FdfParser() function
>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
> ---
> BaseTools/Source/Python/GenFds/GenFds.py | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/BaseTools/Source/Python/GenFds/GenFds.py b/BaseTools/Source/Python/GenFds/GenFds.py
> index 4c56cbb..e3cc77f 100644
> --- a/BaseTools/Source/Python/GenFds/GenFds.py
> +++ b/BaseTools/Source/Python/GenFds/GenFds.py
> @@ -268,10 +268,12 @@ def main():
>
> if not os.path.exists(OutputDir):
> EdkLogger.error("GenFds", FILE_NOT_FOUND, ExtraData=OutputDir)
> GenFdsGlobalVariable.OutputDirDict[Key] = OutputDir
>
> + GlobalData.BuildOptionPcd = Options.OptionPcd if Options.OptionPcd else {}
> +
> """ Parse Fdf file, has to place after build Workspace as FDF may contain macros from DSC file """
> FdfParserObj = FdfParser.FdfParser(FdfFilename)
> FdfParserObj.ParseFile()
>
> if FdfParserObj.CycleReferenceCheck():
> @@ -324,11 +326,10 @@ def main():
> EdkLogger.error("GenFds", FORMAT_INVALID, "The FV %s's region is specified in
> multiple FD with different value." %FvObj.UiFvName)
> else:
> FvObj.FvRegionInFD = RegionObj.Size
> RegionObj.BlockInfoOfRegion(FdObj.BlockSizeList, FvObj)
>
> - GlobalData.BuildOptionPcd = Options.OptionPcd if Options.OptionPcd else {}
> """Call GenFds"""
> GenFds.GenFd('', FdfParserObj, BuildWorkSpace, ArchList)
>
> """Generate GUID cross reference file"""
> GenFds.GenerateGuidXRefFile(BuildWorkSpace, ArchList, FdfParserObj)
> --
> 2.6.1.windows.1
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
next prev parent reply other threads:[~2018-03-08 1:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-07 8:34 [Patch] BaseTools: Fix a bug for --pcd used in ConditionalStatement calculate Yonghong Zhu
2018-03-08 1:52 ` Gao, Liming [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-03-09 7:19 Yonghong Zhu
2018-03-09 8:22 ` Gao, Liming
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=4A89E2EF3DFEDB4C8BFDE51014F606A14E1D90A2@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