From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 94D901A1E26 for ; Wed, 28 Sep 2016 18:01:15 -0700 (PDT) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga105.jf.intel.com with ESMTP; 28 Sep 2016 18:01:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.30,412,1470726000"; d="scan'208";a="1058020467" Received: from orsmsx105.amr.corp.intel.com ([10.22.225.132]) by orsmga002.jf.intel.com with ESMTP; 28 Sep 2016 18:01:15 -0700 Received: from orsmsx151.amr.corp.intel.com (10.22.226.38) by ORSMSX105.amr.corp.intel.com (10.22.225.132) with Microsoft SMTP Server (TLS) id 14.3.248.2; Wed, 28 Sep 2016 18:01:15 -0700 Received: from orsmsx113.amr.corp.intel.com ([169.254.9.161]) by ORSMSX151.amr.corp.intel.com ([10.22.226.38]) with mapi id 14.03.0248.002; Wed, 28 Sep 2016 18:01:14 -0700 From: "Kinney, Michael D" To: "Yao, Jiewen" , "edk2-devel@lists.01.org" , "Kinney, Michael D" CC: "Steele, Kelly" , "Tian, Feng" , "Zeng, Star" , "Gao, Liming" , "Zhang, Chao B" Thread-Topic: [PATCH 37/45] QuarkPlatformPkg/dsc/fdf: add capsule generation DSC/FDF. Thread-Index: AQHSE9QRpWvKeBgzW0m5xTrJkR8E3qCPsPJg Date: Thu, 29 Sep 2016 01:01:13 +0000 Message-ID: References: <1474440326-9292-1-git-send-email-jiewen.yao@intel.com> <1474440326-9292-38-git-send-email-jiewen.yao@intel.com> In-Reply-To: <1474440326-9292-38-git-send-email-jiewen.yao@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_IC x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZTM5NWU2MTQtNmIyYy00ZDJlLWIxNjgtOWQ2MjMyODEwMDkzIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE1LjkuNi42IiwiVHJ1c3RlZExhYmVsSGFzaCI6InVvbExnd1lGUTZuemFZeVZDSllqUXlRQ245bTEyRDRiVXZzZlY1SUhoZUE9In0= x-originating-ip: [10.22.254.138] MIME-Version: 1.0 Subject: Re: [PATCH 37/45] QuarkPlatformPkg/dsc/fdf: add capsule generation DSC/FDF. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Sep 2016 01:01:15 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Jiewen, This DSC/FDF generates a build failure for me from GenFds. =20 I have entered a BaseTools bug into Bugzilla https://bugzilla.tianocore.org/show_bug.cgi?id=3D132 There is a workaround to create the file that is missing GenFds can work, so I was able to generate a Capsule Image for FW update and saw it work. My other major feedback on this DSC/FDF file is why this=20 Content was not added to Quark DSC/FDF with #ifdef for=20 RECOVERY_ENABLE and CAPSULE_ENABLE flags? Is the [Capsule.BiosCapsuleFmpRsa2048] section really the recovery image? Can we use Recovery in the name instead of Capsule? Thanks, Mike > -----Original Message----- > From: Yao, Jiewen > Sent: Tuesday, September 20, 2016 11:45 PM > To: edk2-devel@lists.01.org > Cc: Kinney, Michael D ; Steele, Kelly > ; Tian, Feng ; Zeng, Star > ; Gao, Liming ; Zhang, Chao B > > Subject: [PATCH 37/45] QuarkPlatformPkg/dsc/fdf: add capsule generation D= SC/FDF. >=20 > Add DSC/FDF to generate capsule image. > It is separated from normal DSC/FDF, because the FDF file need use > the result of final build. >=20 > Cc: Michael D Kinney > Cc: Kelly Steele > Cc: Feng Tian > Cc: Star Zeng > Cc: Liming Gao > Cc: Chao Zhang > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Jiewen Yao > --- > QuarkPlatformPkg/QuarkCapsule.dsc | 44 +++++++++++ > QuarkPlatformPkg/QuarkCapsule.fdf | 82 ++++++++++++++++++++ > 2 files changed, 126 insertions(+) >=20 > diff --git a/QuarkPlatformPkg/QuarkCapsule.dsc b/QuarkPlatformPkg/QuarkCa= psule.dsc > new file mode 100644 > index 0000000..3785cbd > --- /dev/null > +++ b/QuarkPlatformPkg/QuarkCapsule.dsc > @@ -0,0 +1,44 @@ > +## @file > +# Clanton Peak CRB platform with 32-bit DXE for 4MB/8MB flash devices. > +# > +# This package provides Clanton Peak CRB platform specific capsule. > +# Copyright (c) 2016 Intel Corporation. > +# > +# This program and the accompanying materials > +# are licensed and made available under the terms and conditions of the = BSD License > +# which accompanies this distribution. The full text of the license may= be found at > +# http://opensource.org/licenses/bsd-license.php > +# > +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, > +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR I= MPLIED. > +# > +## > + > +[Defines] > + PLATFORM_NAME =3D Quark > + PLATFORM_GUID =3D 3B9F8782-0799-450C-ACB3-2D8F4504810= F > + PLATFORM_VERSION =3D 0.1 > + FLASH_DEFINITION =3D QuarkPlatformPkg/QuarkCapsule.fdf > + OUTPUT_DIRECTORY =3D Build/Quark > + SUPPORTED_ARCHITECTURES =3D IA32 > + BUILD_TARGETS =3D DEBUG|RELEASE > + SKUID_IDENTIFIER =3D DEFAULT > + > +########################################################################= ############## > ############# > +# > +# Components Section - list of the modules and components that will be p= rocessed by > compilation > +# tools and the EDK II tools to generate PE32/PE32+= /Coff image > files. > +# > +# Note: The EDK II DSC file is not used to specify how compiled binary i= mages get > placed > +# into firmware volume images. This section is just a list of modu= les to compile > from > +# source into UEFI-compliant binaries. > +# It is the FDF file that contains information on combining binary= files into > firmware > +# volume images, whose concept is beyond UEFI and is described in = PI > specification. > +# Binary modules do not need to be listed in this section, as they= should be > +# specified in the FDF file. For example: Shell binary, FAT binary= (Fat.efi), > +# Logo (Logo.bmp), and etc. > +# There may also be modules listed in this section that are not re= quired in the > FDF file, > +# When a module listed here is excluded from FDF file, then UEFI-c= ompliant > binary will be > +# generated for it, but the binary will not be put into any firmwa= re volume. > +# > +########################################################################= ############## > ############# > diff --git a/QuarkPlatformPkg/QuarkCapsule.fdf b/QuarkPlatformPkg/QuarkCa= psule.fdf > new file mode 100644 > index 0000000..d9dac51 > --- /dev/null > +++ b/QuarkPlatformPkg/QuarkCapsule.fdf > @@ -0,0 +1,82 @@ > +## @file > +# FDF file of Clanton Peak CRB platform with 32-bit DXE > +# > +# This package provides QuarkNcSocId platform specific capsule. > +# Copyright (c) 2016 Intel Corporation. > +# > +# This program and the accompanying materials > +# are licensed and made available under the terms and conditions of the = BSD License > +# which accompanies this distribution. The full text of the license may= be found at > +# http://opensource.org/licenses/bsd-license.php > +# > +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, > +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR I= MPLIED. > +# > +## > + > +[FV.BiosUpdateCargo] > +FvAlignment =3D 16 > +ERASE_POLARITY =3D 1 > +MEMORY_MAPPED =3D TRUE > +STICKY_WRITE =3D TRUE > +LOCK_CAP =3D TRUE > +LOCK_STATUS =3D TRUE > +WRITE_DISABLED_CAP =3D TRUE > +WRITE_ENABLED_CAP =3D TRUE > +WRITE_STATUS =3D TRUE > +WRITE_LOCK_CAP =3D TRUE > +WRITE_LOCK_STATUS =3D TRUE > +READ_DISABLED_CAP =3D TRUE > +READ_ENABLED_CAP =3D TRUE > +READ_STATUS =3D TRUE > +READ_LOCK_CAP =3D TRUE > +READ_LOCK_STATUS =3D TRUE > + > +FILE RAW =3D AF9C9EB2-12AD-4D3E-A4D4-96F6C9966215 { > + $(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/FV/QUARK.fd > + } > + > +FILE RAW =3D ce57b167-b0e4-41e8-a897-5f4feb781d40 { > + $(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/FV/CAPSULEDISPATCHFV= .Fv > + } > + > +FILE RAW =3D 812136D3-4D3A-433A-9418-29BB9BF78F6E { > + QuarkPlatformPkg/Feature/Capsule/SystemBiosUpdateConfig/SystemBiosUp= dateConfig.ini > + } > + > +[FmpPayload.FmpPayloadBiosPkcs7] > +IMAGE_HEADER_INIT_VERSION =3D 0x02 > +IMAGE_TYPE_ID =3D 62af20c0-7016-424a-9bf8-9ccc86584090 # Sys= tem FMP special > Guid (do not change it) > +IMAGE_INDEX =3D 0x1 > +HARDWARE_INSTANCE =3D 0x0 > +MONOTONIC_COUNT =3D 0x2 > +CERTIFICATE_GUID =3D 4AAFD29D-68DF-49EE-8AA9-347D375665A7 # PKC= S7 > + > +FILE DATA =3D > $(WORKSPACE)/$(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/FV/BIOSUPDAT= ECARGO.Fv > + > +[FmpPayload.FmpPayloadBiosRsa2048] > +IMAGE_HEADER_INIT_VERSION =3D 0x02 > +IMAGE_TYPE_ID =3D 62af20c0-7016-424a-9bf8-9ccc86584090 # Sys= tem FMP special > Guid (do not change it) > +IMAGE_INDEX =3D 0x1 > +HARDWARE_INSTANCE =3D 0x0 > +MONOTONIC_COUNT =3D 0x2 > +CERTIFICATE_GUID =3D A7717414-C616-4977-9420-844712A735BF # RSA= 2048SHA256 > + > +FILE DATA =3D > $(WORKSPACE)/$(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/FV/BIOSUPDAT= ECARGO.Fv > + > +[Capsule.BiosCapsuleFmpPkcs7] > +CAPSULE_GUID =3D 6dcbd5ed-e82d-4c44-bda1-7194199ad92a # F= MP special Guid > (do not change it) > +CAPSULE_FLAGS =3D PersistAcrossReset,InitiateReset > +CAPSULE_HEADER_SIZE =3D 0x20 > +CAPSULE_HEADER_INIT_VERSION =3D 0x1 > + > +FMP_PAYLOAD =3D FmpPayloadBiosPkcs7 > + > +[Capsule.BiosCapsuleFmpRsa2048] > +CAPSULE_GUID =3D 6dcbd5ed-e82d-4c44-bda1-7194199ad92a # F= MP special Guid > (do not change it) > +CAPSULE_FLAGS =3D PersistAcrossReset,InitiateReset > +CAPSULE_HEADER_SIZE =3D 0x20 > +CAPSULE_HEADER_INIT_VERSION =3D 0x1 > + > +FMP_PAYLOAD =3D FmpPayloadBiosRsa2048 > + > -- > 2.7.4.windows.1