From nobody Sun May 5 10:19:28 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1522301489757783.0566048464091; Wed, 28 Mar 2018 22:31:29 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 82051224DD157; Wed, 28 Mar 2018 22:24:48 -0700 (PDT) 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 9AA262210D9DF for ; Wed, 28 Mar 2018 22:24:45 -0700 (PDT) Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Mar 2018 22:31:24 -0700 Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by orsmga004.jf.intel.com with ESMTP; 28 Mar 2018 22:31:24 -0700 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 28 Mar 2018 22:31:23 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.235]) by SHSMSX104.ccr.corp.intel.com ([169.254.5.226]) with mapi id 14.03.0319.002; Thu, 29 Mar 2018 13:31:21 +0800 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.126; helo=mga18.intel.com; envelope-from=mang.guo@intel.com; receiver=edk2-devel@lists.01.org X-Amp-Result: UNSCANNABLE X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,375,1517904000"; d="dat'59?scan'59,208,59";a="186936414" From: "Guo, Mang" To: "edk2-devel@lists.01.org" Thread-Topic: [Patch][edk2-platforms/devel-MinnowBoardMax-UDK2017] Capsule update Thread-Index: AdPHHysQGIeCVTOdRJSBk0/mn/BRhA== Date: Thu, 29 Mar 2018 05:31:20 +0000 Message-ID: <22D2C85ED001C54AA20BFE3B0E4751D1525CEAEA@SHSMSX103.ccr.corp.intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: <22D2C85ED001C54AA20BFE3B0E4751D1525CEAEA@SHSMSX103.ccr.corp.intel.com> x-originating-ip: [10.239.127.40] MIME-Version: 1.0 X-Content-Filtered-By: Mailman/MimeDel 2.1.26 Subject: [edk2] [Patch][edk2-platforms/devel-MinnowBoardMax-UDK2017] Capsule update X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Wei, David" Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" 1.Add PEI and NvRam part in Capsule update, enable GCC capsule update. 3.Change GCC video resolution to align with VS build 3.Code cleanup Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Guo Mang --- .../SystemFirmwareUpdateConfig.ini | 23 +++---- .../SystemFirmwareUpdateConfigGcc.ini | 70 ++++++++++++++++++= ++++ Vlv2TbltDevicePkg/PlatformCapsule.dsc | 44 ++++++++++++++ Vlv2TbltDevicePkg/PlatformCapsule.fdf | 63 +++++++++++++++++++ Vlv2TbltDevicePkg/PlatformCapsuleGcc.dsc | 44 ++++++++++++++ Vlv2TbltDevicePkg/PlatformCapsuleGcc.fdf | 63 +++++++++++++++++++ Vlv2TbltDevicePkg/PlatformPkg.fdf | 60 +++---------------- Vlv2TbltDevicePkg/PlatformPkgConfig.dsc | 3 +- Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 62 +++---------------- Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 61 ++++++++++--------- Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 59 +++++++++--------- Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 58 +++++++++--------- Vlv2TbltDevicePkg/bld_vlv.bat | 7 ++- Vlv2TbltDevicePkg/bld_vlv.sh | 3 + 14 files changed, 411 insertions(+), 209 deletions(-) create mode 100644 Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareUpdateC= onfig/SystemFirmwareUpdateConfigGcc.ini create mode 100644 Vlv2TbltDevicePkg/PlatformCapsule.dsc create mode 100644 Vlv2TbltDevicePkg/PlatformCapsule.fdf create mode 100644 Vlv2TbltDevicePkg/PlatformCapsuleGcc.dsc create mode 100644 Vlv2TbltDevicePkg/PlatformCapsuleGcc.fdf diff --git a/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareUpdateConfig/S= ystemFirmwareUpdateConfig.ini b/Vlv2TbltDevicePkg/Feature/Capsule/SystemFir= mwareUpdateConfig/SystemFirmwareUpdateConfig.ini index c30eff1..bc405bf 100644 --- a/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFi= rmwareUpdateConfig.ini +++ b/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFi= rmwareUpdateConfig.ini @@ -1,6 +1,6 @@ ## @file # -# Copyright (c) 2017, Intel Corporation. All rights reserved.
+# Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.
# This program and the accompanying materials # are licensed and made available under the terms and conditions of the B= SD License # which accompanies this distribution. The full text of the license may = be found at @@ -12,15 +12,18 @@ ## =20 [Head] -NumOfUpdate =3D 1 -NumOfRecovery =3D 1 -Update0 =3D Vlv2FvMain -Recovery0 =3D Vlv2FvMain +NumOfUpdate =3D 5 +NumOfRecovery =3D 0 +Update0 =3D Vlv2FvBinary +Update1 =3D Vlv2FvMain +Update2 =3D Vlv2FvRecovery2 +Update3 =3D Vlv2FvRecovery +Update4 =3D Vlv2FvNvRam =20 [Vlv2FvMicrocode] FirmwareType =3D 0 # SystemFirmware AddressType =3D 0 # 0 - relative address, 1 - absolute address. -BaseAddress =3D 0x00000000 # Base address offset on flash +BaseAddress =3D 0x00400000 # Base address offset on flash Length =3D 0x00040000 # Length ImageOffset =3D 0x00000000 # Image offset of this SystemFirmware image FileGuid =3D 14D83A59-A810-4556-8192-1C0A593C065C # PcdEdkiiSystemFirm= wareFileGuid @@ -28,7 +31,7 @@ FileGuid =3D 14D83A59-A810-4556-8192-1C0A593C065C # P= cdEdkiiSystemFirmwareFile [Vlv2FvNvRam] FirmwareType =3D 1 # NvRam AddressType =3D 0 # 0 - relative address, 1 - absolute address. -BaseAddress =3D 0x00040000 # Base address offset on flash +BaseAddress =3D 0x00440000 # Base address offset on flash Length =3D 0x00080000 # Length ImageOffset =3D 0x00040000 # Image offset of this SystemFirmware image FileGuid =3D 14D83A59-A810-4556-8192-1C0A593C065C # PcdEdkiiSystemFirm= wareFileGuid @@ -36,7 +39,7 @@ FileGuid =3D 14D83A59-A810-4556-8192-1C0A593C065C # P= cdEdkiiSystemFirmwareFile [Vlv2FvBinary] FirmwareType =3D 0 # SystemFirmware AddressType =3D 0 # 0 - relative address, 1 - absolute address. -BaseAddress =3D 0x000C0000 # Base address offset on flash +BaseAddress =3D 0x004C0000 # Base address offset on flash Length =3D 0x00050000 # Length ImageOffset =3D 0x000C0000 # Image offset of this SystemFirmware image FileGuid =3D 14D83A59-A810-4556-8192-1C0A593C065C # PcdEdkiiSystemFirm= wareFileGuid @@ -52,7 +55,7 @@ FileGuid =3D 14D83A59-A810-4556-8192-1C0A593C065C # P= cdEdkiiSystemFirmwareFile [Vlv2FvRecovery2] FirmwareType =3D 0 # SystemFirmware AddressType =3D 0 # 0 - relative address, 1 - absolute address. -BaseAddress =3D 0x00320000 # Base address offset on flash +BaseAddress =3D 0x00720000 # Base address offset on flash Length =3D 0x00070000 # Length ImageOffset =3D 0x00320000 # Image offset of this SystemFirmware image FileGuid =3D 14D83A59-A810-4556-8192-1C0A593C065C # PcdEdkiiSystemFirm= wareFileGuid @@ -60,7 +63,7 @@ FileGuid =3D 14D83A59-A810-4556-8192-1C0A593C065C # P= cdEdkiiSystemFirmwareFile [Vlv2FvRecovery] FirmwareType =3D 0 # SystemFirmware AddressType =3D 0 # 0 - relative address, 1 - absolute address. -BaseAddress =3D 0x00390000 # Base address offset on flash +BaseAddress =3D 0x00790000 # Base address offset on flash Length =3D 0x00070000 # Length ImageOffset =3D 0x00390000 # Image offset of this SystemFirmware image FileGuid =3D 14D83A59-A810-4556-8192-1C0A593C065C # PcdEdkiiSystemFirm= wareFileGuid diff --git a/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareUpdateConfig/S= ystemFirmwareUpdateConfigGcc.ini b/Vlv2TbltDevicePkg/Feature/Capsule/System= FirmwareUpdateConfig/SystemFirmwareUpdateConfigGcc.ini new file mode 100644 index 0000000..438a5a9 --- /dev/null +++ b/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFi= rmwareUpdateConfigGcc.ini @@ -0,0 +1,70 @@ +## @file +# +# Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.
+# This program and the accompanying materials +# are licensed and made available under the terms and conditions of the B= SD 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 IM= PLIED. +# +## + +[Head] +NumOfUpdate =3D 5 +NumOfRecovery =3D 0 +Update0 =3D Vlv2FvBinary +Update1 =3D Vlv2FvMain +Update2 =3D Vlv2FvRecovery2 +Update3 =3D Vlv2FvRecovery +Update4 =3D Vlv2FvNvRam + +[Vlv2FvMicrocode] +FirmwareType =3D 0 # SystemFirmware +AddressType =3D 0 # 0 - relative address, 1 - absolute address. +BaseAddress =3D 0x00400000 # Base address offset on flash +Length =3D 0x00040000 # Length +ImageOffset =3D 0x00000000 # Image offset of this SystemFirmware image +FileGuid =3D 14D83A59-A810-4556-8192-1C0A593C065C # PcdEdkiiSystemFirm= wareFileGuid + +[Vlv2FvNvRam] +FirmwareType =3D 1 # NvRam +AddressType =3D 0 # 0 - relative address, 1 - absolute address. +BaseAddress =3D 0x00440000 # Base address offset on flash +Length =3D 0x00080000 # Length +ImageOffset =3D 0x00040000 # Image offset of this SystemFirmware image +FileGuid =3D 14D83A59-A810-4556-8192-1C0A593C065C # PcdEdkiiSystemFirm= wareFileGuid + +[Vlv2FvBinary] +FirmwareType =3D 0 # SystemFirmware +AddressType =3D 0 # 0 - relative address, 1 - absolute address. +BaseAddress =3D 0x004C0000 # Base address offset on flash +Length =3D 0x00050000 # Length +ImageOffset =3D 0x000C0000 # Image offset of this SystemFirmware image +FileGuid =3D 14D83A59-A810-4556-8192-1C0A593C065C # PcdEdkiiSystemFirm= wareFileGuid + +[Vlv2FvMain] +FirmwareType =3D 0 # SystemFirmware +AddressType =3D 0 # 0 - relative address, 1 - absolute address. +BaseAddress =3D 0x00510000 # Base address offset on flash +Length =3D 0x00215000 # Length +ImageOffset =3D 0x00110000 # Image offset of this SystemFirmware image +FileGuid =3D 14D83A59-A810-4556-8192-1C0A593C065C # PcdEdkiiSystemFirm= wareFileGuid + +[Vlv2FvRecovery2] +FirmwareType =3D 0 # SystemFirmware +AddressType =3D 0 # 0 - relative address, 1 - absolute address. +BaseAddress =3D 0x00725000 # Base address offset on flash +Length =3D 0x0006B000 # Length +ImageOffset =3D 0x00325000 # Image offset of this SystemFirmware image +FileGuid =3D 14D83A59-A810-4556-8192-1C0A593C065C # PcdEdkiiSystemFirm= wareFileGuid + +[Vlv2FvRecovery] +FirmwareType =3D 0 # SystemFirmware +AddressType =3D 0 # 0 - relative address, 1 - absolute address. +BaseAddress =3D 0x00790000 # Base address offset on flash +Length =3D 0x00070000 # Length +ImageOffset =3D 0x00390000 # Image offset of this SystemFirmware image +FileGuid =3D 14D83A59-A810-4556-8192-1C0A593C065C # PcdEdkiiSystemFirm= wareFileGuid + diff --git a/Vlv2TbltDevicePkg/PlatformCapsule.dsc b/Vlv2TbltDevicePkg/Plat= formCapsule.dsc new file mode 100644 index 0000000..eeb529e --- /dev/null +++ b/Vlv2TbltDevicePkg/PlatformCapsule.dsc @@ -0,0 +1,44 @@ +#/** @file +# Platform capsule description. +# +# Copyright (c) 2018, Intel Corporation. All rights reserved.
+# +# This program and the accompanying materials are licensed and made availa= ble under +# the terms and conditions of the BSD License that accompanies this distri= bution. +# 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 IMP= LIED. +# +# +#**/ + +[Defines] + PLATFORM_NAME =3D Vlv2TbltDevicePkg + PLATFORM_GUID =3D EE87F258-6ECC-4415-B1D8-23771BEE26E7 + PLATFORM_VERSION =3D 0.1 + FLASH_DEFINITION =3D Vlv2TbltDevicePkg/PlatformCapsule.fdf + OUTPUT_DIRECTORY =3D Build/Vlv2TbltDevicePkg + SUPPORTED_ARCHITECTURES =3D IA32|X64 + BUILD_TARGETS =3D DEBUG|RELEASE + SKUID_IDENTIFIER =3D DEFAULT + +##########################################################################= ######################### +# +# Components Section - list of the modules and components that will be pro= cessed by compilation +# tools and the EDK II tools to generate PE32/PE32+/C= off image files. +# +# Note: The EDK II DSC file is not used to specify how compiled binary ima= ges get placed +# into firmware volume images. This section is just a list of module= s to compile from +# source into UEFI-compliant binaries. +# It is the FDF file that contains information on combining binary f= iles 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 s= hould 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 requ= ired in the FDF file, +# When a module listed here is excluded from FDF file, then UEFI-com= pliant binary will be +# generated for it, but the binary will not be put into any firmware= volume. +# +##########################################################################= ######################### diff --git a/Vlv2TbltDevicePkg/PlatformCapsule.fdf b/Vlv2TbltDevicePkg/Plat= formCapsule.fdf new file mode 100644 index 0000000..e126286 --- /dev/null +++ b/Vlv2TbltDevicePkg/PlatformCapsule.fdf @@ -0,0 +1,63 @@ +## @file +# FDF file of Platform capsule. +# +# Copyright (c) 2018 Intel Corporation. +# +# This program and the accompanying materials +# are licensed and made available under the terms and conditions of the BS= D License +# which accompanies this distribution. The full text of the license may b= e 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 IMP= LIED. +# +## + +[FV.SystemFirmwareUpdateCargo] +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 14D83A59-A810-4556-8192-1C0A593C065C { # PcdEdkiiSystemFirmwa= reFileGuid + $(WORKSPACE)/$(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/FV/Vlv.ROM + } + +FILE RAW =3D ce57b167-b0e4-41e8-a897-5f4feb781d40 { # gEdkiiSystemFmpCapsu= leDriverFvFileGuid + $(WORKSPACE)/$(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/FV/CAPSUL= EDISPATCHFV.Fv + } + +FILE RAW =3D 812136D3-4D3A-433A-9418-29BB9BF78F6E { # gEdkiiSystemFmpCapsu= leConfigFileGuid + Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFir= mwareUpdateConfig.ini + } + +[FmpPayload.FmpPayloadSystemFirmwareRsa2048] +IMAGE_HEADER_INIT_VERSION =3D 0x02 +IMAGE_TYPE_ID =3D 4096267b-da0a-42eb-b5eb-fef31d207cb4 # PcdSy= stemFmpCapsuleImageTypeIdGuid +IMAGE_INDEX =3D 0x1 +HARDWARE_INSTANCE =3D 0x0 +MONOTONIC_COUNT =3D 0x2 +CERTIFICATE_GUID =3D A7717414-C616-4977-9420-844712A735BF # RSA20= 48SHA256 + +FILE DATA =3D $(WORKSPACE)/$(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)= /FV/SYSTEMFIRMWAREUPDATECARGO.Fv + +[Capsule.Vlv2] +CAPSULE_GUID =3D 6dcbd5ed-e82d-4c44-bda1-7194199ad92a # gEf= iFmpCapsuleGuid +CAPSULE_FLAGS =3D PersistAcrossReset,InitiateReset +CAPSULE_HEADER_SIZE =3D 0x20 +CAPSULE_HEADER_INIT_VERSION =3D 0x1 + +FMP_PAYLOAD =3D FmpPayloadSystemFirmwareRsa2048 + diff --git a/Vlv2TbltDevicePkg/PlatformCapsuleGcc.dsc b/Vlv2TbltDevicePkg/P= latformCapsuleGcc.dsc new file mode 100644 index 0000000..d5d72f4 --- /dev/null +++ b/Vlv2TbltDevicePkg/PlatformCapsuleGcc.dsc @@ -0,0 +1,44 @@ +#/** @file +# Platform capsule description. +# +# Copyright (c) 2018, Intel Corporation. All rights reserved.
+# +# This program and the accompanying materials are licensed and made availa= ble under +# the terms and conditions of the BSD License that accompanies this distri= bution. +# 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 IMP= LIED. +# +# +#**/ + +[Defines] + PLATFORM_NAME =3D Vlv2TbltDevicePkg + PLATFORM_GUID =3D EE87F258-6ECC-4415-B1D8-23771BEE26E7 + PLATFORM_VERSION =3D 0.1 + FLASH_DEFINITION =3D Vlv2TbltDevicePkg/PlatformCapsuleGcc.= fdf + OUTPUT_DIRECTORY =3D Build/Vlv2TbltDevicePkg + SUPPORTED_ARCHITECTURES =3D IA32|X64 + BUILD_TARGETS =3D DEBUG|RELEASE + SKUID_IDENTIFIER =3D DEFAULT + +##########################################################################= ######################### +# +# Components Section - list of the modules and components that will be pro= cessed by compilation +# tools and the EDK II tools to generate PE32/PE32+/C= off image files. +# +# Note: The EDK II DSC file is not used to specify how compiled binary ima= ges get placed +# into firmware volume images. This section is just a list of module= s to compile from +# source into UEFI-compliant binaries. +# It is the FDF file that contains information on combining binary f= iles 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 s= hould 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 requ= ired in the FDF file, +# When a module listed here is excluded from FDF file, then UEFI-com= pliant binary will be +# generated for it, but the binary will not be put into any firmware= volume. +# +##########################################################################= ######################### diff --git a/Vlv2TbltDevicePkg/PlatformCapsuleGcc.fdf b/Vlv2TbltDevicePkg/P= latformCapsuleGcc.fdf new file mode 100644 index 0000000..9813301 --- /dev/null +++ b/Vlv2TbltDevicePkg/PlatformCapsuleGcc.fdf @@ -0,0 +1,63 @@ +## @file +# FDF file of Platform capsule. +# +# Copyright (c) 2018 Intel Corporation. +# +# This program and the accompanying materials +# are licensed and made available under the terms and conditions of the BS= D License +# which accompanies this distribution. The full text of the license may b= e 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 IMP= LIED. +# +## + +[FV.SystemFirmwareUpdateCargo] +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 14D83A59-A810-4556-8192-1C0A593C065C { # PcdEdkiiSystemFirmwa= reFileGuid + $(WORKSPACE)/$(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/FV/VLV.fd + } + +FILE RAW =3D ce57b167-b0e4-41e8-a897-5f4feb781d40 { # gEdkiiSystemFmpCapsu= leDriverFvFileGuid + $(WORKSPACE)/$(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/FV/CAPSUL= EDISPATCHFV.Fv + } + +FILE RAW =3D 812136D3-4D3A-433A-9418-29BB9BF78F6E { # gEdkiiSystemFmpCapsu= leConfigFileGuid + Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFir= mwareUpdateConfigGcc.ini + } + +[FmpPayload.FmpPayloadSystemFirmwareRsa2048] +IMAGE_HEADER_INIT_VERSION =3D 0x02 +IMAGE_TYPE_ID =3D 4096267b-da0a-42eb-b5eb-fef31d207cb4 # PcdSy= stemFmpCapsuleImageTypeIdGuid +IMAGE_INDEX =3D 0x1 +HARDWARE_INSTANCE =3D 0x0 +MONOTONIC_COUNT =3D 0x2 +CERTIFICATE_GUID =3D A7717414-C616-4977-9420-844712A735BF # RSA20= 48SHA256 + +FILE DATA =3D $(WORKSPACE)/$(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)= /FV/SYSTEMFIRMWAREUPDATECARGO.Fv + +[Capsule.Vlv2] +CAPSULE_GUID =3D 6dcbd5ed-e82d-4c44-bda1-7194199ad92a # gEf= iFmpCapsuleGuid +CAPSULE_FLAGS =3D PersistAcrossReset,InitiateReset +CAPSULE_HEADER_SIZE =3D 0x20 +CAPSULE_HEADER_INIT_VERSION =3D 0x1 + +FMP_PAYLOAD =3D FmpPayloadSystemFirmwareRsa2048 + diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/Platform= Pkg.fdf index ed5f4e1..1942cf5 100644 --- a/Vlv2TbltDevicePkg/PlatformPkg.fdf +++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf @@ -1,7 +1,7 @@ #/** @file # FDF file of Platform. # -# Copyright (c) 2008 - 2017, Intel Corporation. All rights reserved.
+# Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.
# = =20 # This program and the accompanying materials are licensed and made availa= ble under # the terms and conditions of the BSD License that accompanies this distri= bution. =20 @@ -375,7 +375,7 @@ INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/= $(DXE_ARCHITECTURE)$(TARGET INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/IA32/MemoryInit.inf !endif =20 -!if $(CAPSULE_GENERATE_ENABLE) +!if $(CAPSULE_ENABLE) # FMP image decriptor INF RuleOverride =3D FMP_IMAGE_DESC Vlv2TbltDevicePkg/Feature/Capsule/Syst= emFirmwareDescriptor/SystemFirmwareDescriptor.inf !endif @@ -746,10 +746,14 @@ FILE FREEFORM =3D 878AC2CC-5343-46F2-B563-51F89DAF56B= A { !endif !endif =20 -!if $(CAPSULE_GENERATE_ENABLE) +!if $(CAPSULE_ENABLE) INF MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf +!endif +!if $(CAPSULE_ENABLE) INF SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportD= xe.inf +!endif =20 +!if $(CAPSULE_ENABLE) FILE FREEFORM =3D PCD(gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiRsa2048Sh= a256TestPublicKeyFileGuid) { SECTION RAW =3D BaseTools/Source/Python/Rsa2048Sha256Sign/TestSigning= PublicKey.bin SECTION UI =3D "Rsa2048Sha256TestSigningPublicKey" @@ -817,7 +821,7 @@ READ_LOCK_CAP =3D TRUE READ_LOCK_STATUS =3D TRUE =20 =20 -!if $(CAPSULE_GENERATE_ENABLE) +!if $(CAPSULE_ENABLE) [FV.CapsuleDispatchFv] FvAlignment =3D 16 ERASE_POLARITY =3D 1 @@ -838,53 +842,7 @@ READ_LOCK_STATUS =3D TRUE =20 INF SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateD= xe.inf =20 -[FV.SystemFirmwareUpdateCargo] -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 14D83A59-A810-4556-8192-1C0A593C065C { # PcdEdkiiSystemFirmwa= reFileGuid - FD =3D Vlv - } - -FILE RAW =3D ce57b167-b0e4-41e8-a897-5f4feb781d40 { # gEdkiiSystemFmpCapsu= leDriverFvFileGuid - FV =3D CapsuleDispatchFv - } - -FILE RAW =3D 812136D3-4D3A-433A-9418-29BB9BF78F6E { # gEdkiiSystemFmpCapsu= leConfigFileGuid - Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFir= mwareUpdateConfig.ini - } - -[FmpPayload.FmpPayloadSystemFirmwareRsa2048] -IMAGE_HEADER_INIT_VERSION =3D 0x02 -IMAGE_TYPE_ID =3D 4096267b-da0a-42eb-b5eb-fef31d207cb4 # PcdSy= stemFmpCapsuleImageTypeIdGuid -IMAGE_INDEX =3D 0x1 -HARDWARE_INSTANCE =3D 0x0 -MONOTONIC_COUNT =3D 0x2 -CERTIFICATE_GUID =3D A7717414-C616-4977-9420-844712A735BF # RSA20= 48SHA256 - -FV =3D SystemFirmwareUpdateCargo - -[Capsule.FVMAIN] -CAPSULE_GUID =3D 6dcbd5ed-e82d-4c44-bda1-7194199ad92a # gEf= iFmpCapsuleGuid -CAPSULE_FLAGS =3D PersistAcrossReset,InitiateReset -CAPSULE_HEADER_SIZE =3D 0x20 -CAPSULE_HEADER_INIT_VERSION =3D 0x1 =20 -FMP_PAYLOAD =3D FmpPayloadSystemFirmwareRsa2048 !endif =20 ##########################################################################= ###### @@ -1121,7 +1079,7 @@ FMP_PAYLOAD =3D FmpPayloadSystemFirmwareRsa2048 FILE PEIM =3D $(NAMED_GUID) { RAW BIN |.acpi PEI_DEPEX PEI_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex - PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi + PE32 PE32 Align=3D4K $(INF_OUTPUT)/$(MODULE_NAME).efi UI STRING=3D"$(MODULE_NAME)" Optional VERSION STRING=3D"$(INF_VERSION)" Optional BUILD_NUM=3D$(BUILD_NUMBE= R) } diff --git a/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc b/Vlv2TbltDevicePkg/Pl= atformPkgConfig.dsc index b6df2a0..0a8da1f 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc @@ -1,7 +1,7 @@ #/** @file # platform configuration file. # -# Copyright (c) 2012 - 2017, Intel Corporation. All rights reserved.
+# Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.
# = =20 # This program and the accompanying materials are licensed and made availa= ble under # the terms and conditions of the BSD License that accompanies this distri= bution. =20 @@ -93,4 +93,3 @@ DEFINE ESRT_ENABLE =3D TRUE # DEFINE SOURCE_DEBUG_ENABLE =3D FALSE =20 -DEFINE CAPSULE_GENERATE_ENABLE =3D TRUE diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Vlv2TbltDevicePkg/Platf= ormPkgGcc.fdf index 78103d3..7478d3c 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf +++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf @@ -1,7 +1,7 @@ #/** @file # FDF file of Platform. # -# Copyright (c) 2008 - 2017, Intel Corporation. All rights reserved.
+# Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.
# = =20 # This program and the accompanying materials are licensed and made availa= ble under # the terms and conditions of the BSD License that accompanies this distri= bution. =20 @@ -328,7 +328,7 @@ INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/= $(DXE_ARCHITECTURE)$(TARGET INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/IA32/MemoryInit.inf !endif =20 -!if $(CAPSULE_GENERATE_ENABLE) +!if $(CAPSULE_ENABLE) # FMP image decriptor INF RuleOverride =3D FMP_IMAGE_DESC Vlv2TbltDevicePkg/Feature/Capsule/Syst= emFirmwareDescriptor/SystemFirmwareDescriptor.inf !endif @@ -699,10 +699,14 @@ FILE FREEFORM =3D 878AC2CC-5343-46F2-B563-51F89DAF56B= A { !endif !endif =20 -!if $(CAPSULE_GENERATE_ENABLE) +!if $(CAPSULE_ENABLE) INF MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf +!endif +!if $(CAPSULE_ENABLE) INF SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportD= xe.inf +!endif =20 +!if $(CAPSULE_ENABLE) FILE FREEFORM =3D PCD(gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiRsa2048Sh= a256TestPublicKeyFileGuid) { SECTION RAW =3D BaseTools/Source/Python/Rsa2048Sha256Sign/TestSigning= PublicKey.bin SECTION UI =3D "Rsa2048Sha256TestSigningPublicKey" @@ -772,7 +776,7 @@ READ_LOCK_CAP =3D TRUE READ_LOCK_STATUS =3D TRUE =20 =20 -!if $(CAPSULE_GENERATE_ENABLE) +!if $(CAPSULE_ENABLE) [FV.CapsuleDispatchFv] FvAlignment =3D 16 ERASE_POLARITY =3D 1 @@ -793,53 +797,7 @@ READ_LOCK_STATUS =3D TRUE =20 INF SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateD= xe.inf =20 -[FV.SystemFirmwareUpdateCargo] -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 14D83A59-A810-4556-8192-1C0A593C065C { # PcdEdkiiSystemFirmwa= reFileGuid - FD =3D Vlv - } - -FILE RAW =3D ce57b167-b0e4-41e8-a897-5f4feb781d40 { # gEdkiiSystemFmpCapsu= leDriverFvFileGuid - FV =3D CapsuleDispatchFv - } =20 -FILE RAW =3D 812136D3-4D3A-433A-9418-29BB9BF78F6E { # gEdkiiSystemFmpCapsu= leConfigFileGuid - Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFir= mwareUpdateConfig.ini - } - -[FmpPayload.FmpPayloadSystemFirmwareRsa2048] -IMAGE_HEADER_INIT_VERSION =3D 0x02 -IMAGE_TYPE_ID =3D 4096267b-da0a-42eb-b5eb-fef31d207cb4 # PcdSy= stemFmpCapsuleImageTypeIdGuid -IMAGE_INDEX =3D 0x1 -HARDWARE_INSTANCE =3D 0x0 -MONOTONIC_COUNT =3D 0x2 -CERTIFICATE_GUID =3D A7717414-C616-4977-9420-844712A735BF # RSA20= 48SHA256 - -FV =3D SystemFirmwareUpdateCargo - -[Capsule.FVMAIN] -CAPSULE_GUID =3D 6dcbd5ed-e82d-4c44-bda1-7194199ad92a # gEf= iFmpCapsuleGuid -CAPSULE_FLAGS =3D PersistAcrossReset,InitiateReset -CAPSULE_HEADER_SIZE =3D 0x20 -CAPSULE_HEADER_INIT_VERSION =3D 0x1 - -FMP_PAYLOAD =3D FmpPayloadSystemFirmwareRsa2048 !endif =20 ##########################################################################= ###### @@ -1077,12 +1035,10 @@ FMP_PAYLOAD =3D FmpPayloadSystemFirmwareRsa2048 } =20 [Rule.Common.PEIM.FMP_IMAGE_DESC] - FILE PEIM =3D $(NAMED_GUID) { RAW BIN |.acpi - PEI_DEPEX PEI_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex - PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi + PE32 PE32 Align=3D4K $(INF_OUTPUT)/$(MODULE_NAME).efi UI STRING=3D"$(MODULE_NAME)" Optional VERSION STRING=3D"$(INF_VERSION)" Optional BUILD_NUM=3D$(BUILD_NUMBE= R) } diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/Pl= atformPkgGccX64.dsc index 8779e04..5379824 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc @@ -1,7 +1,7 @@ #/** @file # Platform description. # -# Copyright (c) 2012 - 2017, Intel Corporation. All rights reserved.
+# Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.
# = =20 # This program and the accompanying materials are licensed and made availa= ble under # the terms and conditions of the BSD License that accompanies this distri= bution. =20 @@ -186,18 +186,15 @@ OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHo= okStatusCodeLibNull.inf =20 !if $(CAPSULE_ENABLE) =3D=3D TRUE - CapsuleLib|IntelFrameworkModulePkg/Library/DxeCapsuleLib/DxeCapsuleLib.inf + CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf !else CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf !endif =20 -!if $(CAPSULE_GENERATE_ENABLE) - CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf EdkiiSystemCapsuleLib|SignedCapsulePkg/Library/EdkiiSystemCapsuleLib/Edk= iiSystemCapsuleLib.inf FmpAuthenticationLib|MdeModulePkg/Library/FmpAuthenticationLibNull/FmpAu= thenticationLibNull.inf IniParsingLib|SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.inf PlatformFlashAccessLib|Vlv2TbltDevicePkg/Feature/Capsule/Library/Platfor= mFlashAccessLib/PlatformFlashAccessLib.inf -!endif =20 UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManag= erLib.inf =20 @@ -470,7 +467,7 @@ DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf !endif =20 -!if $(CAPSULE_GENERATE_ENABLE) +!if $(CAPSULE_ENABLE) =3D=3D TRUE CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibFmp/DxeRuntimeCapsuleLib.inf !endif =20 @@ -870,10 +867,10 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdSystemRebootAfterCa= psuleProcessFlag|0x0001 =20 ## This PCD defines the video horizontal resolution. # This PCD could be set to 0 then video resolution could be at highest = resolution. - gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|800 ## This PCD defines the video vertical resolution. # This PCD could be set to 0 then video resolution could be at highest = resolution. - gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|600 =20 ## This PCD defines the Console output column and the default value is 2= 5 according to UEFI spec. # This PCD could be set to 0 then console output could be at max column= and max row. @@ -920,7 +917,7 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdSystemRebootAfterCaps= uleProcessFlag|0x0001 gEfiVLVTokenSpaceGuid.PcdCpuLockBoxSize|0 gEfiSecurityPkgTokenSpaceGuid.PcdUserPhysicalPresence|TRUE =20 -!if $(CAPSULE_GENERATE_ENABLE) +!if $(CAPSULE_ENABLE) gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiSystemFirmwareImageDescriptor= |{0x0}|VOID*|0x100 gEfiMdeModulePkgTokenSpaceGuid.PcdSystemFmpCapsuleImageTypeIdGuid|{0x7b,= 0x26, 0x96, 0x40, 0x0a, 0xda, 0xeb, 0x42, 0xb5, 0xeb, 0xfe, 0xf3, 0x1d, 0x= 20, 0x7c, 0xb4} gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiSystemFirmwareFileGuid|{0x59,= 0x3A, 0xD8, 0x14, 0x10, 0xA8, 0x56, 0x45, 0x81, 0x92, 0x1C, 0x0A, 0x59, 0x= 3C, 0x06, 0x5C} @@ -929,7 +926,7 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdSystemRebootAfterCaps= uleProcessFlag|0x0001 =20 [Components.IA32] =20 -!if $(CAPSULE_GENERATE_ENABLE) +!if $(CAPSULE_ENABLE) # FMP image decriptor Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwar= eDescriptor.inf { @@ -1239,27 +1236,6 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARG= ET)/IA32/fTPMInitPeim.inf FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf } - -!if $(CAPSULE_GENERATE_ENABLE) - MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf - - SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.= inf { - - FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibRsa2048= Sha256/FmpAuthenticationLibRsa2048Sha256.inf - DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf - } - - SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.= inf { - - FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibRsa2048= Sha256/FmpAuthenticationLibRsa2048Sha256.inf - DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf - } - - MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf { - - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf - } -!endif =20 =20 =20 @@ -1605,6 +1581,29 @@ MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTo= lerantWriteSmmDxe.inf Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.inf Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.inf =20 + !if $(CAPSULE_ENABLE) + MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf + MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf { + + PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf + } + !endif + + !if $(CAPSULE_ENABLE) + SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.= inf { + + FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibRsa2048= Sha256/FmpAuthenticationLibRsa2048Sha256.inf + DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf + } + + SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.= inf { + + FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibRsa2048= Sha256/FmpAuthenticationLibRsa2048Sha256.inf + DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf + } + +!endif + [BuildOptions] # # Define Build Options both for EDK and EDKII drivers. diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/Plat= formPkgIA32.dsc index 978e7f4..cc6f27e 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc @@ -1,7 +1,7 @@ #/** @file # Platform description. # -# Copyright (c) 2012 - 2017, Intel Corporation. All rights reserved.
+# Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.
# = =20 # This program and the accompanying materials are licensed and made availa= ble under # the terms and conditions of the BSD License that accompanies this distri= bution. =20 @@ -186,18 +186,15 @@ OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHo= okStatusCodeLibNull.inf =20 !if $(CAPSULE_ENABLE) =3D=3D TRUE - CapsuleLib|IntelFrameworkModulePkg/Library/DxeCapsuleLib/DxeCapsuleLib.inf + CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf !else CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf !endif =20 -!if $(CAPSULE_GENERATE_ENABLE) - CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf EdkiiSystemCapsuleLib|SignedCapsulePkg/Library/EdkiiSystemCapsuleLib/Edk= iiSystemCapsuleLib.inf FmpAuthenticationLib|MdeModulePkg/Library/FmpAuthenticationLibNull/FmpAu= thenticationLibNull.inf IniParsingLib|SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.inf PlatformFlashAccessLib|Vlv2TbltDevicePkg/Feature/Capsule/Library/Platfor= mFlashAccessLib/PlatformFlashAccessLib.inf -!endif =20 UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManag= erLib.inf =20 @@ -470,7 +467,7 @@ DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf !endif =20 -!if $(CAPSULE_GENERATE_ENABLE) +!if $(CAPSULE_ENABLE) =3D=3D TRUE CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibFmp/DxeRuntimeCapsuleLib.inf !endif [LibraryClasses.common.UEFI_DRIVER] @@ -921,7 +918,7 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdSystemRebootAfterCaps= uleProcessFlag|0x0001 gEfiVLVTokenSpaceGuid.PcdCpuLockBoxSize|0 gEfiSecurityPkgTokenSpaceGuid.PcdUserPhysicalPresence|TRUE =20 -!if $(CAPSULE_GENERATE_ENABLE) +!if $(CAPSULE_ENABLE) gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiSystemFirmwareImageDescriptor= |{0x0}|VOID*|0x100 gEfiMdeModulePkgTokenSpaceGuid.PcdSystemFmpCapsuleImageTypeIdGuid|{0x7b,= 0x26, 0x96, 0x40, 0x0a, 0xda, 0xeb, 0x42, 0xb5, 0xeb, 0xfe, 0xf3, 0x1d, 0x= 20, 0x7c, 0xb4} gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiSystemFirmwareFileGuid|{0x59,= 0x3A, 0xD8, 0x14, 0x10, 0xA8, 0x56, 0x45, 0x81, 0x92, 0x1C, 0x0A, 0x59, 0x= 3C, 0x06, 0x5C} @@ -930,7 +927,7 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdSystemRebootAfterCaps= uleProcessFlag|0x0001 =20 [Components.IA32] =20 -!if $(CAPSULE_GENERATE_ENABLE) +!if $(CAPSULE_ENABLE) # FMP image decriptor Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwar= eDescriptor.inf { @@ -1235,29 +1232,6 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARG= ET)/IA32/fTPMInitPeim.inf FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf } - -!if $(CAPSULE_GENERATE_ENABLE) - MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf - - SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.= inf { - - FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibRsa2048= Sha256/FmpAuthenticationLibRsa2048Sha256.inf - DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf - } - - SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.= inf { - - - FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibRsa2048= Sha256/FmpAuthenticationLibRsa2048Sha256.inf - DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf - } - - MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf { - - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf - } -!endif - =20 =20 MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntim= eDxe.inf PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.i= nf @@ -1608,6 +1582,29 @@ MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTo= lerantWriteSmmDxe.inf Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.inf Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.inf =20 + !if $(CAPSULE_ENABLE) + MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf + MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf { + + PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf + } + !endif + + !if $(CAPSULE_ENABLE) + SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.= inf { + + FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibRsa2048= Sha256/FmpAuthenticationLibRsa2048Sha256.inf + DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf + } + + SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.= inf { + + FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibRsa2048= Sha256/FmpAuthenticationLibRsa2048Sha256.inf + DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf + } + +!endif + [BuildOptions] # # Define Build Options both for EDK and EDKII drivers. diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/Platf= ormPkgX64.dsc index da1ba4b..50f168f 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc @@ -1,7 +1,7 @@ #/** @file # Platform description. # -# Copyright (c) 2012 - 2017, Intel Corporation. All rights reserved.
+# Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.
# = =20 # This program and the accompanying materials are licensed and made availa= ble under # the terms and conditions of the BSD License that accompanies this distri= bution. =20 @@ -186,18 +186,15 @@ OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHo= okStatusCodeLibNull.inf =20 !if $(CAPSULE_ENABLE) =3D=3D TRUE - CapsuleLib|IntelFrameworkModulePkg/Library/DxeCapsuleLib/DxeCapsuleLib.inf + CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf !else CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf !endif =20 -!if $(CAPSULE_GENERATE_ENABLE) - CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf EdkiiSystemCapsuleLib|SignedCapsulePkg/Library/EdkiiSystemCapsuleLib/Edk= iiSystemCapsuleLib.inf FmpAuthenticationLib|MdeModulePkg/Library/FmpAuthenticationLibNull/FmpAu= thenticationLibNull.inf IniParsingLib|SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.inf PlatformFlashAccessLib|Vlv2TbltDevicePkg/Feature/Capsule/Library/Platfor= mFlashAccessLib/PlatformFlashAccessLib.inf -!endif =20 UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManag= erLib.inf =20 @@ -470,7 +467,7 @@ DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf !endif =20 -!if $(CAPSULE_GENERATE_ENABLE) +!if $(CAPSULE_ENABLE) =3D=3D TRUE CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibFmp/DxeRuntimeCapsuleLib.inf !endif =20 @@ -922,7 +919,7 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdSystemRebootAfterCaps= uleProcessFlag|0x0001 gEfiVLVTokenSpaceGuid.PcdCpuLockBoxSize|0 gEfiSecurityPkgTokenSpaceGuid.PcdUserPhysicalPresence|TRUE =20 -!if $(CAPSULE_GENERATE_ENABLE) +!if $(CAPSULE_ENABLE) gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiSystemFirmwareImageDescriptor= |{0x0}|VOID*|0x100 gEfiMdeModulePkgTokenSpaceGuid.PcdSystemFmpCapsuleImageTypeIdGuid|{0x7b,= 0x26, 0x96, 0x40, 0x0a, 0xda, 0xeb, 0x42, 0xb5, 0xeb, 0xfe, 0xf3, 0x1d, 0x= 20, 0x7c, 0xb4} gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiSystemFirmwareFileGuid|{0x59,= 0x3A, 0xD8, 0x14, 0x10, 0xA8, 0x56, 0x45, 0x81, 0x92, 0x1C, 0x0A, 0x59, 0x= 3C, 0x06, 0x5C} @@ -931,7 +928,7 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdSystemRebootAfterCaps= uleProcessFlag|0x0001 =20 [Components.IA32] =20 -!if $(CAPSULE_GENERATE_ENABLE) +!if $(CAPSULE_ENABLE) # FMP image decriptor Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwar= eDescriptor.inf { @@ -1237,28 +1234,6 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARG= ET)/IA32/fTPMInitPeim.inf FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf } - -!if $(CAPSULE_GENERATE_ENABLE) - MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf - - SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.= inf { - - FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibRsa2048= Sha256/FmpAuthenticationLibRsa2048Sha256.inf - DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf - } - - SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.= inf { - - FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibRsa2048= Sha256/FmpAuthenticationLibRsa2048Sha256.inf - DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf - } - - MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf { - - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf - } -!endif - =20 =20 MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntim= eDxe.inf PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.i= nf @@ -1610,6 +1585,29 @@ MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTo= lerantWriteSmmDxe.inf Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.inf Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.inf =20 + !if $(CAPSULE_ENABLE) + MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf + MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf { + + PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf + } + !endif + + !if $(CAPSULE_ENABLE) + SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.= inf { + + FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibRsa2048= Sha256/FmpAuthenticationLibRsa2048Sha256.inf + DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf + } + + SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.= inf { + + FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibRsa2048= Sha256/FmpAuthenticationLibRsa2048Sha256.inf + DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf + } + +!endif + [BuildOptions] # # Define Build Options both for EDK and EDKII drivers. diff --git a/Vlv2TbltDevicePkg/bld_vlv.bat b/Vlv2TbltDevicePkg/bld_vlv.bat index d3fac09..1488b0c 100644 --- a/Vlv2TbltDevicePkg/bld_vlv.bat +++ b/Vlv2TbltDevicePkg/bld_vlv.bat @@ -1,7 +1,7 @@ @REM @file @REM Windows batch file to build BIOS ROM @REM -@REM Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.
+@REM Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
@REM This program and the accompanying materials @REM are licensed and made available under the terms and conditions of the= BSD License @REM which accompanies this distribution. The full text of the license ma= y be found at @@ -248,6 +248,7 @@ del /f/q ver_strings >nul =20 set BIOS_Name=3D%BOARD_ID%_%Arch%_%BUILD_TYPE%_%VERSION_MAJOR%_%VERSION_MI= NOR%.ROM copy /y/b %WORKSPACE%\%BUILD_PATH%\FV\Vlv%Arch%.fd %PLATFORM_PATH%\%BIOS_= Name% >nul +copy /y/b %WORKSPACE%\%BUILD_PATH%\FV\Vlv%Arch%.fd %WORKSPACE%\%BUILD_PAT= H%\FV\Vlv.ROM >nul =20 echo. echo Build location: %BUILD_PATH% @@ -255,6 +256,10 @@ echo BIOS ROM Created: %BIOS_Name% echo. echo -------------------- The EDKII BIOS build has successfully completed.= -------------------- echo. +@REM build capsule here +::if "%openssl_path%" =3D=3D "" goto Exit +echo > %WORKSPACE%\%BUILD_PATH%\FV\SYSTEMFIRMWAREUPDATECARGO.Fv +build -p %PLATFORM_PACKAGE%\PlatformCapsule.dsc goto Exit =20 :Usage diff --git a/Vlv2TbltDevicePkg/bld_vlv.sh b/Vlv2TbltDevicePkg/bld_vlv.sh index 74b489e..4dc8c9a 100755 --- a/Vlv2TbltDevicePkg/bld_vlv.sh +++ b/Vlv2TbltDevicePkg/bld_vlv.sh @@ -242,6 +242,9 @@ BOARD_ID=3D$(grep '^BOARD_ID' Conf/BiosId.env | cut -d = ' ' -f 3 | cut -c 1-7) BIOS_Name=3D"$BOARD_ID"_"$Arch"_"$BUILD_TYPE"_"$VERSION_MAJOR"_"$VERSION_M= INOR".ROM BIOS_ID=3D"$BOARD_ID"_"$Arch"_"$BUILD_TYPE"_"$VERSION_MAJOR"_"$VERSION_MIN= OR"_GCC.bin cp -f $WORKSPACE/$BUILD_PATH/FV/VLV.fd $WORKSPACE/$BIOS_Name + +echo > $WORKSPACE/$BUILD_PATH/FV/SYSTEMFIRMWAREUPDATECARGO.Fv +build -p $PLATFORM_PACKAGE/PlatformCapsuleGcc.dsc SEC_VERSION=3D1.0.2.1060v5 cat $IFWI_HEADER_FILE $SILICON_PATH/Vlv2MiscBinariesPkg/SEC/$SEC_VERSION/V= LV_SEC_REGION.bin $SILICON_PATH/Vlv2MiscBinariesPkg/SEC/$SEC_VERSION/Vacant= .bin $WORKSPACE/$BIOS_Name > $PLATFORM_PACKAGE/Stitch/$BIOS_ID =20 --=20 2.10.1.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel