From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <yonghong.zhu@intel.com>
Received-SPF: Pass (sender SPF authorized) identity=mailfrom;
 client-ip=134.134.136.126; helo=mga18.intel.com;
 envelope-from=yonghong.zhu@intel.com; receiver=edk2-devel@lists.01.org 
Received: from mga18.intel.com (mga18.intel.com [134.134.136.126])
 (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 F05BC211DC063
 for <edk2-devel@lists.01.org>; Thu, 14 Jun 2018 00:43:29 -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 orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;
 14 Jun 2018 00:43:29 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.51,222,1526367600"; d="scan'208";a="232503485"
Received: from shwdeopenpsi168.ccr.corp.intel.com ([10.239.158.129])
 by orsmga005.jf.intel.com with ESMTP; 14 Jun 2018 00:43:28 -0700
From: Yonghong Zhu <yonghong.zhu@intel.com>
To: edk2-devel@lists.01.org
Cc: Liming Gao <liming.gao@intel.com>,
 Michael Kinney <michael.d.kinney@intel.com>,
 Kevin W Shaw <kevin.w.shaw@intel.com>
Date: Thu, 14 Jun 2018 15:43:15 +0800
Message-Id: <1528962195-480-1-git-send-email-yonghong.zhu@intel.com>
X-Mailer: git-send-email 2.6.1.windows.1
Subject: [Patch] INF Spec: FixedAtBuild (VOID*) PCD use in the [DEPEX] section
X-BeenThere: edk2-devel@lists.01.org
X-Mailman-Version: 2.1.26
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, 14 Jun 2018 07:43:30 -0000

Fixes: https://bugzilla.tianocore.org/show_bug.cgi?id=444
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_inf_file_format/314_[depex]_sections.md | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/3_edk_ii_inf_file_format/314_[depex]_sections.md b/3_edk_ii_inf_file_format/314_[depex]_sections.md
index e325f06..942bcf9 100644
--- a/3_edk_ii_inf_file_format/314_[depex]_sections.md
+++ b/3_edk_ii_inf_file_format/314_[depex]_sections.md
@@ -1,9 +1,9 @@
 <!--- @file
   3.14 [Depex] Sections
 
-  Copyright (c) 2007-2017, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2007-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:
 
@@ -156,10 +156,13 @@ that will be loaded from the shell or stored in a PCI option ROM) will not have
 an FFS DEPEX section generated by the tools.
 **********
 **Note:** Capitalization in the Prototypes listed below does not match the
 capitalization used in the PI Specification.
 **********
+**Note:** The PCD item used in this section must be defined as FixedAtBuild type
+and VOID* datum type, and the size of the PCD must be 16 bytes.
+**********
 
 #### Prototype
 
 ```c
 <Depex>              ::= "[Depex" [<com_attribs>] "]" <EOL>
@@ -171,37 +174,38 @@ capitalization used in the PI Specification.
 <DepexModuleType>    ::= {"PEIM"} {"DXE_DRIVER"} {"DXE_SMM_DRIVER"}
                          {"DXE_RUNTIME_DRIVER"} {"DXE_SAL_DRIVER"}
                          {"UEFI_DRIVER"} {"USER_DEFINED"}
 <DepexSection>       ::= {<PeiDepex>} {<SmmDepex>} {<DxeDepex>}
 <DxeDepex>           ::= <DxeDepexStatements>+ ["END" <EOL>]
-<DxeDepexStatements> ::= {<SorStmt>} {<GuidStmt>} {<BoolStmt>}
+<DxeDepexStatements> ::= {<SorStmt>} {<GuidOrPcdStmt>} {<BoolStmt>}
 <PeiDepex>           ::= <PeiDepexStatements>*
                          ["END" <EOL>]
 <PeiDepexStatements> ::= {<BoolStmt>} {<DepInstruct>}
 <SmmDepex>           ::= <DxeDepex>
-<GuidStmt>           ::= {"BEFORE"} {"AFTER"} <GuidCName> [<EOL>]
+<GuidOrPcdStmt>      ::= {"BEFORE"} {"AFTER"} <GuidOrPcdName> [<EOL>]
+<GuidOrPcdName>      ::= {<GuidCName>} {<PcdName>}
 <DepInstruct>        ::= "PUSH" <CFormatGUID> [<EOL>]
 <SorStmt>            ::= "SOR" <BoolStmt> [<EOL>]
 <BoolStmt>           ::= {<Bool>} {<BoolExpress>}
-<Bool>               ::= {"TRUE"} {"FALSE"} {<GuidCName>} [<EOL>]
+<Bool>               ::= {"TRUE"} {"FALSE"} {<GuidCName>} {<PcdName>} [<EOL>]
 <GuidCName>          ::= <CName> # A Guid C Name
 <NTs>                ::= "NOT" <TS>
 <BoolExpress>        ::= <NTs> <Bool> [<BoolExpressCont>]*
 <BoolExpressCont>    ::= <MTS> {"AND"} {"OR"} <MTS> [<NTs>] <Bool>
 <AsBuiltDepex>       ::= "#" {<FullDxe>} {<FullPei>} {<FullSmm>} <EOL>
 <FullDxe>            ::= <DxeStatements>+
                          [<TS> "END"]
-<DxeStatements>      ::= {<SorAbStmt>} {<GuidAbStmt>} {<BoolAbStmt>}
+<DxeStatements>      ::= {<SorAbStmt>} {<GuidOrPcdAbStmt>} {<BoolAbStmt>}
 <FullPei>            ::= <PeiStatements>*
                          [<TS> "END"]
 <PeiStatements>      ::= {<BoolAbStmt>} {<DepAbInstruct>}
 <FullSmm>            ::= <FullDxe>
-<GuidAbStmt>         ::= {"BEFORE"} {"AFTER"} <TS> <GuidCName> <TS>
+<GuidOrPcdAbStmt>    ::= {"BEFORE"} {"AFTER"} <TS> <GuidOrPcdName> <TS>
 <DepAbInstruct>      ::= "PUSH" <TS> <CFormatGUID> <TS>
 <SorAbStmt>          ::= "SOR" <TS> <BoolAbStmt> <TS>
 <BoolAbStmt>         ::= {<BoolAb>} {<BoolAbExpress>}
-<BoolAb>             ::= {"TRUE"} {"FALSE"} {<GuidCName>} <TS>
+<BoolAb>             ::= {"TRUE"} {"FALSE"} {<GuidCName>} {<PcdName>} <TS>
 <GuidCName>          ::= <CName> # A Guid C Name
 <BoolAbExpress>      ::= <NTs> <Bool> [<BoolAbExpressCont>]*
 <BoolAbExpressCont>  ::= <MTS> {"AND"} {"OR"} <MTS> [<NTs>] <Bool>
 ```
 
@@ -212,11 +216,11 @@ capitalization used in the PI Specification.
   gEfiFirmwareVolumeBlockProtocolGuid
   AND gEfiAlternateFvBlockGuid
   AND gEfiFaultTolerantWriteLiteProtocolGuid
 
 [Depex]
-  SOR gEfiProtocolIDependOnGuid
+  gEfiNt32PkgTokenSpaceGuid.PcdGuidTest
 
 [Depex.common]
   SOR gEfiProtocolIDependOnGuid
 
 [Depex.IA32.DXE_SMM_DRIVER]
-- 
2.6.1.windows.1