Reviewed-by: Liming Gao <[email protected]>
>-----Original Message----- >From: edk2-devel [mailto:[email protected]] On Behalf Of >Yonghong Zhu >Sent: Wednesday, June 06, 2018 3:09 PM >To: [email protected] >Cc: Kinney, Michael D <[email protected]>; Shaw, Kevin W ><[email protected]>; Gao, Liming <[email protected]> >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 <[email protected]> >Cc: Michael Kinney <[email protected]> >Cc: Kevin W Shaw <[email protected]> >Contributed-under: TianoCore Contribution Agreement 1.1 >Signed-off-by: Yonghong Zhu <[email protected]> >--- > 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 >[email protected] >https://lists.01.org/mailman/listinfo/edk2-devel _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
