ArmVirtPkg: revert "ArmVirtPkg: add QemuFwCfgToPcdDxe"

This reverts git commit d2733aa9 (SVN r18042), because it is empty now.
The original problem:

  Many universal DXE drivers in edk2 can be controlled by setting dynamic
  PCDs. Such a PCD must be set before the consumer DXE driver is
  dispatched.

should be hereafter solved similarly to how
OvmfPkg/Library/SmbiosVersionLib is plugged into
MdeModulePkg/Universal/SmbiosDxe now (originally suggested by Jordan
Justen <jordan.l.justen@intel.com>).

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Wei Huang <wei@redhat.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18177 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index a6ffae1794c4c1b8ad3d2c82733ee386272fc048..c911975ec758af463d490fc3f2f6b8f7ab6b0b13 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -292,7 +292,6 @@
   # Platform Driver\r
   #\r
   ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf\r
-  ArmVirtPkg/QemuFwCfgToPcdDxe/QemuFwCfgToPcd.inf\r
   OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
   OvmfPkg/VirtioScsiDxe/VirtioScsi.inf\r
   OvmfPkg/VirtioNetDxe/VirtioNet.inf\r

diff --git a/ArmVirtPkg/ArmVirtQemu.fdf b/ArmVirtPkg/ArmVirtQemu.fdf
index 6faf3bc121721f045a30697849ee1f526a61015e..89a4015e595b0308e51f6d41318d6d4ea8cfbd45 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemu.fdf
+++ b/ArmVirtPkg/ArmVirtQemu.fdf
@@ -104,12 +104,10 @@ READ_LOCK_STATUS   = TRUE
   APRIORI DXE {\r
     INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
     INF ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf\r
-    INF ArmVirtPkg/QemuFwCfgToPcdDxe/QemuFwCfgToPcd.inf\r
   }\r
   INF MdeModulePkg/Core/Dxe/DxeMain.inf\r
   INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
   INF ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf\r
-  INF ArmVirtPkg/QemuFwCfgToPcdDxe/QemuFwCfgToPcd.inf\r
 \r
   #\r
   # PI DXE Drivers producing Architectural Protocols (EFI Services)\r

diff --git a/ArmVirtPkg/QemuFwCfgToPcdDxe/QemuFwCfgToPcd.c b/ArmVirtPkg/QemuFwCfgToPcdDxe/QemuFwCfgToPcd.c
deleted file mode 100644 (file)
index 8f60e21..0000000
--- a/ArmVirtPkg/QemuFwCfgToPcdDxe/QemuFwCfgToPcd.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/** @file\r
-*  An "early" DXE driver that parses well-known fw-cfg files into dynamic PCDs\r
-*  that control other (universal) DXE drivers.\r
-*\r
-*  Copyright (C) 2015, Red Hat, Inc.\r
-*  Copyright (c) 2014, Linaro Ltd. All rights reserved.<BR>\r
-*\r
-*  This program and the accompanying materials are licensed and made available\r
-*  under the terms and conditions of the BSD License which accompanies this\r
-*  distribution.  The full text of the license may be found at\r
-*  http://opensource.org/licenses/bsd-license.php\r
-*\r
-*  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-*  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR\r
-*  IMPLIED.\r
-*\r
-**/\r
-\r
-#include <Uefi/UefiBaseType.h>\r
-#include <Uefi/UefiSpec.h>\r
-\r
-#include <Library/PcdLib.h>\r
-#include <Library/QemuFwCfgLib.h>\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-ParseQemuFwCfgToPcd (\r
-  IN EFI_HANDLE       ImageHandle,\r
-  IN EFI_SYSTEM_TABLE *SystemTable\r
-  )\r
-{\r
-  return EFI_SUCCESS;\r
-}\r

diff --git a/ArmVirtPkg/QemuFwCfgToPcdDxe/QemuFwCfgToPcd.inf b/ArmVirtPkg/QemuFwCfgToPcdDxe/QemuFwCfgToPcd.inf
deleted file mode 100644 (file)
index a9983be..0000000
--- a/ArmVirtPkg/QemuFwCfgToPcdDxe/QemuFwCfgToPcd.inf
+++ /dev/null
@@ -1,42 +0,0 @@
-## @file\r
-#  An "early" DXE driver that parses well-known fw-cfg files into dynamic PCDs\r
-#  that control other (universal) DXE drivers.\r
-#\r
-#  Copyright (C) 2015, Red Hat, Inc.\r
-#  Copyright (c) 2014, Linaro Ltd. All rights reserved.<BR>\r
-#\r
-#  This program and the accompanying materials are licensed and made available\r
-#  under the terms and conditions of the BSD License which accompanies this\r
-#  distribution.  The full text of the license may be found at\r
-#  http://opensource.org/licenses/bsd-license.php\r
-#\r
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR\r
-#  IMPLIED.\r
-#\r
-##\r
-\r
-[Defines]\r
-  INF_VERSION                    = 0x00010005\r
-  BASE_NAME                      = QemuFwCfgToPcdDxe\r
-  FILE_GUID                      = 5bb7cc92-1a36-4833-84cf-db7f8258e48d\r
-  MODULE_TYPE                    = DXE_DRIVER\r
-  VERSION_STRING                 = 1.0\r
-  ENTRY_POINT                    = ParseQemuFwCfgToPcd\r
-\r
-[Sources]\r
-  QemuFwCfgToPcd.c\r
-\r
-[Packages]\r
-  MdePkg/MdePkg.dec\r
-  OvmfPkg/OvmfPkg.dec\r
-\r
-[LibraryClasses]\r
-  PcdLib\r
-  QemuFwCfgLib\r
-  UefiDriverEntryPoint\r
-\r
-[Pcd]\r
-\r
-[Depex]\r
-  TRUE\r