From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 9529021A04830 for ; Fri, 7 Apr 2017 19:44:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1491619488; x=1523155488; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=l0qCDB4VgCFR0baj3UpOq1hf8F3apWfvPpTCN2WlRwQ=; b=AGF4p0E5HMIanNCl8p1T5fQkSPG7NML2wbh68SjRCKCjsMQa6oHTOtI2 ObOj5gjZtyeD2/XkHuSY2zUKnu3s2Q==; Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Apr 2017 19:44:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,169,1488873600"; d="scan'208";a="71307656" Received: from mdkinney-mobl.amr.corp.intel.com ([10.255.230.147]) by orsmga002.jf.intel.com with ESMTP; 07 Apr 2017 19:44:48 -0700 From: Michael Kinney To: edk2-devel@lists.01.org Cc: Liming Gao , Yonghong Zhu , Kevin W Shaw Date: Fri, 7 Apr 2017 19:44:44 -0700 Message-Id: <1491619484-18836-3-git-send-email-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.6.3.windows.1 In-Reply-To: <1491619484-18836-1-git-send-email-michael.d.kinney@intel.com> References: <1491619484-18836-1-git-send-email-michael.d.kinney@intel.com> Subject: [edk2-FdfSpecification PATCH 2/2] Remove illegal white space in FDF file examples 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: Sat, 08 Apr 2017 02:44:48 -0000 Remove space between '$' and '(' for macro usage Remove space before/after directory separator '/' Cc: Liming Gao Cc: Yonghong Zhu Cc: Kevin W Shaw Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Michael Kinney --- 2_fdf_design_discussion/25_[fv]_sections.md | 12 ++++++------ appendix_a_nt32pkg_flash_description_file.md | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/2_fdf_design_discussion/25_[fv]_sections.md b/2_fdf_design_discussion/25_[fv]_sections.md index d35f268..928455c 100644 --- a/2_fdf_design_discussion/25_[fv]_sections.md +++ b/2_fdf_design_discussion/25_[fv]_sections.md @@ -278,7 +278,7 @@ FFS file specification syntax is one of the following: OR ```c -FILE Type $ (NAMED_GUID) [Options] { +FILE Type $(NAMED_GUID) [Options] { SECTION SECTION_TYPE = FileName SECTION SECTION_TYPE = FileName } @@ -371,7 +371,7 @@ The following is an example for using additional sections: #Encapsulation - Compress FILE FOO = 12345678-0000-AAAA-FFFF-0123ABCD12BD { SECTION COMPRESS { - SECTION PE32 = $ (WORKSPACE) / EdkModulePkg / Core / Dxe / DxeMain.inf + SECTION PE32 = $(WORKSPACE)/EdkModulePkg/Core/Dxe/DxeMain.inf SECTION VERSION = "1.2.3" } } @@ -379,13 +379,13 @@ FILE FOO = 12345678-0000-AAAA-FFFF-0123ABCD12BD { # Encapsulation - GUIDED FILE FV_IMAGE = 87654321-FFFF-BBBB-2222-9874561230AB { SECTION GUIDED gEfiTianoCompressionScheme { - SECTION PE32 = $ (WORKSPACE) / EdkModulePkg / Core / Dxe / DxeMain.inf + SECTION PE32 = $(WORKSPACE)/EdkModulePkg/Core/Dxe/DxeMain.inf } } # LEAF Section FILE DXE_CORE = B5596C75-37A2-4b69-B40B-72ABD6DD8708 { - SECTION VERSION $ (BUILD_DIR)/$(ARCH)/D6A2CB7F-6A18-4E2F-B43B-9920A733700A-DxeMain.ver + SECTION VERSION $(BUILD_DIR)/$(ARCH)/D6A2CB7F-6A18-4E2F-B43B-9920A733700A-DxeMain.ver } ``` @@ -418,12 +418,12 @@ specify a string, that will be used to create an EFI section. The `GUIDED` encapsulation section uses one of the following formats. ```c -SECTION GUIDED $ (GUID_CNAME) [auth] { +SECTION GUIDED $(GUID_CNAME) [auth] { SECTION EFI_SECTION_TYPE = FILENAME SECTION EFI_SECTION_TYPE = "string" } -SECTION GUIDED $ (GUID_CNAME) [auth] FILENAME +SECTION GUIDED $(GUID_CNAME) [auth] FILENAME ``` The required argument is the `GUIDED` name followed by an optional "auth" diff --git a/appendix_a_nt32pkg_flash_description_file.md b/appendix_a_nt32pkg_flash_description_file.md index 8d7a0ce..89be76c 100644 --- a/appendix_a_nt32pkg_flash_description_file.md +++ b/appendix_a_nt32pkg_flash_description_file.md @@ -369,7 +369,7 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) { } [Rule.Common.PEIM] - FILE PEIM = $ (NAMED_GUID){ + FILE PEIM = $(NAMED_GUID){ PEI_DEPEX PEI_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex PE32 PE32 Align=4K $(INF_OUTPUT)/$(MODULE_NAME).efi UI STRING = "$(MODULE_NAME)" Optional @@ -377,7 +377,7 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) { } [Rule.Common.DXE_CORE] - FILE DXE_CORE = $ (NAMED_GUID) { + FILE DXE_CORE = $(NAMED_GUID) { COMPRESS PI_STD { PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi UI STRING = "$(MODULE_NAME)" Optional @@ -386,7 +386,7 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) { } [Rule.Common.UEFI_DRIVER] - FILE DRIVER = $ (NAMED_GUID) { + FILE DRIVER = $(NAMED_GUID) { DXE_DEPEX DXE_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex COMPRESS PI_STD { GUIDED { @@ -398,7 +398,7 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) { } [Rule.Common.UEFI_DRIVER.TIANOCOMPRESSED] - FILE DRIVER = $ (NAMED_GUID) { + FILE DRIVER = $(NAMED_GUID) { DXE_DEPEX DXE_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED = TRUE { PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi @@ -408,7 +408,7 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) { } [Rule.Common.DXE_DRIVER] - FILE DRIVER = $ (NAMED_GUID) { + FILE DRIVER = $(NAMED_GUID) { DXE_DEPEX DXE_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex COMPRESS PI_STD { GUIDED { @@ -420,7 +420,7 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) { } [Rule.Common.DXE_RUNTIME_DRIVER] - FILE DRIVER = $ (NAMED_GUID) { + FILE DRIVER = $(NAMED_GUID) { DXE_DEPEX DXE_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex COMPRESS PI_STD { GUIDED { @@ -432,7 +432,7 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) { } [Rule.Common.UEFI_APPLICATION] - FILE APPLICATION = $ (NAMED_GUID) { + FILE APPLICATION = $(NAMED_GUID) { COMPRESS PI_STD { GUIDED { PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi -- 2.6.3.windows.1