From eeccb75ec72eceae6f30ca73b29d3d87374f3840 Mon Sep 17 00:00:00 2001 From: M1cha Date: Sat, 10 Feb 2018 07:34:38 +0100 Subject: [PATCH] remove unused DxeInit and it's dependencies --- Drivers/DxeInit/DxeInit.c | 40 ------------------- Drivers/DxeInit/DxeInit.inf | 25 ------------ Drivers/DxeInit/DxeInitPostGic.inf | 25 ------------ EFIDroidFvMain.fdf.inc | 8 +--- EFIDroidPkg.dsc | 2 - Include/Library/DxeInit.h | 34 ---------------- .../ChipVendorDxeInitLib.c | 21 ---------- .../ChipVendorDxeInitLib.inf | 17 -------- .../PlatformDxeInitLibNull.c | 21 ---------- .../PlatformDxeInitLibNull.inf | 17 -------- Qcom/Platforms/Msm8610/Msm8610.dsc.inc | 1 - .../PlatformDxeInitLib/PlatformDxeInitLib.c | 21 ---------- .../PlatformDxeInitLib/PlatformDxeInitLib.inf | 34 ---------------- Qcom/Platforms/Msm8960/Msm8960.dsc.inc | 1 - Qcom/Platforms/Msm8994/Msm8994.dsc.inc | 1 - Qcom/Qcom.dsc.inc | 3 -- 16 files changed, 1 insertion(+), 270 deletions(-) delete mode 100644 Drivers/DxeInit/DxeInit.c delete mode 100644 Drivers/DxeInit/DxeInit.inf delete mode 100644 Drivers/DxeInit/DxeInitPostGic.inf delete mode 100644 Include/Library/DxeInit.h delete mode 100644 Qcom/Library/ChipVendorDxeInitLib/ChipVendorDxeInitLib.c delete mode 100644 Qcom/Library/ChipVendorDxeInitLib/ChipVendorDxeInitLib.inf delete mode 100644 Qcom/Library/PlatformDxeInitLibNull/PlatformDxeInitLibNull.c delete mode 100644 Qcom/Library/PlatformDxeInitLibNull/PlatformDxeInitLibNull.inf delete mode 100644 Qcom/Platforms/Msm8960/Library/PlatformDxeInitLib/PlatformDxeInitLib.c delete mode 100644 Qcom/Platforms/Msm8960/Library/PlatformDxeInitLib/PlatformDxeInitLib.inf diff --git a/Drivers/DxeInit/DxeInit.c b/Drivers/DxeInit/DxeInit.c deleted file mode 100644 index 21d1758..0000000 --- a/Drivers/DxeInit/DxeInit.c +++ /dev/null @@ -1,40 +0,0 @@ -#include - -#include -#include - -EFI_STATUS -EFIAPI -DxeInitInitialize ( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable - ) -{ - EFI_STATUS Status; - - Status = LibChipVendorDxeInitialize (ImageHandle, SystemTable); - ASSERT_RETURN_ERROR (Status); - - Status = LibPlatformDxeInitialize (ImageHandle, SystemTable); - ASSERT_RETURN_ERROR (Status); - - return Status; -} - -EFI_STATUS -EFIAPI -DxeInitPostGicInitialize ( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable - ) -{ - EFI_STATUS Status; - - Status = LibChipVendorDxePostGicInitialize (ImageHandle, SystemTable); - ASSERT_RETURN_ERROR (Status); - - Status = LibPlatformDxePostGicInitialize (ImageHandle, SystemTable); - ASSERT_RETURN_ERROR (Status); - - return Status; -} diff --git a/Drivers/DxeInit/DxeInit.inf b/Drivers/DxeInit/DxeInit.inf deleted file mode 100644 index c71a82a..0000000 --- a/Drivers/DxeInit/DxeInit.inf +++ /dev/null @@ -1,25 +0,0 @@ -[Defines] - INF_VERSION = 0x00010005 - BASE_NAME = DxeInit - FILE_GUID = 00c38ff6-131c-450a-b7cd-b3e619c703e7 - MODULE_TYPE = DXE_DRIVER - VERSION_STRING = 1.0 - - ENTRY_POINT = DxeInitInitialize - -[Sources.common] - DxeInit.c - -[Packages] - MdePkg/MdePkg.dec - EFIDroidPkg/EFIDroidPkg.dec - -[LibraryClasses] - BaseLib - UefiLib - ChipVendorDxeInitLib - PlatformDxeInitLib - UefiDriverEntryPoint - -[Depex] - TRUE diff --git a/Drivers/DxeInit/DxeInitPostGic.inf b/Drivers/DxeInit/DxeInitPostGic.inf deleted file mode 100644 index 08a0fba..0000000 --- a/Drivers/DxeInit/DxeInitPostGic.inf +++ /dev/null @@ -1,25 +0,0 @@ -[Defines] - INF_VERSION = 0x00010005 - BASE_NAME = DxeInitPostGic - FILE_GUID = 27595bfd-3739-48e9-8cb4-01b827c2356e - MODULE_TYPE = DXE_DRIVER - VERSION_STRING = 1.0 - - ENTRY_POINT = DxeInitPostGicInitialize - -[Sources.common] - DxeInit.c - -[Packages] - MdePkg/MdePkg.dec - EFIDroidPkg/EFIDroidPkg.dec - -[LibraryClasses] - BaseLib - UefiLib - ChipVendorDxeInitLib - PlatformDxeInitLib - UefiDriverEntryPoint - -[Depex] - TRUE diff --git a/EFIDroidFvMain.fdf.inc b/EFIDroidFvMain.fdf.inc index 0fa56e8..8e34422 100644 --- a/EFIDroidFvMain.fdf.inc +++ b/EFIDroidFvMain.fdf.inc @@ -45,9 +45,8 @@ READ_LOCK_CAP = TRUE READ_LOCK_STATUS = TRUE APRIORI DXE { - # first, install the PCD driver and call DxeInit + # first, install the PCD driver INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf - INF EFIDroidPkg/Drivers/DxeInit/DxeInit.inf # next, install cpu protocol and enable the interrupt controller INF ArmPkg/Drivers/CpuDxe/CpuDxe.inf @@ -56,15 +55,10 @@ READ_LOCK_STATUS = TRUE # next, setup the FDT client and setup all memory regions INF EFIDroidPkg/Drivers/FdtClientDxe/FdtClientDxe.inf INF EFIDroidPkg/Drivers/HighMemDxe/HighMemDxe.inf - - # finally, call DxeInitPostGic - INF EFIDroidPkg/Drivers/DxeInit/DxeInitPostGic.inf } INF MdeModulePkg/Core/Dxe/DxeMain.inf INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf - INF EFIDroidPkg/Drivers/DxeInit/DxeInit.inf - INF EFIDroidPkg/Drivers/DxeInit/DxeInitPostGic.inf # # PI DXE Drivers producing Architectural Protocols (EFI Services) diff --git a/EFIDroidPkg.dsc b/EFIDroidPkg.dsc index e402dcf..515f1c4 100644 --- a/EFIDroidPkg.dsc +++ b/EFIDroidPkg.dsc @@ -190,8 +190,6 @@ PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf } - EFIDroidPkg/Drivers/DxeInit/DxeInit.inf - EFIDroidPkg/Drivers/DxeInit/DxeInitPostGic.inf # # Architectural Protocols diff --git a/Include/Library/DxeInit.h b/Include/Library/DxeInit.h deleted file mode 100644 index 7366221..0000000 --- a/Include/Library/DxeInit.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef __LIBRARY_DXEINIT_H__ -#define __LIBRARY_DXEINIT_H__ - -EFI_STATUS -EFIAPI -LibChipVendorDxeInitialize ( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable - ); - -EFI_STATUS -EFIAPI -LibPlatformDxeInitialize ( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable - ); - - -EFI_STATUS -EFIAPI -LibChipVendorDxePostGicInitialize ( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable - ); - -EFI_STATUS -EFIAPI -LibPlatformDxePostGicInitialize ( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable - ); - - -#endif diff --git a/Qcom/Library/ChipVendorDxeInitLib/ChipVendorDxeInitLib.c b/Qcom/Library/ChipVendorDxeInitLib/ChipVendorDxeInitLib.c deleted file mode 100644 index 4e9870a..0000000 --- a/Qcom/Library/ChipVendorDxeInitLib/ChipVendorDxeInitLib.c +++ /dev/null @@ -1,21 +0,0 @@ -#include - -EFI_STATUS -EFIAPI -LibChipVendorDxeInitialize ( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable - ) -{ - return EFI_SUCCESS; -} - -EFI_STATUS -EFIAPI -LibChipVendorDxePostGicInitialize ( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable - ) -{ - return EFI_SUCCESS; -} diff --git a/Qcom/Library/ChipVendorDxeInitLib/ChipVendorDxeInitLib.inf b/Qcom/Library/ChipVendorDxeInitLib/ChipVendorDxeInitLib.inf deleted file mode 100644 index c541688..0000000 --- a/Qcom/Library/ChipVendorDxeInitLib/ChipVendorDxeInitLib.inf +++ /dev/null @@ -1,17 +0,0 @@ -[Defines] - INF_VERSION = 0x00010005 - BASE_NAME = ChipVendorDxeInitLib - FILE_GUID = D8EC64F1-C244-4C88-81D3-B789AD51F6D8 - MODULE_TYPE = BASE - VERSION_STRING = 1.0 - LIBRARY_CLASS = ChipVendorDxeInitLib - - -[Sources.common] - ChipVendorDxeInitLib.c - -[Packages] - MdePkg/MdePkg.dec - EmbeddedPkg/EmbeddedPkg.dec - EFIDroidPkg/EFIDroidPkg.dec - EFIDroidPkg/Qcom/Qcom.dec diff --git a/Qcom/Library/PlatformDxeInitLibNull/PlatformDxeInitLibNull.c b/Qcom/Library/PlatformDxeInitLibNull/PlatformDxeInitLibNull.c deleted file mode 100644 index 5478639..0000000 --- a/Qcom/Library/PlatformDxeInitLibNull/PlatformDxeInitLibNull.c +++ /dev/null @@ -1,21 +0,0 @@ -#include - -EFI_STATUS -EFIAPI -LibPlatformDxeInitialize ( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable - ) -{ - return EFI_SUCCESS; -} - -EFI_STATUS -EFIAPI -LibPlatformDxePostGicInitialize ( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable - ) -{ - return EFI_SUCCESS; -} diff --git a/Qcom/Library/PlatformDxeInitLibNull/PlatformDxeInitLibNull.inf b/Qcom/Library/PlatformDxeInitLibNull/PlatformDxeInitLibNull.inf deleted file mode 100644 index 7408d3f..0000000 --- a/Qcom/Library/PlatformDxeInitLibNull/PlatformDxeInitLibNull.inf +++ /dev/null @@ -1,17 +0,0 @@ -[Defines] - INF_VERSION = 0x00010005 - BASE_NAME = PlatformDxeInitLibNull - FILE_GUID = 51C72485-D394-4D98-8B4F-5E6E91138FDC - MODULE_TYPE = BASE - VERSION_STRING = 1.0 - LIBRARY_CLASS = PlatformDxeInitLib - - -[Sources.common] - PlatformDxeInitLibNull.c - -[Packages] - MdePkg/MdePkg.dec - ArmPkg/ArmPkg.dec - EFIDroidPkg/EFIDroidPkg.dec - EFIDroidPkg/Qcom/Qcom.dec diff --git a/Qcom/Platforms/Msm8610/Msm8610.dsc.inc b/Qcom/Platforms/Msm8610/Msm8610.dsc.inc index b1f0725..a2b1364 100644 --- a/Qcom/Platforms/Msm8610/Msm8610.dsc.inc +++ b/Qcom/Platforms/Msm8610/Msm8610.dsc.inc @@ -65,7 +65,6 @@ !endif [LibraryClasses.common.DXE_DRIVER] - PlatformDxeInitLib|EFIDroidPkg/Qcom/Library/PlatformDxeInitLibNull/PlatformDxeInitLibNull.inf QcomDxeTimerLib|EFIDroidPkg/Qcom/Library/QTimerLib/QcomQTimerDxeTimerLib.inf [LibraryClasses.common.DXE_DRIVER, LibraryClasses.common.UEFI_APPLICATION, LibraryClasses.common.UEFI_DRIVER] diff --git a/Qcom/Platforms/Msm8960/Library/PlatformDxeInitLib/PlatformDxeInitLib.c b/Qcom/Platforms/Msm8960/Library/PlatformDxeInitLib/PlatformDxeInitLib.c deleted file mode 100644 index 5478639..0000000 --- a/Qcom/Platforms/Msm8960/Library/PlatformDxeInitLib/PlatformDxeInitLib.c +++ /dev/null @@ -1,21 +0,0 @@ -#include - -EFI_STATUS -EFIAPI -LibPlatformDxeInitialize ( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable - ) -{ - return EFI_SUCCESS; -} - -EFI_STATUS -EFIAPI -LibPlatformDxePostGicInitialize ( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable - ) -{ - return EFI_SUCCESS; -} diff --git a/Qcom/Platforms/Msm8960/Library/PlatformDxeInitLib/PlatformDxeInitLib.inf b/Qcom/Platforms/Msm8960/Library/PlatformDxeInitLib/PlatformDxeInitLib.inf deleted file mode 100644 index 8eac8d7..0000000 --- a/Qcom/Platforms/Msm8960/Library/PlatformDxeInitLib/PlatformDxeInitLib.inf +++ /dev/null @@ -1,34 +0,0 @@ -#/** @file -# Memory Status Code Library for UEFI drivers -# -# Lib to provide memory journal status code reporting Routines -# Copyright (c) 2006, Intel Corporation. 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 = PlatformDxeInitLib - FILE_GUID = 731BABAD-3671-49DF-9972-17FBD52A8BBA - MODULE_TYPE = BASE - VERSION_STRING = 1.0 - LIBRARY_CLASS = PlatformDxeInitLib - - -[Sources.common] - PlatformDxeInitLib.c - -[Packages] - MdePkg/MdePkg.dec - ArmPkg/ArmPkg.dec - EFIDroidPkg/EFIDroidPkg.dec - EFIDroidPkg/Qcom/Qcom.dec - EFIDroidPkg/Qcom/Platforms/Msm8960/Msm8960.dec diff --git a/Qcom/Platforms/Msm8960/Msm8960.dsc.inc b/Qcom/Platforms/Msm8960/Msm8960.dsc.inc index 7c6a640..08ffc79 100644 --- a/Qcom/Platforms/Msm8960/Msm8960.dsc.inc +++ b/Qcom/Platforms/Msm8960/Msm8960.dsc.inc @@ -64,7 +64,6 @@ !endif [LibraryClasses.common.DXE_DRIVER] - PlatformDxeInitLib|EFIDroidPkg/Qcom/Platforms/Msm8960/Library/PlatformDxeInitLib/PlatformDxeInitLib.inf QcomDxeTimerLib|EFIDroidPkg/Qcom/Library/QcomDGTDxeTimerLib/QcomDGTDxeTimerLib.inf QcomPlatformDxeTimerLib|EFIDroidPkg/Qcom/Platforms/Msm8960/Library/QcomPlatformDxeTimerLib/QcomPlatformDxeTimerLib.inf QcomPlatformUsbLib|EFIDroidPkg/Qcom/Platforms/Msm8960/Library/QcomPlatformUsbLib/QcomPlatformUsbLib.inf diff --git a/Qcom/Platforms/Msm8994/Msm8994.dsc.inc b/Qcom/Platforms/Msm8994/Msm8994.dsc.inc index 897cd60..1e35f1b 100644 --- a/Qcom/Platforms/Msm8994/Msm8994.dsc.inc +++ b/Qcom/Platforms/Msm8994/Msm8994.dsc.inc @@ -68,7 +68,6 @@ !endif [LibraryClasses.common.DXE_DRIVER] - PlatformDxeInitLib|EFIDroidPkg/Qcom/Library/PlatformDxeInitLibNull/PlatformDxeInitLibNull.inf QcomDxeTimerLib|EFIDroidPkg/Qcom/Library/QTimerLib/QcomQTimerDxeTimerLib.inf [LibraryClasses.common.DXE_DRIVER, LibraryClasses.common.UEFI_APPLICATION, LibraryClasses.common.UEFI_DRIVER] diff --git a/Qcom/Qcom.dsc.inc b/Qcom/Qcom.dsc.inc index 5d92594..e2acbc2 100644 --- a/Qcom/Qcom.dsc.inc +++ b/Qcom/Qcom.dsc.inc @@ -13,9 +13,6 @@ QcomPlatformMmcClockOverrideLib|EFIDroidPkg/Qcom/Library/QcomPlatformMmcClockOverrideLibNull/QcomPlatformMmcClockOverrideLibNull.inf QcomUsbPhyLib|EFIDroidPkg/Qcom/Library/QcomUsbPhyLib/QcomUsbPhyLib.inf -[LibraryClasses.common.DXE_DRIVER] - ChipVendorDxeInitLib|EFIDroidPkg/Qcom/Library/ChipVendorDxeInitLib/ChipVendorDxeInitLib.inf - [Components.common] EFIDroidPkg/Qcom/Drivers/TimerDxe/TimerDxe.inf !if $(DISPLAY_TYPE) != DISABLED && $(EARLYDEBUG_TYPE) != DISPLAY