From: Liming Gao <liming.gao@intel.com>
To: edk2-devel@lists.01.org
Subject: [Patch] DSC Spec: Update SkuId and DefaultStore name as C name style
Date: Tue, 7 Aug 2018 17:46:49 +0800 [thread overview]
Message-ID: <1533635209-8076-1-git-send-email-liming.gao@intel.com> (raw)
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
---
3_edk_ii_dsc_file_format/310_pcd_sections.md | 15 +++++----------
3_edk_ii_dsc_file_format/313_[defaultstores]_section.md | 3 +--
3_edk_ii_dsc_file_format/35_[defines]_section.md | 2 +-
3_edk_ii_dsc_file_format/37_[skuids]_section.md | 3 +--
4 files changed, 8 insertions(+), 15 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 1879923..741a620 100644
--- a/3_edk_ii_dsc_file_format/310_pcd_sections.md
+++ b/3_edk_ii_dsc_file_format/310_pcd_sections.md
@@ -138,8 +138,7 @@ file.
<attribs> ::= <attrs> ["," <TS> "PcdsFeatureFlag" <attrs>]*
<attrs> ::= "." <arch> ["." <SkuIds>]
<SkuIdS> ::= <Keyword> [<FS> <Keyword>]*
-<Keyword> ::= <UiName>
-<UiName> ::= <Word>
+<Keyword> ::= <CName>
<PcdEntry> ::= <TS> <PcdName> <FS> <PcdValue> <EOL>
<PcdValue> ::= {<BoolType>} {<MACROVAL>} {<Expression>}
```
@@ -219,8 +218,7 @@ fields that are separated by the pipe character, "|".
<attribs> ::= <attrs> ["," <TS> "PcdsFixedAtBuild" <attrs>]*
<attrs> ::= "." <arch> ["." <SkuIds>]
<SkuIdS> ::= <Keyword> [<FS> <Keyword>]*
-<Keyword> ::= <UiName>
-<UiName> ::= <Word>
+<Keyword> ::= <CName>
<FabStatements> ::= {<MacroDefinition>} {<IncludeStatement>} {<PcdEntry>} {<PcdFieldEntry>}
<PcdEntry> ::= <TS> <PcdName> [<FS> <PcdValue>] <EOL>
<PcdValue> ::= if (pcddatumtype == "BOOLEAN"):
@@ -327,8 +325,7 @@ of the DSC file.
<attrs>]*
<attrs> ::= "." <arch> ["." <SkuIds>]
<SkuIdS> ::= <Keyword> [<FS> <Keyword>]*
-<Keyword> ::= <UiName>
-<UiName> ::= <Word>
+<Keyword> ::= <CName>
<PimStatements> ::= {<MacroDefinition>} {<IncludeStatement>} {<PcdEntry>} {<PcdFieldEntry>}
<PcdEntry> ::= <TS> <PcdName> [<FS> <PcdValue>] <EOL>
<PcdValue> ::= if (pcddatumtype == "BOOLEAN"):
@@ -466,8 +463,7 @@ sections of the DSC file.
<phattrs> ::= "." <arch> ["." <SkuIds>]["." <DefaultStore>]
<SkuIdS> ::= <Keyword> [<FS> <Keyword>]*
<DefaultStore> ::= <Keyword>
-<Keyword> ::= <UiName>
-<UiName> ::= <Word>
+<Keyword> ::= <CName>
<MinEntry> ::= <PcdName> [<FS> <PcdValue>] <EOL>
<PcdValue> ::= if (pcddatumtype == "BOOLEAN"):
{<BoolType>} {<Expression>}
@@ -681,8 +677,7 @@ sections of the DSC file.
<phattrs> ::= "." <arch> ["." <SkuIds>]["." <DefaultStore>]
<SkuIdS> ::= <Keyword> [<FS> <Keyword>]*
<DefaultStore> ::= <Keyword>
-<Keyword> ::= <UiName>
-<UiName> ::= <Word>
+<Keyword> ::= <CName>
<MinEntry> ::= <PcdName> [<FS> <PcdValue>] <EOL>
<PcdValue> ::= if (pcddatumtype == "BOOLEAN"):
{<BoolType>} {<Expression>}
diff --git a/3_edk_ii_dsc_file_format/313_[defaultstores]_section.md b/3_edk_ii_dsc_file_format/313_[defaultstores]_section.md
index 614ed01..23dec7d 100644
--- a/3_edk_ii_dsc_file_format/313_[defaultstores]_section.md
+++ b/3_edk_ii_dsc_file_format/313_[defaultstores]_section.md
@@ -47,8 +47,7 @@ be applied in PcdsDynamicHii/PcdsDynamicExHii section.
```c
<DefaultStore> ::= "[DefaultStores]" <EOL>
{<Statement>*}
-<Statement> ::= <TS> <Number> <FS> <UiName> <EOL>
-<UiName> ::= <Word>
+<Statement> ::= <TS> <Number> <FS> <CName> <EOL>
```
#### Example
diff --git a/3_edk_ii_dsc_file_format/35_[defines]_section.md b/3_edk_ii_dsc_file_format/35_[defines]_section.md
index 3961e4c..7337415 100644
--- a/3_edk_ii_dsc_file_format/35_[defines]_section.md
+++ b/3_edk_ii_dsc_file_format/35_[defines]_section.md
@@ -131,7 +131,7 @@ The `!include` statement may be used in a `[Defines]` section.
<IncludeStatement>*
<MacroDefinition>*
<SpecValue> ::= {<HexVersion>} {(0-9)+ "." (0-9)+}
-<SkuUiName> ::= <Word> [<FS> <Word>]*
+<SkuUiName> ::= <CName> [<FS> <CName>]*
<ArchList> ::= <arch> [<FS> <arch>]*
<AddressStmts> ::= "FIX_LOAD_TOP_MEMORY_ADDRESS" <Eq> <Address> <EOL>
<Address> ::= <NumValUint64>
diff --git a/3_edk_ii_dsc_file_format/37_[skuids]_section.md b/3_edk_ii_dsc_file_format/37_[skuids]_section.md
index 8e70b33..4c4d990 100644
--- a/3_edk_ii_dsc_file_format/37_[skuids]_section.md
+++ b/3_edk_ii_dsc_file_format/37_[skuids]_section.md
@@ -52,8 +52,7 @@ The `!include` file can only contain an ASCII (not Unicode) list of
```c
<SkuId> ::= "[SkuIds]" <EOL>
{<Statement>*} {<IncludeStatement>}
-<Statement> ::= <TS> <Number> <FS> <UiName> [<FS> <UiName>] <EOL>
-<UiName> ::= <Word>
+<Statement> ::= <TS> <Number> <FS> <CName> [<FS> <CName>] <EOL>
```
#### Example
--
2.8.0.windows.1
next reply other threads:[~2018-08-07 9:47 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-07 9:46 Liming Gao [this message]
2018-08-07 12:16 ` [Patch] DSC Spec: Update SkuId and DefaultStore name as C name style Zhu, Yonghong
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=1533635209-8076-1-git-send-email-liming.gao@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