This patch was originally merged in edk2 master at bde673b2dcd1b087af7f49dd5f0c3b82b02172a5. However, this was later reverted at 7d180efeaa03df25973416dc0aad099f4fe7e251 as it was merged during the Soft Feature Freeze for edk2-stable201903.
Resubmitting this patch as the edk2 merge window is now open. Updated the Protocols section to reflect the protocols that are produced or consumed. Cc: Laszlo Ersek <ler...@redhat.com> Cc: Alexei Fedorov <alexei.fedo...@arm.com> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Sami Mujawar <sami.muja...@arm.com> Reviewed-by: Alexei Fedorov <alexei.fedo...@arm.com> --- DynamicTablesPkg/Drivers/DynamicTableFactoryDxe/DynamicTableFactoryDxe.inf | 7 ++----- DynamicTablesPkg/Drivers/DynamicTableManagerDxe/DynamicTableManagerDxe.inf | 7 ++++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/DynamicTablesPkg/Drivers/DynamicTableFactoryDxe/DynamicTableFactoryDxe.inf b/DynamicTablesPkg/Drivers/DynamicTableFactoryDxe/DynamicTableFactoryDxe.inf index 740811d0fc0590543a62360e6753eb04fb675d70..02c907c38023e8b44829a38ed93436904d8cf3d3 100644 --- a/DynamicTablesPkg/Drivers/DynamicTableFactoryDxe/DynamicTableFactoryDxe.inf +++ b/DynamicTablesPkg/Drivers/DynamicTableFactoryDxe/DynamicTableFactoryDxe.inf @@ -1,7 +1,7 @@ ## @file # Module to manage the list of available table factories. # -# Copyright (c) 2017 - 2018, ARM Limited. All rights reserved. +# Copyright (c) 2017 - 2019, ARM Limited. All rights reserved. # # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -51,10 +51,7 @@ [FixedPcd] gEfiMdeModulePkgTokenSpaceGuid.PcdMaxCustomDTGenerators [Protocols] - gEfiAcpiTableProtocolGuid # PROTOCOL ALWAYS_CONSUMED - gEfiSmbiosProtocolGuid # PROTOCOL ALWAYS_CONSUMED - gEdkiiConfigurationManagerProtocolGuid - gEdkiiDynamicTableFactoryProtocolGuid + gEdkiiDynamicTableFactoryProtocolGuid # PRODUCES [Depex] TRUE diff --git a/DynamicTablesPkg/Drivers/DynamicTableManagerDxe/DynamicTableManagerDxe.inf b/DynamicTablesPkg/Drivers/DynamicTableManagerDxe/DynamicTableManagerDxe.inf index fef8b20672fb943b78302a152fcf0f66db264b0a..e78218a914ce993f3e605841e2bffae700076dd0 100644 --- a/DynamicTablesPkg/Drivers/DynamicTableManagerDxe/DynamicTableManagerDxe.inf +++ b/DynamicTablesPkg/Drivers/DynamicTableManagerDxe/DynamicTableManagerDxe.inf @@ -1,7 +1,7 @@ ## @file # Module that drives the table generation and installation process. # -# Copyright (c) 2017 - 2018, ARM Limited. All rights reserved. +# Copyright (c) 2017 - 2019, ARM Limited. All rights reserved. # # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -42,8 +42,9 @@ [LibraryClasses] [Protocols] gEfiAcpiTableProtocolGuid # PROTOCOL ALWAYS_CONSUMED - gEdkiiConfigurationManagerProtocolGuid - gEdkiiDynamicTableFactoryProtocolGuid + + gEdkiiConfigurationManagerProtocolGuid # PROTOCOL ALWAYS_CONSUMED + gEdkiiDynamicTableFactoryProtocolGuid # PROTOCOL ALWAYS_CONSUMED [Depex] gEfiAcpiTableProtocolGuid AND -- 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)' _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
