Revert "DynamicTablesPkg: Fix protocol section"

This reverts commit bde673b2dcd1b087af7f49dd5f0c3b82b02172a5.

Reverting this patch as Soft Feature Freeze for
edk2-stable201903 started on 22 Feb 2019.

Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Alexei Fedorov <alexei.fedorov@arm.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
Reviewed-by: Alexei Fedorov <alexei.fedorov@arm.com>

diff --git a/DynamicTablesPkg/Drivers/DynamicTableFactoryDxe/DynamicTableFactoryDxe.inf b/DynamicTablesPkg/Drivers/DynamicTableFactoryDxe/DynamicTableFactoryDxe.inf
index 02c907c38023e8b44829a38ed93436904d8cf3d3..740811d0fc0590543a62360e6753eb04fb675d70 100644 (file)
--- a/DynamicTablesPkg/Drivers/DynamicTableFactoryDxe/DynamicTableFactoryDxe.inf
+++ b/DynamicTablesPkg/Drivers/DynamicTableFactoryDxe/DynamicTableFactoryDxe.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  Module to manage the list of available table factories.\r
 #\r
-#  Copyright (c) 2017 - 2019, ARM Limited. All rights reserved.\r
+#  Copyright (c) 2017 - 2018, ARM Limited. All rights reserved.\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -51,7 +51,10 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxCustomDTGenerators\r
 \r
 [Protocols]\r
-  gEdkiiDynamicTableFactoryProtocolGuid         # PRODUCES\r
+  gEfiAcpiTableProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED\r
+  gEfiSmbiosProtocolGuid                        # PROTOCOL ALWAYS_CONSUMED\r
+  gEdkiiConfigurationManagerProtocolGuid\r
+  gEdkiiDynamicTableFactoryProtocolGuid\r
 \r
 [Depex]\r
   TRUE\r

diff --git a/DynamicTablesPkg/Drivers/DynamicTableManagerDxe/DynamicTableManagerDxe.inf b/DynamicTablesPkg/Drivers/DynamicTableManagerDxe/DynamicTableManagerDxe.inf
index e78218a914ce993f3e605841e2bffae700076dd0..fef8b20672fb943b78302a152fcf0f66db264b0a 100644 (file)
--- a/DynamicTablesPkg/Drivers/DynamicTableManagerDxe/DynamicTableManagerDxe.inf
+++ b/DynamicTablesPkg/Drivers/DynamicTableManagerDxe/DynamicTableManagerDxe.inf
@@ -1,7 +1,7 @@
 ## @file\r
 # Module that drives the table generation and installation process.\r
 #\r
-#  Copyright (c) 2017 - 2019, ARM Limited. All rights reserved.\r
+#  Copyright (c) 2017 - 2018, ARM Limited. All rights reserved.\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -42,9 +42,8 @@
 \r
 [Protocols]\r
   gEfiAcpiTableProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED\r
-\r
-  gEdkiiConfigurationManagerProtocolGuid        # PROTOCOL ALWAYS_CONSUMED\r
-  gEdkiiDynamicTableFactoryProtocolGuid         # PROTOCOL ALWAYS_CONSUMED\r
+  gEdkiiConfigurationManagerProtocolGuid\r
+  gEdkiiDynamicTableFactoryProtocolGuid\r
 \r
 [Depex]\r
   gEfiAcpiTableProtocolGuid AND\r