* [PATCH] IntelFsp2Pkg/GenCfgOpt.py: support FixedAtBuild PCD
@ 2018-09-26 3:05 Chasel, Chiu
2018-09-26 3:13 ` Yao, Jiewen
0 siblings, 1 reply; 4+ messages in thread
From: Chasel, Chiu @ 2018-09-26 3:05 UTC (permalink / raw)
To: edk2-devel; +Cc: Jiewen Yao, Gao Liming, Zhu Yonghong, Chasel Chiu
FixedAtBuild PCD is suggested to be used instead
of FeatureFlag PCD so extend this tool to support.
Also skipped PCDs which commented out by '#'.
Cc: Jiewen Yao <Jiewen.yao@intel.com>
Cc: Gao Liming <liming.gao@intel.com>
Cc: Zhu Yonghong <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Chasel Chiu <chasel.chiu@intel.com>
---
IntelFsp2Pkg/Tools/GenCfgOpt.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/IntelFsp2Pkg/Tools/GenCfgOpt.py b/IntelFsp2Pkg/Tools/GenCfgOpt.py
index c9b7bc5373..32cf63ff03 100644
--- a/IntelFsp2Pkg/Tools/GenCfgOpt.py
+++ b/IntelFsp2Pkg/Tools/GenCfgOpt.py
@@ -1,6 +1,6 @@
## @ GenCfgOpt.py
#
-# Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>
# This program and the accompanying materials are licensed and made available under
# the terms and conditions of the BSD License that accompanies this distribution.
# The full text of the license may be found at
@@ -449,7 +449,7 @@ EndList
IsUpdSect = False
if Match.group(1).lower() == "Defines".lower():
IsDefSect = True
- if Match.group(1).lower() == "PcdsFeatureFlag".lower():
+ if (Match.group(1).lower() == "PcdsFeatureFlag".lower() or Match.group(1).lower() == "PcdsFixedAtBuild".lower()):
IsPcdSect = True
elif Match.group(1).lower() == "PcdsDynamicVpd.Upd".lower():
ConfigDict = {}
@@ -491,7 +491,7 @@ EndList
IfStack.append(Result)
ElifStack.append(0)
else:
- Match = re.match("!(if|elseif)\s+(.+)", DscLine)
+ Match = re.match("!(if|elseif)\s+(.+)", DscLine.split("#")[0])
if Match:
Result = self.EvaluateExpress(Match.group(2))
if Match.group(1) == "if":
--
2.13.3.windows.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] IntelFsp2Pkg/GenCfgOpt.py: support FixedAtBuild PCD
2018-09-26 3:05 Chasel, Chiu
@ 2018-09-26 3:13 ` Yao, Jiewen
0 siblings, 0 replies; 4+ messages in thread
From: Yao, Jiewen @ 2018-09-26 3:13 UTC (permalink / raw)
To: Chiu, Chasel, edk2-devel@lists.01.org; +Cc: Gao, Liming, Zhu, Yonghong
Hi Chasel
Would you please add the unit test information?
Also, please file a Bugzilla for that.
Thank you
Yao Jiewen
> -----Original Message-----
> From: Chiu, Chasel
> Sent: Wednesday, September 26, 2018 11:05 AM
> To: edk2-devel@lists.01.org
> Cc: Yao, Jiewen <jiewen.yao@intel.com>; Gao, Liming
> <liming.gao@intel.com>; Zhu, Yonghong <yonghong.zhu@intel.com>; Chiu,
> Chasel <chasel.chiu@intel.com>
> Subject: [PATCH] IntelFsp2Pkg/GenCfgOpt.py: support FixedAtBuild PCD
>
> FixedAtBuild PCD is suggested to be used instead
> of FeatureFlag PCD so extend this tool to support.
> Also skipped PCDs which commented out by '#'.
>
> Cc: Jiewen Yao <Jiewen.yao@intel.com>
> Cc: Gao Liming <liming.gao@intel.com>
> Cc: Zhu Yonghong <yonghong.zhu@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Chasel Chiu <chasel.chiu@intel.com>
> ---
> IntelFsp2Pkg/Tools/GenCfgOpt.py | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/IntelFsp2Pkg/Tools/GenCfgOpt.py
> b/IntelFsp2Pkg/Tools/GenCfgOpt.py
> index c9b7bc5373..32cf63ff03 100644
> --- a/IntelFsp2Pkg/Tools/GenCfgOpt.py
> +++ b/IntelFsp2Pkg/Tools/GenCfgOpt.py
> @@ -1,6 +1,6 @@
> ## @ GenCfgOpt.py
> #
> -# Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>
> # This program and the accompanying materials are licensed and made
> available under
> # the terms and conditions of the BSD License that accompanies this
> distribution.
> # The full text of the license may be found at
> @@ -449,7 +449,7 @@ EndList
> IsUpdSect = False
> if Match.group(1).lower() == "Defines".lower():
> IsDefSect = True
> - if Match.group(1).lower() ==
> "PcdsFeatureFlag".lower():
> + if (Match.group(1).lower() ==
> "PcdsFeatureFlag".lower() or Match.group(1).lower() ==
> "PcdsFixedAtBuild".lower()):
> IsPcdSect = True
> elif Match.group(1).lower() ==
> "PcdsDynamicVpd.Upd".lower():
> ConfigDict = {}
> @@ -491,7 +491,7 @@ EndList
> IfStack.append(Result)
> ElifStack.append(0)
> else:
> - Match = re.match("!(if|elseif)\s+(.+)",
> DscLine)
> + Match = re.match("!(if|elseif)\s+(.+)",
> DscLine.split("#")[0])
> if Match:
> Result =
> self.EvaluateExpress(Match.group(2))
> if Match.group(1) == "if":
> --
> 2.13.3.windows.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] IntelFsp2Pkg/GenCfgOpt.py: support FixedAtBuild PCD
@ 2018-09-26 5:24 Chasel, Chiu
2018-09-26 7:23 ` Yao, Jiewen
0 siblings, 1 reply; 4+ messages in thread
From: Chasel, Chiu @ 2018-09-26 5:24 UTC (permalink / raw)
To: edk2-devel; +Cc: Jiewen Yao, Gao Liming, Zhu Yonghong, Chasel Chiu
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1210
FixedAtBuild PCD is suggested to be used instead
of FeatureFlag PCD so extend this tool to support.
Also skipped PCDs which commented out by '#'.
Test: Verified with FixedAtBuild PCD for including or
excluding lines in generated UPD header files successfully.
Cc: Jiewen Yao <Jiewen.yao@intel.com>
Cc: Gao Liming <liming.gao@intel.com>
Cc: Zhu Yonghong <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Chasel Chiu <chasel.chiu@intel.com>
---
IntelFsp2Pkg/Tools/GenCfgOpt.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/IntelFsp2Pkg/Tools/GenCfgOpt.py b/IntelFsp2Pkg/Tools/GenCfgOpt.py
index c9b7bc5373..32cf63ff03 100644
--- a/IntelFsp2Pkg/Tools/GenCfgOpt.py
+++ b/IntelFsp2Pkg/Tools/GenCfgOpt.py
@@ -1,6 +1,6 @@
## @ GenCfgOpt.py
#
-# Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>
# This program and the accompanying materials are licensed and made available under
# the terms and conditions of the BSD License that accompanies this distribution.
# The full text of the license may be found at
@@ -449,7 +449,7 @@ EndList
IsUpdSect = False
if Match.group(1).lower() == "Defines".lower():
IsDefSect = True
- if Match.group(1).lower() == "PcdsFeatureFlag".lower():
+ if (Match.group(1).lower() == "PcdsFeatureFlag".lower() or Match.group(1).lower() == "PcdsFixedAtBuild".lower()):
IsPcdSect = True
elif Match.group(1).lower() == "PcdsDynamicVpd.Upd".lower():
ConfigDict = {}
@@ -491,7 +491,7 @@ EndList
IfStack.append(Result)
ElifStack.append(0)
else:
- Match = re.match("!(if|elseif)\s+(.+)", DscLine)
+ Match = re.match("!(if|elseif)\s+(.+)", DscLine.split("#")[0])
if Match:
Result = self.EvaluateExpress(Match.group(2))
if Match.group(1) == "if":
--
2.13.3.windows.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] IntelFsp2Pkg/GenCfgOpt.py: support FixedAtBuild PCD
2018-09-26 5:24 [PATCH] IntelFsp2Pkg/GenCfgOpt.py: support FixedAtBuild PCD Chasel, Chiu
@ 2018-09-26 7:23 ` Yao, Jiewen
0 siblings, 0 replies; 4+ messages in thread
From: Yao, Jiewen @ 2018-09-26 7:23 UTC (permalink / raw)
To: Chiu, Chasel, edk2-devel@lists.01.org; +Cc: Gao, Liming
Reviewed-by: Jiewen.yao@intel.com
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Chasel, Chiu
> Sent: Wednesday, September 26, 2018 1:25 PM
> To: edk2-devel@lists.01.org
> Cc: Yao, Jiewen <jiewen.yao@intel.com>; Gao, Liming
> <liming.gao@intel.com>
> Subject: [edk2] [PATCH] IntelFsp2Pkg/GenCfgOpt.py: support FixedAtBuild
> PCD
>
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1210
>
> FixedAtBuild PCD is suggested to be used instead
> of FeatureFlag PCD so extend this tool to support.
> Also skipped PCDs which commented out by '#'.
>
> Test: Verified with FixedAtBuild PCD for including or
> excluding lines in generated UPD header files successfully.
>
> Cc: Jiewen Yao <Jiewen.yao@intel.com>
> Cc: Gao Liming <liming.gao@intel.com>
> Cc: Zhu Yonghong <yonghong.zhu@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Chasel Chiu <chasel.chiu@intel.com>
> ---
> IntelFsp2Pkg/Tools/GenCfgOpt.py | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/IntelFsp2Pkg/Tools/GenCfgOpt.py
> b/IntelFsp2Pkg/Tools/GenCfgOpt.py
> index c9b7bc5373..32cf63ff03 100644
> --- a/IntelFsp2Pkg/Tools/GenCfgOpt.py
> +++ b/IntelFsp2Pkg/Tools/GenCfgOpt.py
> @@ -1,6 +1,6 @@
> ## @ GenCfgOpt.py
> #
> -# Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>
> # This program and the accompanying materials are licensed and made
> available under
> # the terms and conditions of the BSD License that accompanies this
> distribution.
> # The full text of the license may be found at
> @@ -449,7 +449,7 @@ EndList
> IsUpdSect = False
> if Match.group(1).lower() == "Defines".lower():
> IsDefSect = True
> - if Match.group(1).lower() ==
> "PcdsFeatureFlag".lower():
> + if (Match.group(1).lower() ==
> "PcdsFeatureFlag".lower() or Match.group(1).lower() ==
> "PcdsFixedAtBuild".lower()):
> IsPcdSect = True
> elif Match.group(1).lower() ==
> "PcdsDynamicVpd.Upd".lower():
> ConfigDict = {}
> @@ -491,7 +491,7 @@ EndList
> IfStack.append(Result)
> ElifStack.append(0)
> else:
> - Match = re.match("!(if|elseif)\s+(.+)",
> DscLine)
> + Match = re.match("!(if|elseif)\s+(.+)",
> DscLine.split("#")[0])
> if Match:
> Result =
> self.EvaluateExpress(Match.group(2))
> if Match.group(1) == "if":
> --
> 2.13.3.windows.1
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-09-26 7:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-26 5:24 [PATCH] IntelFsp2Pkg/GenCfgOpt.py: support FixedAtBuild PCD Chasel, Chiu
2018-09-26 7:23 ` Yao, Jiewen
-- strict thread matches above, loose matches on Subject: below --
2018-09-26 3:05 Chasel, Chiu
2018-09-26 3:13 ` Yao, Jiewen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox