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 67F7221ECCB17 for ; Wed, 20 Sep 2017 00:18:18 -0700 (PDT) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Sep 2017 00:21:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.42,420,1500966000"; d="dat'59?scan'59,208,59";a="1016492009" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by orsmga003.jf.intel.com with ESMTP; 20 Sep 2017 00:21:08 -0700 Received: from fmsmsx126.amr.corp.intel.com (10.18.125.43) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 20 Sep 2017 00:21:05 -0700 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by FMSMSX126.amr.corp.intel.com (10.18.125.43) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 20 Sep 2017 00:21:04 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.213]) by shsmsx102.ccr.corp.intel.com ([169.254.2.175]) with mapi id 14.03.0319.002; Wed, 20 Sep 2017 15:21:02 +0800 From: "Guo, Mang" To: "edk2-devel@lists.01.org" CC: "Wei, David" Thread-Topic: [Patch][edk2-platforms/minnowboard-max-udk2017] Vlv2TbltDevicePkg: Add ESRT table in OS Thread-Index: AdMx4QN+y2DxGmB1QYmWQ1L6twnjXA== Date: Wed, 20 Sep 2017 07:21:02 +0000 Message-ID: <22D2C85ED001C54AA20BFE3B0E4751D15256B5A5@SHSMSX103.ccr.corp.intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: <22D2C85ED001C54AA20BFE3B0E4751D15256B5A5@SHSMSX103.ccr.corp.intel.com> x-originating-ip: [10.239.127.40] MIME-Version: 1.0 X-Content-Filtered-By: Mailman/MimeDel 2.1.22 Subject: [Patch][edk2-platforms/minnowboard-max-udk2017] Vlv2TbltDevicePkg: Add ESRT table in OS 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, 20 Sep 2017 07:18:18 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable 1. Add ESRT table in OS. 2. Changed SystemFirmware Descriptor. 3. Remove re= dundant code. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Guo Mang --- .../SystemFirmwareDescriptor.acpi | Bin 172 -> 0 bytes .../SystemFirmwareDescriptor.inf | 7 +- .../SystemFirmwareDescriptorPei.c | 36 +++----- .../SystemFirmwareDescriptorTable.inf | 28 ------ .../Library/PlatformBdsLib/BdsPlatform.c | 3 + Vlv2TbltDevicePkg/PlatformPkg.fdf | 96 +----------------= ---- Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 94 +----------------= --- Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 31 +------ Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 33 +------ Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 44 +++------- 10 files changed, 41 insertions(+), 331 deletions(-) delete mode 100644 Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescrip= tor/SystemFirmwareDescriptor.acpi delete mode 100644 Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescrip= tor/SystemFirmwareDescriptorTable.inf diff --git a/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/Sys= temFirmwareDescriptor.acpi b/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwa= reDescriptor/SystemFirmwareDescriptor.acpi deleted file mode 100644 index b355bb47e8715e083320305d76178667a50b0c6c..000000000000000000000000000= 0000000000000 GIT binary patch literal 0 HcmV?d00001 literal 172 zcmWG`^K_|TU|?7S#Q%X{4v=3DO9;%c>N4qUfhJ8gaa@3X8z&6Y5qFr)Z*w-k_CCLnGD zVhCseQ~XdKjD~W-X2ICVbQnVpLm7h+gBwE%P}qQ>0*H~J5l}RgA&(&&i1QiBfg}S1 E0K^~~$p8QV diff --git a/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/Sys= temFirmwareDescriptor.inf b/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwar= eDescriptor/SystemFirmwareDescriptor.inf index 3cae775..b89d326 100644 --- a/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirm= wareDescriptor.inf +++ b/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirm= wareDescriptor.inf @@ -15,22 +15,21 @@ [Defines] INF_VERSION =3D 0x00010005 BASE_NAME =3D SystemFirmwareDescriptor - FILE_GUID =3D A3E13E7F-9FD9-4057-84FA-37423C789612 + FILE_GUID =3D 90B2B846-CA6D-4D6E-A8D3-C140A8E110AC MODULE_TYPE =3D PEIM VERSION_STRING =3D 1.0 ENTRY_POINT =3D SystemFirmwareDescriptorPeimEntry =20 [Sources] SystemFirmwareDescriptorPei.c + SystemFirmwareDescriptor.aslc =20 [Packages] MdePkg/MdePkg.dec + MdeModulePkg/MdeModulePkg.dec SignedCapsulePkg/SignedCapsulePkg.dec Vlv2TbltDevicePkg/PlatformPkg.dec =20 -[Guids] - gEdkiiSystemFirmwareImageDescriptorFileGuid - [LibraryClasses] PcdLib PeiServicesLib diff --git a/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/Sys= temFirmwareDescriptorPei.c b/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwa= reDescriptor/SystemFirmwareDescriptorPei.c index 792cbf8..b5a9323 100644 --- a/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirm= wareDescriptorPei.c +++ b/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirm= wareDescriptorPei.c @@ -19,8 +19,6 @@ #include #include =20 - - /** Entrypoint for SystemFirmwareDescriptor PEIM. =20 @@ -32,7 +30,7 @@ EFI_STATUS EFIAPI SystemFirmwareDescriptorPeimEntry ( - IN EFI_PEI_FILE_HANDLE PeiFileHandle, + IN EFI_PEI_FILE_HANDLE FileHandle, IN CONST EFI_PEI_SERVICES **PeiServices ) { @@ -41,34 +39,22 @@ SystemFirmwareDescriptorPeimEntry ( UINTN Size; UINTN Index; UINT32 AuthenticationStatus; - EFI_PEI_FV_HANDLE VolumeHandle; - EFI_PEI_FILE_HANDLE FileHandle; =20 + // + // Search RAW section. + // Index =3D 0; while (TRUE) { - Status =3D PeiServicesFfsFindNextVolume (Index++, &VolumeHandle); - if (EFI_ERROR (Status)) { - return Status; + Status =3D PeiServicesFfsFindSectionData3(EFI_SECTION_RAW, Index, File= Handle, (VOID **)&Descriptor, &AuthenticationStatus); + if (EFI_ERROR(Status)) { + // Should not happen, must something wrong in FDF. + ASSERT(FALSE); + return EFI_NOT_FOUND; } - Status =3D PeiServicesFfsFindFileByName (&gEdkiiSystemFirmwareImageDes= criptorFileGuid, VolumeHandle, &FileHandle); - if (!EFI_ERROR (Status)) { - // - // Search RAW section. - // - Index =3D 0; - while (TRUE) { - Status =3D PeiServicesFfsFindSectionData3(EFI_SECTION_RAW, Index++= , FileHandle, (VOID **)&Descriptor, &AuthenticationStatus); - if (EFI_ERROR(Status)) { - // Should not happen, must something wrong in FDF. - ASSERT(FALSE); - return EFI_NOT_FOUND; - } - if (Descriptor->Signature =3D=3D EDKII_SYSTEM_FIRMWARE_IMAGE_DESCR= IPTOR_SIGNATURE) { - break; - } - } + if (Descriptor->Signature =3D=3D EDKII_SYSTEM_FIRMWARE_IMAGE_DESCRIPTO= R_SIGNATURE) { break; } + Index++; } =20 DEBUG((DEBUG_INFO, "EDKII_SYSTEM_FIRMWARE_IMAGE_DESCRIPTOR size - 0x%x\n= ", Descriptor->Length)); diff --git a/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/Sys= temFirmwareDescriptorTable.inf b/Vlv2TbltDevicePkg/Feature/Capsule/SystemFi= rmwareDescriptor/SystemFirmwareDescriptorTable.inf deleted file mode 100644 index 5f491ef..0000000 --- a/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirm= wareDescriptorTable.inf +++ /dev/null @@ -1,28 +0,0 @@ -## @file -# System Firmware descriptor. -# -# Copyright (c) 2017, 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. -# -## - -[Defines] - INF_VERSION =3D 0x00010017 - BASE_NAME =3D SystemFirmwareDescriptorTable - FILE_GUID =3D 90B2B846-CA6D-4D6E-A8D3-C140A8E110AC - MODULE_TYPE =3D USER_DEFINED - VERSION_STRING =3D 1.0 - -[Binaries] - BIN|SystemFirmwareDescriptor.acpi - -[Packages] - MdeModulePkg/MdeModulePkg.dec - SignedCapsulePkg/SignedCapsulePkg.dec - diff --git a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c b/Vlv2T= bltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c index e9c3565..697ad67 100644 --- a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c +++ b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c @@ -2083,6 +2083,9 @@ FULL_CONFIGURATION: #ifdef FTPM_ENABLE TrEEPhysicalPresenceLibProcessRequest(NULL); #endif + if (EsrtManagement !=3D NULL) { + EsrtManagement->SyncEsrtFmp(); + } // // Close boot script and install ready to lock // diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/Platform= Pkg.fdf index e767cb5..6278a35 100644 --- a/Vlv2TbltDevicePkg/PlatformPkg.fdf +++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf @@ -333,10 +333,6 @@ INF IntelFspWrapperPkg/FspWrapperSecCore/FspWrapperSec= Core.inf INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/IA32/SecCore.inf !endif =20 -!if $(CAPSULE_GENERATE_ENABLE) -INF Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmw= areDescriptor.inf -INF USE=3DIA32 Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/= SystemFirmwareDescriptorTable.inf -!endif INF MdeModulePkg/Core/Pei/PeiMain.inf !if $(MINNOW2_FSP_BUILD) =3D=3D TRUE INF Vlv2TbltDevicePkg/FspSupport/BootModePei/BootModePei.inf @@ -379,6 +375,10 @@ 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) + # FMP image decriptor +INF RuleOverride =3D FMP_IMAGE_DESC Vlv2TbltDevicePkg/Feature/Capsule/Syst= emFirmwareDescriptor/SystemFirmwareDescriptor.inf +!endif =20 [FV.FVMAIN] BlockSize =3D $(FLASH_BLOCK_SIZE) @@ -817,86 +817,6 @@ READ_LOCK_CAP =3D TRUE READ_LOCK_STATUS =3D TRUE =20 =20 -[FV.Bios_Update_Data] -BlockSize =3D $(FLASH_BLOCK_SIZE) -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 FV_IMAGE =3D 4A538818-5AE0-4eb2-B2EB-488B23657022 { - SECTION FV_IMAGE =3D FVMAIN_COMPACT - } - -[FV.BiosUpdateCargo] -BlockSize =3D $(FLASH_BLOCK_SIZE) -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 - -!if $(ESRT_ENABLE) =3D=3D TRUE - INF $(PLATFORM_PACKAGE)/UpdateDriverDxe/UpdateDriverDxe.inf -!else - INF IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/Up= dateDriverDxe.inf -!endif -FILE RAW =3D 283FA2EE-532C-484d-9383-9F93B36F0B7E { - FV =3D Bios_Update_Data - } -FILE RAW =3D 98B8D59B-E8BA-48EE-98DD-C295392F1EDB { - Vlv2TbltDevicePkg/BiosUpdateConfig/BiosUpdateConfig.ini - } - - -[FV.BiosUpdate] -BlockSize =3D $(FLASH_BLOCK_SIZE) -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 FV_IMAGE =3D EDBEDF47-6EA3-4512-83C1-70F4769D4BDE { - SECTION GUIDED { - SECTION FV_IMAGE =3D BiosUpdateCargo - } - } - !if $(CAPSULE_GENERATE_ENABLE) [FV.CapsuleDispatchFv] FvAlignment =3D 16 @@ -1197,18 +1117,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).depe= x PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi UI STRING=3D"$(MODULE_NAME)" Optional VERSION STRING=3D"$(INF_VERSION)" Optional BUILD_NUM=3D$(BUILD_NUMBE= R) } - -[Rule.Common.USER_DEFINED.BINARY] - FILE FREEFORM =3D $(NAMED_GUID) { - UI STRING=3D"$(MODULE_NAME)" Optional - RAW BIN |.bin - } \ No newline at end of file diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Vlv2TbltDevicePkg/Platf= ormPkgGcc.fdf index 5916503..1ce5529 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf +++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf @@ -290,10 +290,6 @@ INF IntelFspWrapperPkg/FspWrapperSecCore/FspWrapperSec= Core.inf INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)= $(TARGET)/IA32/SecCore.inf !endif =20 -!if $(CAPSULE_GENERATE_ENABLE) -INF Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmw= areDescriptor.inf -INF USE=3DIA32 Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/= SystemFirmwareDescriptorTable.inf -!endif INF MdeModulePkg/Core/Pei/PeiMain.inf !if $(MINNOW2_FSP_BUILD) =3D=3D TRUE INF Vlv2TbltDevicePkg/FspSupport/BootModePei/BootModePei.inf @@ -332,6 +328,10 @@ 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) + # FMP image decriptor +INF RuleOverride =3D FMP_IMAGE_DESC Vlv2TbltDevicePkg/Feature/Capsule/Syst= emFirmwareDescriptor/SystemFirmwareDescriptor.inf +!endif =20 [FV.FVMAIN] BlockSize =3D $(FLASH_BLOCK_SIZE) @@ -772,86 +772,6 @@ READ_LOCK_CAP =3D TRUE READ_LOCK_STATUS =3D TRUE =20 =20 -[FV.Bios_Update_Data] -BlockSize =3D $(FLASH_BLOCK_SIZE) -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 FV_IMAGE =3D 4A538818-5AE0-4eb2-B2EB-488B23657022 { - SECTION FV_IMAGE =3D FVMAIN_COMPACT - } - -[FV.BiosUpdateCargo] -BlockSize =3D $(FLASH_BLOCK_SIZE) -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 - -!if $(ESRT_ENABLE) =3D=3D TRUE - INF $(PLATFORM_PACKAGE)/UpdateDriverDxe/UpdateDriverDxe.inf -!else - INF IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/Up= dateDriverDxe.inf -!endif -FILE RAW =3D 283FA2EE-532C-484d-9383-9F93B36F0B7E { - FV =3D Bios_Update_Data - } -FILE RAW =3D 98B8D59B-E8BA-48EE-98DD-C295392F1EDB { - Vlv2TbltDevicePkg/BiosUpdateConfig/BiosUpdateConfig.ini - } - - -[FV.BiosUpdate] -BlockSize =3D $(FLASH_BLOCK_SIZE) -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 FV_IMAGE =3D EDBEDF47-6EA3-4512-83C1-70F4769D4BDE { - SECTION GUIDED { - SECTION FV_IMAGE =3D BiosUpdateCargo - } - } - !if $(CAPSULE_GENERATE_ENABLE) [FV.CapsuleDispatchFv] FvAlignment =3D 16 @@ -1165,9 +1085,3 @@ FMP_PAYLOAD =3D FmpPayloadSystemFirmwareRsa2048 UI STRING=3D"$(MODULE_NAME)" Optional VERSION STRING=3D"$(INF_VERSION)" Optional BUILD_NUM=3D$(BUILD_NUMBE= R) } - -[Rule.Common.USER_DEFINED.BINARY] - FILE FREEFORM =3D $(NAMED_GUID) { - UI STRING=3D"$(MODULE_NAME)" Optional - RAW BIN |.bin - } \ No newline at end of file diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/Pl= atformPkgGccX64.dsc index 98d510a..19176de 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc @@ -858,14 +858,6 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdSystemRebootAfterCap= suleProcessFlag|0x0001 gEfiMdePkgTokenSpaceGuid.PcdHardwareErrorRecordLevel|L"HwErrRecSupport"|= gEfiGlobalVariableGuid|0x0|1 # Variable: L"HwErrRecSupport" gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootState|L"BootState"|gEfi= BootStateGuid|0x0|TRUE =20 - # - # Indicator to sync ESRT repository from FMP instance. Set to TRUE on f= irst boot - # -!if $(ESRT_ENABLE) =3D=3D TRUE - gPlatformModuleTokenSpaceGuid.PcdEsrtSyncFmp|L"EsrtSyncFmp"|gPlatformMod= uleTokenSpaceGuid|0x0|TRUE|NV,BS -!else - gPlatformModuleTokenSpaceGuid.PcdEsrtSyncFmp|L"EsrtSyncFmp"|gPlatformMod= uleTokenSpaceGuid|0x0|FALSE|NV,BS -!endif =20 [PcdsDynamicDefault.common.DEFAULT] gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateDataPtr|0x0 @@ -1253,17 +1245,13 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TAR= GET)/IA32/fTPMInitPeim.inf SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.= inf { FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibRsa2048= Sha256/FmpAuthenticationLibRsa2048Sha256.inf - !if $(TARGET) !=3D RELEASE - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPor= t.inf - !endif + DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf } =20 SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.= inf { FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibRsa2048= Sha256/FmpAuthenticationLibRsa2048Sha256.inf - !if $(TARGET) !=3D RELEASE - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPor= t.inf - !endif + DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf } =20 MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf { @@ -1611,22 +1599,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARG= ET)/IA32/fTPMInitPeim.inf # capsule related drivers # IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVolDxe.inf -!if $(ESRT_ENABLE) =3D=3D TRUE - $(PLATFORM_PACKAGE)/UpdateDriverDxe/UpdateDriverDxe.inf{ - !if $(TARGET) =3D=3D DEBUG - - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPor= t.inf - SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.i= nf - !endif - } -!else - IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateD= riverDxe.inf -!endif MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.inf -!if $(ESRT_ENABLE) =3D=3D TRUE - $(PLATFORM_PACKAGE)/PlatformEsrt/PlatformEsrtDxe.inf - $(PLATFORM_PACKAGE)/FmpSample/FmpSample.inf -!endif =20 Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.inf Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.inf diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/Plat= formPkgIA32.dsc index a1c2540..c613477 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc @@ -857,14 +857,6 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdSystemRebootAfterCap= suleProcessFlag|0x0001 gEfiMdePkgTokenSpaceGuid.PcdHardwareErrorRecordLevel|L"HwErrRecSupport"|= gEfiGlobalVariableGuid|0x0|1 # Variable: L"HwErrRecSupport" gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootState|L"BootState"|gEfi= BootStateGuid|0x0|TRUE =20 - # - # Indicator to sync ESRT repository from FMP instance. Set to TRUE on f= irst boot - # -!if $(ESRT_ENABLE) =3D=3D TRUE - gPlatformModuleTokenSpaceGuid.PcdEsrtSyncFmp|L"EsrtSyncFmp"|gPlatformMod= uleTokenSpaceGuid|0x0|TRUE|NV,BS -!else - gPlatformModuleTokenSpaceGuid.PcdEsrtSyncFmp|L"EsrtSyncFmp"|gPlatformMod= uleTokenSpaceGuid|0x0|FALSE|NV,BS -!endif =20 [PcdsDynamicDefault.common.DEFAULT] gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateDataPtr|0x0 @@ -1249,19 +1241,14 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TAR= GET)/IA32/fTPMInitPeim.inf SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.= inf { FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibRsa2048= Sha256/FmpAuthenticationLibRsa2048Sha256.inf - !if $(TARGET) !=3D RELEASE - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPor= t.inf - !endif + DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf } =20 SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.= inf { =20 FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibRsa2048= Sha256/FmpAuthenticationLibRsa2048Sha256.inf - - !if $(TARGET) !=3D RELEASE - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPor= t.inf - !endif + DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf } =20 MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf { @@ -1614,22 +1601,8 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARG= ET)/IA32/fTPMInitPeim.inf # capsule related drivers # IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVolDxe.inf -!if $(ESRT_ENABLE) =3D=3D TRUE - $(PLATFORM_PACKAGE)/UpdateDriverDxe/UpdateDriverDxe.inf{ - !if $(TARGET) =3D=3D DEBUG - - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPor= t.inf - SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.i= nf - !endif - } -!else - IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateD= riverDxe.inf -!endif + MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.inf -!if $(ESRT_ENABLE) =3D=3D TRUE - $(PLATFORM_PACKAGE)/PlatformEsrt/PlatformEsrtDxe.inf - $(PLATFORM_PACKAGE)/FmpSample/FmpSample.inf -!endif =20 Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.inf Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.inf diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/Platf= ormPkgX64.dsc index f9b9faa..8937088 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 - 2017, 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 @@ -858,14 +858,6 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdSystemRebootAfterCap= suleProcessFlag|0x0001 gEfiMdePkgTokenSpaceGuid.PcdHardwareErrorRecordLevel|L"HwErrRecSupport"|= gEfiGlobalVariableGuid|0x0|1 # Variable: L"HwErrRecSupport" gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootState|L"BootState"|gEfi= BootStateGuid|0x0|TRUE =20 - # - # Indicator to sync ESRT repository from FMP instance. Set to TRUE on f= irst boot - # -!if $(ESRT_ENABLE) =3D=3D TRUE - gPlatformModuleTokenSpaceGuid.PcdEsrtSyncFmp|L"EsrtSyncFmp"|gPlatformMod= uleTokenSpaceGuid|0x0|TRUE|NV,BS -!else - gPlatformModuleTokenSpaceGuid.PcdEsrtSyncFmp|L"EsrtSyncFmp"|gPlatformMod= uleTokenSpaceGuid|0x0|FALSE|NV,BS -!endif =20 [PcdsDynamicDefault.common.DEFAULT] gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateDataPtr|0x0 @@ -906,8 +898,8 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdSystemRebootAfterCaps= uleProcessFlag|0x0001 gEfiSecurityPkgTokenSpaceGuid.PcdTpmScrtmPolicy|1 !endif =20 - gPlatformModuleTokenSpaceGuid.PcdRtcPowerFailure|FALSE - + gPlatformModuleTokenSpaceGuid.PcdRtcPowerFailure|FALSE + [PcdsDynamicExDefault.common.DEFAULT] gEfiVLVTokenSpaceGuid.PcdTCSmbaIoBaseAddress|0x1040 gEfiVLVTokenSpaceGuid.PcdEmmcManufacturerId|0 @@ -1006,8 +998,8 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET= )/IA32/fTPMInitPeim.inf gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E !endif - - PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf + + PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf } !endif =20 @@ -1087,7 +1079,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGE= T)/IA32/fTPMInitPeim.inf gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046 DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPor= t.inf - NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf + NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256= .inf PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf } @@ -1359,7 +1351,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGE= T)/IA32/fTPMInitPeim.inf NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256= .inf - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf + PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf Tpm2DeviceLib|Vlv2TbltDevicePkg/Library/Tpm2DeviceLibSeCDxe/Tpm2Devi= ceLibSeC.inf } $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTU= RE)/FtpmSmm.inf @@ -1400,8 +1392,8 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGE= T)/IA32/fTPMInitPeim.inf $(PLATFORM_PACKAGE)/PlatformInfoDxe/PlatformInfoDxe.inf $(PLATFORM_PACKAGE)/PlatformCpuInfoDxe/PlatformCpuInfoDxe.inf $(PLATFORM_PACKAGE)/PlatformDxe/PlatformDxe.inf - $(PLATFORM_PACKAGE)/PlatformRtcRuntimeDxe/PlatformRtcRuntimeDxe.inf - =20 + $(PLATFORM_PACKAGE)/PlatformRtcRuntimeDxe/PlatformRtcRuntimeDxe.inf + =20 =20 $(PLATFORM_PACKAGE)/PciPlatform/PciPlatform.inf $(PLATFORM_PACKAGE)/SaveMemoryConfig/SaveMemoryConfig.inf @@ -1484,7 +1476,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGE= T)/IA32/fTPMInitPeim.inf TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAc= piTimerLib.inf } - MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsRes= ourceTableDxe.inf + MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsRes= ourceTableDxe.inf !endif =20 # @@ -1611,22 +1603,8 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARG= ET)/IA32/fTPMInitPeim.inf # capsule related drivers # IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVolDxe.inf -!if $(ESRT_ENABLE) =3D=3D TRUE - $(PLATFORM_PACKAGE)/UpdateDriverDxe/UpdateDriverDxe.inf{ - !if $(TARGET) =3D=3D DEBUG - - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPor= t.inf - SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.i= nf - !endif - } -!else - IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateD= riverDxe.inf -!endif + MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.inf -!if $(ESRT_ENABLE) =3D=3D TRUE - $(PLATFORM_PACKAGE)/PlatformEsrt/PlatformEsrtDxe.inf - $(PLATFORM_PACKAGE)/FmpSample/FmpSample.inf -!endif =20 Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.inf Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.inf --=20 2.10.1.windows.1