From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <liming.gao@intel.com>
Received-SPF: Pass (sender SPF authorized) identity=mailfrom;
 client-ip=134.134.136.100; helo=mga07.intel.com;
 envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org 
Received: from mga07.intel.com (mga07.intel.com [134.134.136.100])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by ml01.01.org (Postfix) with ESMTPS id A899F21180F4F
 for <edk2-devel@lists.01.org>; Thu, 25 Oct 2018 06:26:26 -0700 (PDT)
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from orsmga005.jf.intel.com ([10.7.209.41])
 by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;
 25 Oct 2018 06:26:26 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.54,424,1534834800"; d="scan'208";a="268715112"
Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206])
 by orsmga005.jf.intel.com with ESMTP; 25 Oct 2018 06:26:26 -0700
Received: from FMSMSX110.amr.corp.intel.com (10.18.116.10) by
 FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS)
 id 14.3.319.2; Thu, 25 Oct 2018 06:26:25 -0700
Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by
 fmsmsx110.amr.corp.intel.com (10.18.116.10) with Microsoft SMTP Server (TLS)
 id 14.3.319.2; Thu, 25 Oct 2018 06:26:25 -0700
Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.117]) by
 SHSMSX151.ccr.corp.intel.com ([169.254.3.199]) with mapi id 14.03.0415.000;
 Thu, 25 Oct 2018 21:26:22 +0800
From: "Gao, Liming" <liming.gao@intel.com>
To: "Zhu, Yonghong" <yonghong.zhu@intel.com>, "edk2-devel@lists.01.org"
 <edk2-devel@lists.01.org>
CC: "Kinney, Michael D" <michael.d.kinney@intel.com>, "Shaw, Kevin W"
 <kevin.w.shaw@intel.com>, Eugene <eugene@hp.com>
Thread-Topic: [Patch] FDF spec: Add PI1.5 standalone SMM support in FDF file
Thread-Index: AQHUbGATwPaU/X5QMEusmhthGc23a6Uv86nA
Date: Thu, 25 Oct 2018 13:26:21 +0000
Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E35E5BD@SHSMSX104.ccr.corp.intel.com>
References: <1540471293-14776-1-git-send-email-yonghong.zhu@intel.com>
In-Reply-To: <1540471293-14776-1-git-send-email-yonghong.zhu@intel.com>
Accept-Language: en-US
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
x-ctpclassification: CTP_NT
x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMDhlYTlkYmItYzI2My00ZDliLWE4ZWEtZjk5YjA2ZjU4ZDY0IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiWHFTbndvM0VwRDd0M0kzbllpc1lqVlcrOUE4ZzBrY001amZUZ1FqRCs2MlplU1R2M2lEM0FFVjVZMXVFTmRoNyJ9
dlp-product: dlpe-windows
dlp-version: 11.0.400.15
dlp-reaction: no-action
x-originating-ip: [10.239.127.40]
MIME-Version: 1.0
Subject: Re: [Patch] FDF spec: Add PI1.5 standalone SMM support in FDF file
X-BeenThere: edk2-devel@lists.01.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: EDK II Development  <edk2-devel.lists.01.org>
List-Unsubscribe: <https://lists.01.org/mailman/options/edk2-devel>,
 <mailto:edk2-devel-request@lists.01.org?subject=unsubscribe>
List-Archive: <http://lists.01.org/pipermail/edk2-devel/>
List-Post: <mailto:edk2-devel@lists.01.org>
List-Help: <mailto:edk2-devel-request@lists.01.org?subject=help>
List-Subscribe: <https://lists.01.org/mailman/listinfo/edk2-devel>,
 <mailto:edk2-devel-request@lists.01.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Oct 2018 13:26:26 -0000
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable

Reviewed-by: Liming Gao <liming.gao@intel.com>

> -----Original Message-----
> From: Zhu, Yonghong
> Sent: Thursday, October 25, 2018 8:42 PM
> To: edk2-devel@lists.01.org
> Cc: Gao, Liming <liming.gao@intel.com>; Kinney, Michael D <michael.d.kinn=
ey@intel.com>; Shaw, Kevin W <kevin.w.shaw@intel.com>;
> Cohen; Eugene <eugene@hp.com>
> Subject: [Patch] FDF spec: Add PI1.5 standalone SMM support in FDF file
>=20
> V2: Update it to MM_CORE_STANDALONE and MM_STANDALONE
>=20
> Fixes: https://bugzilla.tianocore.org/show_bug.cgi?id=3D551
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Michael Kinney <michael.d.kinney@intel.com>
> Cc: Kevin W Shaw <kevin.w.shaw@intel.com>
> Cc: Cohen, Eugene <eugene@hp.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
> ---
>  1_introduction/12_terms.md                        |  9 +++++----
>  2_fdf_design_discussion/25_[fv]_sections.md       |  6 +++++-
>  3_edk_ii_fdf_file_format/32_fdf_definition.md     |  1 +
>  3_edk_ii_fdf_file_format/36_[fv]_sections.md      | 19 ++++++++++++-----=
--
>  3_edk_ii_fdf_file_format/37_[capsule]_sections.md | 22 ++++++++++++++---=
-----
>  3_edk_ii_fdf_file_format/39_[rule]_sections.md    | 22 +++++++++++++----=
-----
>  README.md                                         |  1 +
>  7 files changed, 51 insertions(+), 29 deletions(-)
>=20
> diff --git a/1_introduction/12_terms.md b/1_introduction/12_terms.md
> index af33faa..abb857b 100644
> --- a/1_introduction/12_terms.md
> +++ b/1_introduction/12_terms.md
> @@ -1,9 +1,9 @@
>  <!--- @file
>    1.2 Terms
>=20
> -  Copyright (c) 2006-2017, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2006-2018, Intel Corporation. All rights reserved.<BR>
>=20
>    Redistribution and use in source (original document form) and 'compile=
d'
>    forms (converted to PDF, epub, HTML and other formats) with or without
>    modification, are permitted provided that the following conditions are=
 met:
>=20
> @@ -218,13 +218,14 @@ A module is either an executable image or a library=
 instance. For a list of
>  module types supported by this package, see module type.
>=20
>  **Module Type**
>=20
>  All libraries and components belong to one of the following module types=
: `BASE`,
> -`SEC`, `PEI_CORE`, `PEIM`, `SMM_CORE`, `DXE_CORE`, `DXE_DRIVER`, `DXE_RU=
NTIME_DRIVER`,
> -`DXE_SMM_DRIVER`, `DXE_SAL_DRIVER`, `UEFI_DRIVER`, or `UEFI_APPLICATION`=
. These
> -definitions provide a framework that is consistent with a similar set of
> +`SEC`, `PEI_CORE`, `PEIM`, `SMM_CORE`, `MM_CORE_STANDALONE`, `DXE_CORE`,
> +`DXE_DRIVER`, `DXE_RUNTIME_DRIVER`, `DXE_SMM_DRIVER`, `MM_STANDALONE`,
> +`DXE_SAL_DRIVER`, `UEFI_DRIVER`, or `UEFI_APPLICATION`.
> +These definitions provide a framework that is consistent with a similar =
set of
>  requirements. A module that is of module type BASE, depends only on head=
ers and
>  libraries provided in the MDE, while a module that is of module type DXE=
_DRIVER
>  depends on common DXE components. For a definition of the various module=
 types,
>  see module type. The EDK II build system also permits modules of type
>  USER_DEFINED. These modules will not be processed by the EDK II Build sy=
stem.
> diff --git a/2_fdf_design_discussion/25_[fv]_sections.md b/2_fdf_design_d=
iscussion/25_[fv]_sections.md
> index 7b50017..4d3566d 100644
> --- a/2_fdf_design_discussion/25_[fv]_sections.md
> +++ b/2_fdf_design_discussion/25_[fv]_sections.md
> @@ -1,9 +1,9 @@
>  <!--- @file
>    2.5 [FV] Sections
>=20
> -  Copyright (c) 2006-2017, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2006-2018, Intel Corporation. All rights reserved.<BR>
>=20
>    Redistribution and use in source (original document form) and 'compile=
d'
>    forms (converted to PDF, epub, HTML and other formats) with or without
>    modification, are permitted provided that the following conditions are=
 met:
>=20
> @@ -314,12 +314,16 @@ EFI FV File Types - one and only one of the followi=
ng:
>  * `COMBO_PEIM_DRIVER` - Combined PEIM/DXE driver containing PEI and DXE =
depex
>    sections as well as PE32 and version sections.[^1]
>=20
>  * `SMM_CORE` - Sectioned data containing one or more other sections.
>=20
> +* `MM_CORE_STANDALONE` - Sectioned data containing one or more other sec=
tions.
> +
>  * `DXE_SMM_DRIVER` - Dispatched by the SMM Core
>=20
> +* `MM_STANDALONE` - Dispatched by the standalone SMM Core
> +
>  * `APPLICATION` - Application, so will not be dispatched
>=20
>  * `FV_IMAGE` - File contains an FV image
>=20
>  * `DISPOSABLE` - This section type is not supported by the EDK II build =
system
> diff --git a/3_edk_ii_fdf_file_format/32_fdf_definition.md b/3_edk_ii_fdf=
_file_format/32_fdf_definition.md
> index 4c323c5..db098cf 100644
> --- a/3_edk_ii_fdf_file_format/32_fdf_definition.md
> +++ b/3_edk_ii_fdf_file_format/32_fdf_definition.md
> @@ -205,10 +205,11 @@ The following are common definitions used by multip=
le section types.
>  <NumValUint16>         ::=3D {<IntNum>} {<UINT16>}
>  <NumValUint32>         ::=3D {<LongNum>} {<UINT32>}
>  <NumValUint64>         ::=3D {<LongLongNum>} {<UINT64>}
>  <ModuleType>           ::=3D {"BASE"} {"SEC"} {"PEI_CORE"} {"PEIM"}
>                             {"DXE_CORE"} {"DXE_DRIVER"} {"SMM_CORE"}
> +                           {"MM_CORE_STANDALONE"} {"MM_STANDALONE"}
>                             {"DXE_RUNTIME_DRIVER"} {"DXE_SAL_DRIVER"}
>                             {"DXE_SMM_DRIVER"} {"UEFI_DRIVER"}
>                             {"UEFI_APPLICATION"} {"USER_DEFINED"}
>  <ModuleTypeList>       ::=3D <ModuleType> [" " <ModuleType>]*
>  <IdentifierName>       ::=3D <TS> {<MACROVAL>} {<PcdName>} <TS>
> diff --git a/3_edk_ii_fdf_file_format/36_[fv]_sections.md b/3_edk_ii_fdf_=
file_format/36_[fv]_sections.md
> index 7796c37..2b21906 100644
> --- a/3_edk_ii_fdf_file_format/36_[fv]_sections.md
> +++ b/3_edk_ii_fdf_file_format/36_[fv]_sections.md
> @@ -159,10 +159,11 @@ Conditional statements may be used anywhere within =
this section.
>  <type5>             ::=3D <TS> "FILE" <MTS> "FV_IMAGE" <Eq>
>                          <NamedGuidOrPcd> <Options2>
>  <FvType1>           ::=3D {"SEC"} {"PEI_CORE"} {"PEIM"}
>  <FvType2>           ::=3D {"FREEFORM"} {"PEI_DXE_COMBO"} {"DRIVER"}
>                          {"DXE_CORE"} {"APPLICATION"} {"SMM_CORE"} {"SMM"=
}
> +                        {"MM_CORE_STANDALONE"} {"MM_STANDALONE"}
>  <Options1>          ::=3D [<Use>] [<FileOpts>] <RelocFlags> <MTS>
>                          "{" [<EOL>]
>                          {<Filename>} {<SectionData>} <TS> <TS> "}" [<EOL=
>]
>  <Options2>          ::=3D [<Use>] [<FileOpts>] <MTS>
>                          "{" [<EOL>]
> @@ -240,31 +241,35 @@ Conditional statements may be used anywhere within =
this section.
>                          [<GuidHeaderSize>]
>  <GuidAttrPr>        ::=3D "PROCESSING_REQUIRED" <Eq> <TrueFalse> <MTS>
>  <GuidAttrASV>       ::=3D "AUTH_STATUS_VALID" <Eq> <TrueFalse> <MTS>
>  <GuidHeaderSize>    ::=3D "EXTRA_HEADER_SIZE" <Eq> <Number> <MTS>
>  <DepexExpSection>   ::=3D if ( COMPONENT_TYPE =3D=3D "LIBRARY"
> -                        || LIBRARY_CLASS is declared in defines section =
of the
> -                        INF
> +                        || LIBRARY_CLASS is declared in defines section =
of INF
>                          || MODULE_TYPE =3D=3D "USER_DEFINED" ):
>                          [<Depex>]
>                          else if ( MODULE_TYPE =3D=3D "PEIM"
>                          || MODULE_TYPE =3D=3D "DXE_DRIVER"
>                          || MODULE_TYPE =3D=3D "DXE_RUNTIME_DRIVER"
> -                        || MODULE_TYPE =3D=3D "DXE_SAL_DRIVER" || MODULE=
_TYPE =3D=3D
> -                        "DXE_SMM_DRIVER" ):
> +                        || MODULE_TYPE =3D=3D "DXE_SAL_DRIVER"
> +                        || MODULE_TYPE =3D=3D "MM_STANDALONE"
> +                        || MODULE_TYPE =3D=3D "DXE_SMM_DRIVER" ):
>                          <Depex>
>                          else if ( MODULE_TYPE =3D=3D "UEFI_APPLICATION"
>                          && MODULE_TYPE =3D=3D "UEFI_DRIVER"
>                          && MODULE_TYPE =3D=3D "PEI_CORE"
>                          && MODULE_TYPE =3D=3D "DXE_CORE"
>                          && MODULE_TYPE =3D=3D "SMM_CORE"
> +                        && MODULE_TYPE =3D=3D "MM_CORE_STANDALONE"
>                          && MODULE_TYPE =3D=3D "SEC" ):
>                          No DEPEX section is permitted
>  <Depex>             ::=3D if (MODULE_TYPE =3D=3D "PEIM"):
> -                        <PeiDepexExp> else if (MODULE_TYPE =3D=3D
> -                        "DXE_SMM_DRIVER"):
> -                        <SmmDepexExp> [<DxeDepexExp>] else:
> +                        <PeiDepexExp>
> +                        else if (MODULE_TYPE =3D=3D "DXE_SMM_DRIVER"):
> +                        <SmmDepexExp> [<DxeDepexExp>]
> +                        else if (MODULE_TYPE =3D=3D "MM_STANDALONE"):
> +                        <SmmDepexExp>
> +                        else:
>                          <DxeDepexExp>
>  <PeiDepexExp>       ::=3D <TS> "SECTION" <MTS> [<FfsAlignment>] "PEI_DEP=
EX_EXP"
>                          <Eq> "{" [<EOL>] <PeiDepex> "}" <EOL>
>  <PeiDepex>          ::=3D [<TS> <BoolStmt> {<EOL>} {<MTS>}]
>                          [<TS> <DepInstruct> {<EOL>} {<MTS>}]
> diff --git a/3_edk_ii_fdf_file_format/37_[capsule]_sections.md b/3_edk_ii=
_fdf_file_format/37_[capsule]_sections.md
> index 03a16ca..c20c73a 100644
> --- a/3_edk_ii_fdf_file_format/37_[capsule]_sections.md
> +++ b/3_edk_ii_fdf_file_format/37_[capsule]_sections.md
> @@ -108,10 +108,11 @@ Conditional statements may be used anywhere within =
this section.
>  <type5>             ::=3D "FILE" "FV_IMAGE" <Eq> <NamedGuidOrPcd>
>                          <Options2>
>  <FvType1>           ::=3D {"SEC"} {"PEI_CORE"} {"PEIM"}
>  <FvType2>           ::=3D {"FREEFORM"} {"PEI_DXE_COMBO"} {"DRIVER"}
>                          {"DXE_CORE"} {"APPLICATION"} {"SMM_CORE"} {"SMM"=
}
> +                        {"MM_CORE_STANDALONE"} {"MM_STANDALONE"}
>  <Options1>          ::=3D [<Use>] [<FileOpts>] [<RelocFlags>]
>                          "{" [<EOL>]
>                          <TS> {<Filename>} {<SectionData>} [<EOL>] <TS> "=
}"
>                          <EOL>
>  <Options2>          ::=3D [<Use>] [<FileOpts>]
> @@ -248,30 +249,35 @@ Conditional statements may be used anywhere within =
this section.
>                          [<TS> "READ_ENABLED_CAP" <Eq> <TrueFalse> <EOL>]
>                          [<TS> "READ_DISABLED_CAP" <Eq> <TrueFalse> <EOL>=
]
>                          [<TS> "READ_STATUS" <Eq> <TrueFalse> <EOL>]
>  <FileSystemGuid>    ::=3D "FileSystemGuid" <Eq> <NamedGuidOrPcd>
>  <DepexExpSection>   ::=3D if ( COMPONENT_TYPE =3D=3D "LIBRARY"
> -                        || LIBRARY_CLASS is declared in defines section =
of the
> -                        INF
> +                        || LIBRARY_CLASS is declared in defines section =
of INF
>                          || MODULE_TYPE =3D=3D "USER_DEFINED" ):
>                          [<Depex>]
>                          else if ( MODULE_TYPE =3D=3D "PEIM"
>                          || MODULE_TYPE =3D=3D "DXE_DRIVER"
>                          || MODULE_TYPE =3D=3D "DXE_RUNTIME_DRIVER"
> -                        || MODULE_TYPE =3D=3D "DXE_SAL_DRIVER" || MODULE=
_TYPE =3D=3D
> -                        "DXE_SMM_DRIVER" ):
> +                        || MODULE_TYPE =3D=3D "DXE_SAL_DRIVER"
> +                        || MODULE_TYPE =3D=3D "MM_STANDALONE"
> +                        || MODULE_TYPE =3D=3D "DXE_SMM_DRIVER" ):
>                          <Depex>
> -                        elif ( MODULE_TYPE =3D=3D "UEFI_APPLICATION"
> +                        else if ( MODULE_TYPE =3D=3D "UEFI_APPLICATION"
>                          || MODULE_TYPE =3D=3D "UEFI_DRIVER"
>                          || MODULE_TYPE =3D=3D "PEI_CORE"
>                          || MODULE_TYPE =3D=3D "DXE_CORE"
>                          || MODULE_TYPE =3D=3D "SMM_CORE"
> +                        || MODULE_TYPE =3D=3D "MM_CORE_STANDALONE"
>                          || MODULE_TYPE =3D=3D "SEC"):
>                          No DEPEX section is permitted
> -<Depex>             ::=3D if (MODULE_TYPE =3D=3D PEIM): <PeiDepexExp> el=
if
> -                        (MODULE_TYPE =3D=3D "DXE_SMM_DRIVER"): <SmmDepex=
Exp>
> -                        [<DxeDepexExp>] else:
> +<Depex>             ::=3D if (MODULE_TYPE =3D=3D PEIM):
> +                        <PeiDepexExp>
> +                        else if (MODULE_TYPE =3D=3D "DXE_SMM_DRIVER"):
> +                        <SmmDepexExp> [<DxeDepexExp>]
> +                        else if (MODULE_TYPE =3D=3D "MM_STANDALONE"):
> +                        <SmmDepexExp>
> +                        else:
>                          <DxeDepexExp>
>  <PeiDepexExp>       ::=3D "SECTION" <MTS> [<FfsAlignment>]
>                          "PEI_DEPEX_EXP"
>                          <Eq> "{" [<EOL>] <PeiDepex> "}" <EOL>
>  <PeiDepex>          ::=3D [<BoolStmt> {<EOL>} {<MTS>}]*
> diff --git a/3_edk_ii_fdf_file_format/39_[rule]_sections.md b/3_edk_ii_fd=
f_file_format/39_[rule]_sections.md
> index e23b474..34e767f 100644
> --- a/3_edk_ii_fdf_file_format/39_[rule]_sections.md
> +++ b/3_edk_ii_fdf_file_format/39_[rule]_sections.md
> @@ -59,10 +59,11 @@ Conditional statements may be used anywhere within th=
is section.
>                          [<TemplateName>]
>  <ModuleType>        ::=3D {<EdkComponentType>} {<Edk2ModuleType>}
>  <Edk2ModuleType>    ::=3D {"SEC"} {"PEI_CORE"} {"PEIM"} {"SMM_CORE"}
>                          {"DXE_CORE"} {"DXE_DRIVER"}
>                          {"DXE_SAL_DRIVER"} {"DXE_SMM_DRIVER"}
> +                        {"MM_CORE_STANDALONE"} {"MM_STANDALONE"}
>                          {"DXE_RUNTIME_DRIVER"} {"UEFI_DRIVER"}
>                          {"UEFI_APPLICATION"} {"USER_DEFINED"}
>  <EdkComponentType>  ::=3D {"LIBRARY"} {"APPLICATION"} {"AcpiTable"}
>                          {"BINARY"} {"BS_DRIVER"} {"LOGO"}
>                          {"Legacy16"} {"Microcode"} {"PE32_PEIM"}
> @@ -75,30 +76,32 @@ Conditional statements may be used anywhere within th=
is section.
>  <FileStatements>    ::=3D if (MODULE_TYPE =3D=3D "SEC"
>                          || MODULE_TYPE =3D=3D "PEI_CORE"
>                          || MODULE_TYPE =3D=3D "PEIM"
>                          || COMPONENT_TYPE =3D=3D "PEI_CORE"
>                          || COMPONENT_TYPE =3D=3D "PIC_PEIM"
> -                        || COMPONENT_TYPE =3D=3D "RELOCATABLE_PEIM" ||
> -                        COMPONENT_TYPE =3D=3D "SECURITY_CORE"
> +                        || COMPONENT_TYPE =3D=3D "RELOCATABLE_PEIM"
> +                        || COMPONENT_TYPE =3D=3D "SECURITY_CORE"
>                          || COMPONENT_TYPE =3D=3D "PE32_PEIM" ):
>                          <TS> "FILE" <MTS> <FvType1> <Eq>
>                          <FileStatement1>
> -                        elif (MODULE_TYPE =3D=3D "DXE_CORE" || MODULE_TY=
PE =3D=3D
> -                        "DXE_DRIVER"
> -                        || MODULE_TYPE =3D=3D "DXE_SAL_DRIVER" || MODULE=
_TYPE =3D=3D
> -                        "SMM_CORE"
> +                        elif (MODULE_TYPE =3D=3D "DXE_CORE"
> +                        || MODULE_TYPE =3D=3D "DXE_DRIVER"
> +                        || MODULE_TYPE =3D=3D "DXE_SAL_DRIVER"
> +                        || MODULE_TYPE =3D=3D "SMM_CORE"
> +                        || MODULE_TYPE =3D=3D "MM_CORE_STANDALONE"
>                          || MODULE_TYPE =3D=3D "DXE_SMM_DRIVER"
> +                        || MODULE_TYPE =3D=3D "MM_STANDALONE"
>                          || MODULE_TYPE =3D=3D "UEFI_DRIVER"
>                          || MODULE_TYPE =3D=3D "UEFI_APPLICATION"
>                          || MODULE_TYPE =3D=3D "USER_DEFINED"
>                          || COMPONENT_TYPE =3D=3D "BS_DRIVER"
> -                        || COMPONENT_TYPE =3D=3D
> -                        "COMBINED_PEIM_DRIVER"
> +                        || COMPONENT_TYPE =3D=3D "COMBINED_PEIM_DRIVER"
>                          || COMPONENT_TYPE =3D=3D "APPLICATION"):
>                          {<FileStatement2>} {<FileStatement3>}
>                          elif (MODULE_TYPE =3D=3D "FV_IMAGE"):
> -                        <FileStatement4> else:
> +                        <FileStatement4>
> +                        else:
>                          <TS> "FILE" <MTS> "NON_FFS_FILE" <Eq>
>                          [<NamedGuid>] [<Options>] <EOL>
>  <FileStatement1>    ::=3D <NamedGuid> [<RelocFlags> <MTS>] [<Options>] <=
EOL>
>  <FileStatement2>    ::=3D <TS> "FILE" <MTS> <FvType2> <Eq> <NamedGuid>
>                          [<Options>] <EOL>
> @@ -108,10 +111,11 @@ Conditional statements may be used anywhere within =
this section.
>                          <NamedGuid> [<Options>] <EOL>
>  <NamedGuid>         ::=3D {"$(NAMED_GUID)"} {<NamedGuidOrPcd>}
>  <FvType1>           ::=3D {"SEC"} {"PEI_CORE"} {"PEIM"} {"PEI_DXE_COMBO"=
}
>  <FvType2>           ::=3D {"FREEFORM"} {"DRIVER"} {"DXE_CORE"}
>                          {"APPLICATION"} {"SMM_CORE"} {"SMM"}
> +                        {"MM_CORE_STANDALONE"} {"MM_STANDALONE"}
>  <RelocFlags>        ::=3D {"RELOCS_STRIPPED" <MTS>}
>                          {"RELOCS_RETAINED" <MTS>}
>  <Options>           ::=3D [<UseLocal>] [<FileOpts>] <FileSpec>
>  <UseLocal>          ::=3D <KeyString> ["," <KeyString>]
>  <KeyString>         ::=3D <Target> "_" <TagName> "_" <ToolArch>
> diff --git a/README.md b/README.md
> index 217356a..7c7face 100644
> --- a/README.md
> +++ b/README.md
> @@ -214,5 +214,6 @@ Copyright (c) 2006-2017, Intel Corporation. All right=
s reserved.
>  |            | Add !error statement section
> |               |
>  |            | clean up the <NamedGuidOrPcd> and <NamedGuid> usage in sp=
ec
> |               |
>  |            | document WEAK_ALIGNMENT attribute
> |               |
>  |            | support varstore template generation with a [FV] section
> |               |
>  |            | [#1110](https://bugzilla.tianocore.org/show_bug.cgi?id=3D=
1110) Extend exclamation statement's keyword to
> case-insensitive                                                    |    =
           |
> +|            | [#551] (https://bugzilla.tianocore.org/show_bug.cgi?id=3D=
551) Add PI1.5 standalone SMM support in FDF file
> |               |
> --
> 2.6.1.windows.1