From 59e0efa7b3637aee67ede514ca3e291920a8cb84 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Thu, 6 Aug 2015 10:13:50 +0000 Subject: [PATCH] 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 ). Cc: Ard Biesheuvel Cc: Wei Huang Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek Reviewed-by: Ard Biesheuvel Reviewed-by: Jordan Justen git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18177 6f19259b-4bc3-4df7-8a09-765794883524 --- ArmVirtPkg/ArmVirtQemu.dsc | 1 - ArmVirtPkg/ArmVirtQemu.fdf | 2 - ArmVirtPkg/QemuFwCfgToPcdDxe/QemuFwCfgToPcd.c | 33 --------------- .../QemuFwCfgToPcdDxe/QemuFwCfgToPcd.inf | 42 ------------------- 4 files changed, 78 deletions(-) delete mode 100644 ArmVirtPkg/QemuFwCfgToPcdDxe/QemuFwCfgToPcd.c delete mode 100644 ArmVirtPkg/QemuFwCfgToPcdDxe/QemuFwCfgToPcd.inf diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index a6ffae1794..c911975ec7 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -292,7 +292,6 @@ # Platform Driver # ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf - ArmVirtPkg/QemuFwCfgToPcdDxe/QemuFwCfgToPcd.inf OvmfPkg/VirtioBlkDxe/VirtioBlk.inf OvmfPkg/VirtioScsiDxe/VirtioScsi.inf OvmfPkg/VirtioNetDxe/VirtioNet.inf diff --git a/ArmVirtPkg/ArmVirtQemu.fdf b/ArmVirtPkg/ArmVirtQemu.fdf index 6faf3bc121..89a4015e59 100644 --- a/ArmVirtPkg/ArmVirtQemu.fdf +++ b/ArmVirtPkg/ArmVirtQemu.fdf @@ -104,12 +104,10 @@ READ_LOCK_STATUS = TRUE APRIORI DXE { INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf INF ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf - INF ArmVirtPkg/QemuFwCfgToPcdDxe/QemuFwCfgToPcd.inf } INF MdeModulePkg/Core/Dxe/DxeMain.inf INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf INF ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf - INF ArmVirtPkg/QemuFwCfgToPcdDxe/QemuFwCfgToPcd.inf # # PI DXE Drivers producing Architectural Protocols (EFI Services) diff --git a/ArmVirtPkg/QemuFwCfgToPcdDxe/QemuFwCfgToPcd.c b/ArmVirtPkg/QemuFwCfgToPcdDxe/QemuFwCfgToPcd.c deleted file mode 100644 index 8f60e21789..0000000000 --- a/ArmVirtPkg/QemuFwCfgToPcdDxe/QemuFwCfgToPcd.c +++ /dev/null @@ -1,33 +0,0 @@ -/** @file -* An "early" DXE driver that parses well-known fw-cfg files into dynamic PCDs -* that control other (universal) DXE drivers. -* -* Copyright (C) 2015, Red Hat, Inc. -* Copyright (c) 2014, Linaro Ltd. All rights reserved.
-* -* This program and the accompanying materials are licensed and made available -* under the terms and conditions of the BSD 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 -* IMPLIED. -* -**/ - -#include -#include - -#include -#include - -EFI_STATUS -EFIAPI -ParseQemuFwCfgToPcd ( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable - ) -{ - return EFI_SUCCESS; -} diff --git a/ArmVirtPkg/QemuFwCfgToPcdDxe/QemuFwCfgToPcd.inf b/ArmVirtPkg/QemuFwCfgToPcdDxe/QemuFwCfgToPcd.inf deleted file mode 100644 index a9983becef..0000000000 --- a/ArmVirtPkg/QemuFwCfgToPcdDxe/QemuFwCfgToPcd.inf +++ /dev/null @@ -1,42 +0,0 @@ -## @file -# An "early" DXE driver that parses well-known fw-cfg files into dynamic PCDs -# that control other (universal) DXE drivers. -# -# Copyright (C) 2015, Red Hat, Inc. -# Copyright (c) 2014, Linaro Ltd. All rights reserved.
-# -# This program and the accompanying materials are licensed and made available -# under the terms and conditions of the BSD 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 -# IMPLIED. -# -## - -[Defines] - INF_VERSION = 0x00010005 - BASE_NAME = QemuFwCfgToPcdDxe - FILE_GUID = 5bb7cc92-1a36-4833-84cf-db7f8258e48d - MODULE_TYPE = DXE_DRIVER - VERSION_STRING = 1.0 - ENTRY_POINT = ParseQemuFwCfgToPcd - -[Sources] - QemuFwCfgToPcd.c - -[Packages] - MdePkg/MdePkg.dec - OvmfPkg/OvmfPkg.dec - -[LibraryClasses] - PcdLib - QemuFwCfgLib - UefiDriverEntryPoint - -[Pcd] - -[Depex] - TRUE