From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.20; helo=mga02.intel.com; envelope-from=yonghong.zhu@intel.com; receiver=edk2-devel@lists.01.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (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 E05862117CE8C for ; Mon, 22 Oct 2018 00:49:10 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Oct 2018 00:49:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,411,1534834800"; d="scan'208";a="84519655" Received: from shwdeopenpsi168.ccr.corp.intel.com ([10.239.158.127]) by orsmga006.jf.intel.com with ESMTP; 22 Oct 2018 00:49:09 -0700 From: Yonghong Zhu To: edk2-devel@lists.01.org Cc: Liming Gao , Michael Kinney , Kevin W Shaw Date: Mon, 22 Oct 2018 15:49:07 +0800 Message-Id: <1540194547-14824-1-git-send-email-yonghong.zhu@intel.com> X-Mailer: git-send-email 2.6.1.windows.1 Subject: [Patch] FDF Spec: Add the $(PCD) usage in the [FD] section X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Oct 2018 07:49:11 -0000 current code support to use $(PCD) in the [FD] section, and lots of platform FDF file already used this usage, so we update the FDF spec first to align with code to reduce the incompatible change for firmware developer. Cc: Liming Gao Cc: Michael Kinney Cc: Kevin W Shaw Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Yonghong Zhu --- 2_fdf_design_discussion/24_[fd]_sections.md | 2 +- 3_edk_ii_fdf_file_format/35_[fd]_sections.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2_fdf_design_discussion/24_[fd]_sections.md b/2_fdf_design_discussion/24_[fd]_sections.md index e532041..67e478e 100644 --- a/2_fdf_design_discussion/24_[fd]_sections.md +++ b/2_fdf_design_discussion/24_[fd]_sections.md @@ -162,11 +162,11 @@ For a PCD that has a datum type of `VOID`*, the data can be a Unicode string, as in `L"text"`, a valid C data array (it must be either a C format GUID or a hex byte array), as in `{0x20, 0x01, 0x50, 0x00, 0x32, 0xFF, 0x00, 0xAA, {0xFF, 0xF0, 0x00, 0x00, 0x00}}.` For other PCD datum types, the value may be a boolean or a hex value, as in `0x0000000F,` with a value that is consistent with the PCD's datum type. -The value may also be a macro or it may be computed, using arithmetic +The value may also be a macro or `$(PCD)` or it may be computed, using arithmetic operations, arithmetic expressions and or logical expressions. The value portion of the `SET` statement, when using any of these computations are in-fix expressions that are evaluated left to right, with items within parenthesis evaluated before the outer expressions are evaluated. Use of parenthesis is encouraged to remove ambiguity. diff --git a/3_edk_ii_fdf_file_format/35_[fd]_sections.md b/3_edk_ii_fdf_file_format/35_[fd]_sections.md index f0003e7..e46fd7b 100644 --- a/3_edk_ii_fdf_file_format/35_[fd]_sections.md +++ b/3_edk_ii_fdf_file_format/35_[fd]_sections.md @@ -150,13 +150,13 @@ The `FvUiName` must be specified in a `[FV]` section header defined in this the file. **_PcdValue_** The PCD Value may be a specific numeric value, an array of numeric bytes, a -GUID, a quoted string, an L quoted string (representing a unicode string), an +GUID, a quoted string, an `L` quoted string (representing a unicode string), an arithmetic expression, a logic expression or a macro from a previously defined -macro statement. +macro statement or a `$(PCD) format. **_Expression_** Refer to the EDK II Expression Syntax Specification for more information. -- 2.6.1.windows.1