From ecd9cd15e77eb6b4c9363f5e5c99ccbbc0a1c404 Mon Sep 17 00:00:00 2001 From: vanjeff Date: Mon, 2 Jul 2007 07:28:50 +0000 Subject: [PATCH] 1. Remove IntelFrameworkPkg.dec package dependency from EdkFvbServiceLib.inf and VariableRuntimeDxe/Variable.inf 2. Remove IntelFrameworkModulePkg.dec package dependency from DxeNt32OemHookStatusCodeLib.inf and PeiNt32OemHookStatusCodeLib.inf. 3. Enable StatusCode Dxe and Peim modules in Nt32Pkg.dsc git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2938 6f19259b-4bc3-4df7-8a09-765794883524 --- .../PeiReportStatusCodeLib.inf | 1 + MdeModulePkg/Include/Common/FlashMap.h | 2 +- .../Library/EdkFvbServiceLib/CommonHeader.h | 49 ------------------- .../EdkFvbServiceLib/EdkFvbServiceLib.inf | 2 +- MdeModulePkg/MdeModulePkg.dsc | 2 + .../Capsule/RuntimeDxe/CapsuleRuntime.inf | 2 +- .../Universal/VariableRuntimeDxe/Variable.inf | 2 - .../DxeNt32OemHookStatusCodeLib.inf | 1 - .../PeiNt32OemHookStatusCodeLib.inf | 2 - Nt32Pkg/Nt32Pkg.dsc | 4 +- 10 files changed, 8 insertions(+), 59 deletions(-) delete mode 100644 MdeModulePkg/Library/EdkFvbServiceLib/CommonHeader.h diff --git a/IntelFrameworkPkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf b/IntelFrameworkPkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf index 6e98c9da68..f785624d13 100644 --- a/IntelFrameworkPkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf +++ b/IntelFrameworkPkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf @@ -55,6 +55,7 @@ [Packages] MdePkg/MdePkg.dec + IntelFrameworkPkg/IntelFrameworkPkg.dec ################################################################################ diff --git a/MdeModulePkg/Include/Common/FlashMap.h b/MdeModulePkg/Include/Common/FlashMap.h index 0473a69355..2fd88468b8 100644 --- a/MdeModulePkg/Include/Common/FlashMap.h +++ b/MdeModulePkg/Include/Common/FlashMap.h @@ -24,7 +24,7 @@ Abstract: #ifndef __COMMON_FLASHMAP_H__ #define __COMMON_FLASHMAP_H__ -#include +//#include // // Definition for flash map GUIDed HOBs // diff --git a/MdeModulePkg/Library/EdkFvbServiceLib/CommonHeader.h b/MdeModulePkg/Library/EdkFvbServiceLib/CommonHeader.h deleted file mode 100644 index 01f5eb96e5..0000000000 --- a/MdeModulePkg/Library/EdkFvbServiceLib/CommonHeader.h +++ /dev/null @@ -1,49 +0,0 @@ -/**@file - Common header file shared by all source files. - - This file includes package header files, library classes and protocol, PPI & GUID definitions. - - Copyright (c) 2006 - 2007, 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. -**/ - -#ifndef __COMMON_HEADER_H_ -#define __COMMON_HEADER_H_ - - -// -// The package level header files this module uses -// -#include -// -// The protocols, PPI and GUID defintions for this module -// -#include -#include -// -// The Library classes this module consumes -// -#include -#include -#include -#include -#include -#include -#include - -// -// Declaration for callback Event. -// -VOID -EFIAPI -FvbVirtualAddressChangeNotifyEvent ( - IN EFI_EVENT Event, - IN VOID *Context - ); - -#endif diff --git a/MdeModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.inf b/MdeModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.inf index 9ba261eed3..67fa139c3c 100644 --- a/MdeModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.inf +++ b/MdeModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.inf @@ -67,7 +67,7 @@ [Packages] MdePkg/MdePkg.dec - IntelFrameworkPkg/IntelFrameworkPkg.dec + MdeModulePkg/MdeModulePkg.dec ################################################################################ # diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc index f6e05a517b..909987495c 100644 --- a/MdeModulePkg/MdeModulePkg.dsc +++ b/MdeModulePkg/MdeModulePkg.dsc @@ -331,6 +331,7 @@ [Components.Ia32] + ${WORKSPACE}/MdeModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.inf ${WORKSPACE}/MdeModulePkg/Application/HelloWorld/HelloWorld.inf ${WORKSPACE}/MdeModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.inf ${WORKSPACE}/MdeModulePkg/Universal/Disk/Partition/Dxe/Partition.inf @@ -347,5 +348,6 @@ ${WORKSPACE}/MdeModulePkg/Bus/Pci/AtapiPassThru/Dxe/AtapiPassThru.inf ${WORKSPACE}/MdeModulePkg/Universal/WatchDogTimerDxe/WatchDogTimer.inf ${WORKSPACE}/MdeModulePkg/Universal/VariablePei/Variable.inf + ${WORKSPACE}/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.inf ${WORKSPACE}/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.inf ${WORKSPACE}/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.inf diff --git a/MdeModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.inf b/MdeModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.inf index b191ad449a..bdc91db1d7 100644 --- a/MdeModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.inf +++ b/MdeModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.inf @@ -85,7 +85,7 @@ [Guids] gEfiCapsuleVendorGuid # SOMETIMES_CONSUMED - gEfiCapsuleGuid + gEfiCapsuleGuid ################################################################################ # diff --git a/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.inf b/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.inf index 768deb5493..bdddbe148d 100644 --- a/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.inf +++ b/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.inf @@ -62,8 +62,6 @@ [Packages] MdePkg/MdePkg.dec - MdeModulePkg/MdeModulePkg.dec - IntelFrameworkPkg/IntelFrameworkPkg.dec ################################################################################ # diff --git a/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/DxeNt32OemHookStatusCodeLib.inf b/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/DxeNt32OemHookStatusCodeLib.inf index 463436701c..62eeb03e4d 100644 --- a/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/DxeNt32OemHookStatusCodeLib.inf +++ b/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/DxeNt32OemHookStatusCodeLib.inf @@ -58,7 +58,6 @@ ################################################################################ [Packages] - IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec Nt32Pkg/Nt32Pkg.dec MdePkg/MdePkg.dec IntelFrameworkPkg/IntelFrameworkPkg.dec diff --git a/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/PeiNt32OemHookStatusCodeLib.inf b/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/PeiNt32OemHookStatusCodeLib.inf index b7d8d1599f..ab0d07f7ab 100644 --- a/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/PeiNt32OemHookStatusCodeLib.inf +++ b/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/PeiNt32OemHookStatusCodeLib.inf @@ -59,8 +59,6 @@ MdePkg/MdePkg.dec Nt32Pkg/Nt32Pkg.dec IntelFrameworkPkg/IntelFrameworkPkg.dec - IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec - ################################################################################ # diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc index 23c9be9d48..e6ef73bab8 100644 --- a/Nt32Pkg/Nt32Pkg.dsc +++ b/Nt32Pkg/Nt32Pkg.dsc @@ -430,8 +430,8 @@ $(WORKSPACE)/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/IdeBus.inf $(WORKSPACE)/IntelFrameworkModulePkg/Universal/DataHub/DataHub/Dxe/DataHub.inf $(WORKSPACE)/IntelFrameworkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.inf - #$(WORKSPACE)/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf - #$(WORKSPACE)/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf + $(WORKSPACE)/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf + $(WORKSPACE)/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf $(WORKSPACE)/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.inf $(WORKSPACE)/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/SetupBrowser.inf $(WORKSPACE)/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.inf -- 2.39.2