From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (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 362EB20D7648C for ; Wed, 12 Apr 2017 10:42:35 -0700 (PDT) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga105.fm.intel.com with ESMTP; 12 Apr 2017 10:42:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,191,1488873600"; d="scan'208";a="955319905" Received: from mdkinney-mobl.amr.corp.intel.com ([10.252.134.215]) by orsmga003.jf.intel.com with ESMTP; 12 Apr 2017 10:42:34 -0700 From: Michael Kinney To: edk2-devel@lists.01.org Cc: Liming Gao , Yonghong Zhu , Kevin W Shaw Date: Wed, 12 Apr 2017 10:42:28 -0700 Message-Id: <1492018948-34216-2-git-send-email-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.6.3.windows.1 In-Reply-To: <1492018948-34216-1-git-send-email-michael.d.kinney@intel.com> References: <1492018948-34216-1-git-send-email-michael.d.kinney@intel.com> Subject: [edk2-FdfSpecification PATCH] Allow sections in any order X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2017 17:42:35 -0000 https://bugzilla.tianocore.org/show_bug.cgi?id=142 Cc: Liming Gao Cc: Yonghong Zhu Cc: Kevin W Shaw Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Michael Kinney --- 3_edk_ii_fdf_file_format/32_fdf_definition.md | 24 ++++++++++++------------ README.md | 1 + 2 files changed, 13 insertions(+), 12 deletions(-) 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 e4e9869..b8dffa8 100644 --- a/3_edk_ii_fdf_file_format/32_fdf_definition.md +++ b/3_edk_ii_fdf_file_format/32_fdf_definition.md @@ -33,7 +33,10 @@ The FDF definitions define the final properties for a flash image - PCD settings in this file override any other PCD settings that may have been set in -the platform description (DSC) file. +the platform description (DSC) file. The `[Defines]` section, when specified, +must appear before any other section except the header. (The header, when +specified, is always the first section of an FDF file.) The remaining sections +may be specified in any order within the FDF file. #### Summary @@ -43,14 +46,14 @@ EBNF). ```c ::= [
] [] - - - - - - - - + * + * + * + * + * + * + * + * ``` ********** @@ -62,9 +65,6 @@ override any variable/value assignment defined in the FDF file. **Note:** Conditional statements may be used anywhere within the FDF file, with the ability to group any item within a section as well as entire sections. ********** -**Note:** The sections must be listed in the above order within the FDF file. -Changing the order may cause the build to break. -********** ### 3.2.1 Common Definitions diff --git a/README.md b/README.md index f0ea3e4..45da9b5 100644 --- a/README.md +++ b/README.md @@ -203,3 +203,4 @@ Copyright (c) 2006-2017, Intel Corporation. All rights reserved. | | Changed the FDF_SPECIFICATION value from 0x0001001A to 0x0001001B or 1.27 | | | | Extended the FV and Capsule, FILE RAW statement formats to support multiple binary files. | | | | Changed section 3.8 [FmpPayload] to add definitions for MONOTONIC_COUNT and CERTIFICATE_GUID, plus some notes about how these are used. | | +| | [#142](https://bugzilla.tianocore.org/show_bug.cgi?id=142) Update EDK II FDF Specification to allow sections in any order | | -- 2.6.3.windows.1