* [Patch] DSC Spec: Update two typo and <VpdMaxSize> definition
@ 2018-06-06 7:08 Yonghong Zhu
2018-06-07 8:15 ` Gao, Liming
0 siblings, 1 reply; 2+ messages in thread
From: Yonghong Zhu @ 2018-06-06 7:08 UTC (permalink / raw)
To: edk2-devel; +Cc: Liming Gao, Michael Kinney, Kevin W Shaw
1. Update two typo
2. Correct the <VpdMaxSize> to use {<LongNum>} {<UINT32>}, this issue
was caused by flexible PCD value format extend.
Cc: Liming Gao <liming.gao@intel.com>
Cc: Michael Kinney <michael.d.kinney@intel.com>
Cc: Kevin W Shaw <kevin.w.shaw@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
---
3_edk_ii_dsc_file_format/310_pcd_sections.md | 4 ++--
3_edk_ii_dsc_file_format/311_[components]_sections.md | 12 +++++++-----
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/3_edk_ii_dsc_file_format/310_pcd_sections.md b/3_edk_ii_dsc_file_format/310_pcd_sections.md
index 4eaa15c..607c479 100644
--- a/3_edk_ii_dsc_file_format/310_pcd_sections.md
+++ b/3_edk_ii_dsc_file_format/310_pcd_sections.md
@@ -496,11 +496,11 @@ sections of the DSC file.
{<NumValUint32>} {<Expression>}
elif(pcddatumtype == "UINT64"):
{<NumValUint64>} {<Expression>}
else:
<VpdMaxSize>
-<VpdMaxSize> ::= <NumValUint32> [<FS> <StringValue>]
+<VpdMaxSize> ::= {<LongNum>} {<UINT32>} [<FS> <StringValue>]
<HiiEntry> ::= <PcdName> <FS> <HiiString> <Field2> <EOL>
<HiiString> ::= {<CArray>} {<UnicodeString>}
<Field2> ::= <FS> <VariableGuid> <FS> <VariableOffset> [<ValueField>]
<VariableGuid> ::= <CName>
<ValueField> ::= <FS> <DefaultValue> [<FS> <HiiAttrs>]
@@ -711,11 +711,11 @@ sections of the DSC file.
{<NumValUint32>} {<Expression>}
elif (pcddatumtype == "UINT64"):
{<NumValUint64>} {<Expression>}
else:
<VpdMaxSize>
-<VpdMaxSize> ::= <NumValUint32> [<FS> <StringValue>]
+<VpdMaxSize> ::= {<LongNum>} {<UINT32>} [<FS> <StringValue>]
<HiiEntry> ::= <PcdName> <FS> <HiiString> <Field2> <EOL>
<HiiString> ::= {<CArray>} {<UnicodeString>}
<Field2> ::= <FS> <VariableGuid> <FS> <VariableOffset> [<ValueField>]
<VariableGuid> ::= <CName>
<ValueField> ::= <FS> <DefaultValue> [<FS> <HiiAttrs>]
diff --git a/3_edk_ii_dsc_file_format/311_[components]_sections.md b/3_edk_ii_dsc_file_format/311_[components]_sections.md
index 5a3594a..7e24bac 100644
--- a/3_edk_ii_dsc_file_format/311_[components]_sections.md
+++ b/3_edk_ii_dsc_file_format/311_[components]_sections.md
@@ -1,9 +1,9 @@
<!--- @file
3.11 [Components] Sections
- Copyright (c) 2006-2017, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2006-2018, Intel Corporation. All rights reserved.<BR>
Redistribution and use in source (original document form) and 'compiled'
forms (converted to PDF, epub, HTML and other formats) with or without
modification, are permitted provided that the following conditions are met:
@@ -154,18 +154,20 @@ modules in a binary image (the FDF file describes that ordering).
<LibraryInstances>}
<LibraryInstances> ::= {<ClassInstanceMap>} {<NullLibInstances>}
<ClassInstanceMap> ::= <ClassName> <FS> <InfFilename> <EOL>
<ClassName> ::= (A-Z)(a-zA-Z0-9)*
<NullLibInstances> ::= "NULL" <FS> <InfFilename> <EOL>
-<PcdsFeatureFlag> ::= "<PcdsFeatureFlag>" <EOL> <PcdsFFEntries>*
+<PcdsFeatureFlag> ::= "<PcdsFeatureFlag>" <EOL>
+ <PcdsFFEntries>*
<PcdsFFEntries> ::= {<MacroDefinition>} {<IncludeStatement>} {<TS>
- <PcdsFeatureEntry>}
+ <PcdFeatureEntry>}
<PcdFeatureEntry> ::= <PcdName> <FS> <PcdFeatureValue> <EOL>
<PcdFeatureValue> ::= {<BoolType>} {<MACROVAL>} {<Expression>}
-<PcdsFixed> ::= "<PcdsFixedAtBuild>" <EOL> <PcdEntries>*
+<PcdsFixed> ::= "<PcdsFixedAtBuild>" <EOL>
+ <PcdEntries>*
<PcdEntries> ::= {<MacroDefinition>} {<IncludeStatement>}
- {<TS> <PcdsEntry>}
+ {<TS> <PcdEntry>}
<PcdsPatchable> ::= "<PcdsPatchableInModule>" <EOL>
<PcdEntries>*
<PcdEntry> ::= <PcdName> [<FS> <PcdValue>] <EOL>
<PcdValue> ::= if (pcddatumtype == "BOOLEAN"):
{<BoolType>} {<Expression>}
--
2.6.1.windows.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Patch] DSC Spec: Update two typo and <VpdMaxSize> definition
2018-06-06 7:08 [Patch] DSC Spec: Update two typo and <VpdMaxSize> definition Yonghong Zhu
@ 2018-06-07 8:15 ` Gao, Liming
0 siblings, 0 replies; 2+ messages in thread
From: Gao, Liming @ 2018-06-07 8:15 UTC (permalink / raw)
To: Zhu, Yonghong, edk2-devel@lists.01.org; +Cc: Kinney, Michael D, Shaw, Kevin W
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, June 06, 2018 3:09 PM
>To: edk2-devel@lists.01.org
>Cc: Kinney, Michael D <michael.d.kinney@intel.com>; Shaw, Kevin W
><kevin.w.shaw@intel.com>; Gao, Liming <liming.gao@intel.com>
>Subject: [edk2] [Patch] DSC Spec: Update two typo and <VpdMaxSize>
>definition
>
>1. Update two typo
>2. Correct the <VpdMaxSize> to use {<LongNum>} {<UINT32>}, this issue
>was caused by flexible PCD value format extend.
>
>Cc: Liming Gao <liming.gao@intel.com>
>Cc: Michael Kinney <michael.d.kinney@intel.com>
>Cc: Kevin W Shaw <kevin.w.shaw@intel.com>
>Contributed-under: TianoCore Contribution Agreement 1.1
>Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
>---
> 3_edk_ii_dsc_file_format/310_pcd_sections.md | 4 ++--
> 3_edk_ii_dsc_file_format/311_[components]_sections.md | 12 +++++++-----
> 2 files changed, 9 insertions(+), 7 deletions(-)
>
>diff --git a/3_edk_ii_dsc_file_format/310_pcd_sections.md
>b/3_edk_ii_dsc_file_format/310_pcd_sections.md
>index 4eaa15c..607c479 100644
>--- a/3_edk_ii_dsc_file_format/310_pcd_sections.md
>+++ b/3_edk_ii_dsc_file_format/310_pcd_sections.md
>@@ -496,11 +496,11 @@ sections of the DSC file.
> {<NumValUint32>} {<Expression>}
> elif(pcddatumtype == "UINT64"):
> {<NumValUint64>} {<Expression>}
> else:
> <VpdMaxSize>
>-<VpdMaxSize> ::= <NumValUint32> [<FS> <StringValue>]
>+<VpdMaxSize> ::= {<LongNum>} {<UINT32>} [<FS> <StringValue>]
> <HiiEntry> ::= <PcdName> <FS> <HiiString> <Field2> <EOL>
> <HiiString> ::= {<CArray>} {<UnicodeString>}
> <Field2> ::= <FS> <VariableGuid> <FS> <VariableOffset> [<ValueField>]
> <VariableGuid> ::= <CName>
> <ValueField> ::= <FS> <DefaultValue> [<FS> <HiiAttrs>]
>@@ -711,11 +711,11 @@ sections of the DSC file.
> {<NumValUint32>} {<Expression>}
> elif (pcddatumtype == "UINT64"):
> {<NumValUint64>} {<Expression>}
> else:
> <VpdMaxSize>
>-<VpdMaxSize> ::= <NumValUint32> [<FS> <StringValue>]
>+<VpdMaxSize> ::= {<LongNum>} {<UINT32>} [<FS> <StringValue>]
> <HiiEntry> ::= <PcdName> <FS> <HiiString> <Field2> <EOL>
> <HiiString> ::= {<CArray>} {<UnicodeString>}
> <Field2> ::= <FS> <VariableGuid> <FS> <VariableOffset> [<ValueField>]
> <VariableGuid> ::= <CName>
> <ValueField> ::= <FS> <DefaultValue> [<FS> <HiiAttrs>]
>diff --git a/3_edk_ii_dsc_file_format/311_[components]_sections.md
>b/3_edk_ii_dsc_file_format/311_[components]_sections.md
>index 5a3594a..7e24bac 100644
>--- a/3_edk_ii_dsc_file_format/311_[components]_sections.md
>+++ b/3_edk_ii_dsc_file_format/311_[components]_sections.md
>@@ -1,9 +1,9 @@
> <!--- @file
> 3.11 [Components] Sections
>
>- Copyright (c) 2006-2017, Intel Corporation. All rights reserved.<BR>
>+ Copyright (c) 2006-2018, Intel Corporation. All rights reserved.<BR>
>
> Redistribution and use in source (original document form) and 'compiled'
> forms (converted to PDF, epub, HTML and other formats) with or without
> modification, are permitted provided that the following conditions are met:
>
>@@ -154,18 +154,20 @@ modules in a binary image (the FDF file describes
>that ordering).
> <LibraryInstances>}
> <LibraryInstances> ::= {<ClassInstanceMap>} {<NullLibInstances>}
> <ClassInstanceMap> ::= <ClassName> <FS> <InfFilename> <EOL>
> <ClassName> ::= (A-Z)(a-zA-Z0-9)*
> <NullLibInstances> ::= "NULL" <FS> <InfFilename> <EOL>
>-<PcdsFeatureFlag> ::= "<PcdsFeatureFlag>" <EOL> <PcdsFFEntries>*
>+<PcdsFeatureFlag> ::= "<PcdsFeatureFlag>" <EOL>
>+ <PcdsFFEntries>*
> <PcdsFFEntries> ::= {<MacroDefinition>} {<IncludeStatement>} {<TS>
>- <PcdsFeatureEntry>}
>+ <PcdFeatureEntry>}
> <PcdFeatureEntry> ::= <PcdName> <FS> <PcdFeatureValue> <EOL>
> <PcdFeatureValue> ::= {<BoolType>} {<MACROVAL>} {<Expression>}
>-<PcdsFixed> ::= "<PcdsFixedAtBuild>" <EOL> <PcdEntries>*
>+<PcdsFixed> ::= "<PcdsFixedAtBuild>" <EOL>
>+ <PcdEntries>*
> <PcdEntries> ::= {<MacroDefinition>} {<IncludeStatement>}
>- {<TS> <PcdsEntry>}
>+ {<TS> <PcdEntry>}
> <PcdsPatchable> ::= "<PcdsPatchableInModule>" <EOL>
> <PcdEntries>*
> <PcdEntry> ::= <PcdName> [<FS> <PcdValue>] <EOL>
> <PcdValue> ::= if (pcddatumtype == "BOOLEAN"):
> {<BoolType>} {<Expression>}
>--
>2.6.1.windows.1
>
>_______________________________________________
>edk2-devel mailing list
>edk2-devel@lists.01.org
>https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-06-07 8:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-06 7:08 [Patch] DSC Spec: Update two typo and <VpdMaxSize> definition Yonghong Zhu
2018-06-07 8:15 ` Gao, Liming
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox