Remove the BugBug in package header file for DXE_CORE and DXE_DRIVER which force every driver to include MdePkg/Include/Library/PeCoffLib.h.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2458 6f19259b-4bc3-4df7-8a09-765794883524

5 files changed, 9 insertions, 23 deletions

diff --git a/EdkModulePkg/Include/EdkDxe.h b/EdkModulePkg/Include/EdkDxe.h
index 3e1b3d5610..80a55a3e4d 100644
--- a/EdkModulePkg/Include/EdkDxe.h
+++ b/EdkModulePkg/Include/EdkDxe.h
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2006, Intel Corporation                                                         

+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        

@@ -26,13 +26,7 @@ Abstract:
 #ifndef __EDK_DXE_H__

 #define __EDK_DXE_H__

 

-//

 #include <Common/FlashMap.h>

-// BUGBUG: We must include this lib here due to ordering issues

-//

-#include <Library/PeCoffLib.h>

-

-

 #include <Guid/MemoryTypeInformation.h>

 #include <Guid/FlashMapHob.h>

 #include <Guid/SystemNvDataGuid.h>

diff --git a/EdkModulePkg/Include/EdkDxeCore.h b/EdkModulePkg/Include/EdkDxeCore.h
index d1e57e0775..2308e97d14 100644
--- a/EdkModulePkg/Include/EdkDxeCore.h
+++ b/EdkModulePkg/Include/EdkDxeCore.h
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2006, Intel Corporation                                                         

+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        

@@ -26,11 +26,7 @@ Abstract:
 #ifndef __EDK_DXE_CORE_H__

 #define __EDK_DXE_CORE_H__

 

-//

-// BUGBUG: We must include this lib here due to ordering issues

-//

 #include <Common/DecompressLibraryHob.h>

-#include <Library/PeCoffLib.h>

 

 //

 // BUGBUG: Performance related protocol and Guid.

diff --git a/EdkModulePkg/Include/EdkPeiCore.h b/EdkModulePkg/Include/EdkPeiCore.h
index 4e07efb01b..c7870af01e 100644
--- a/EdkModulePkg/Include/EdkPeiCore.h
+++ b/EdkModulePkg/Include/EdkPeiCore.h
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2006, Intel Corporation                                                         

+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        

@@ -26,10 +26,6 @@ Abstract:
 #ifndef __EDK_PEI_CORE_H__

 #define __EDK_PEI_CORE_H__

 

-//

-// BUGBUG: We must include this lib here due to ordering issues

-//

-#include <Library/PeCoffLib.h>

 

 #include <Guid/PeiPeCoffLoader.h>

 

diff --git a/EdkModulePkg/Include/EdkPeim.h b/EdkModulePkg/Include/EdkPeim.h
index e76d83df85..229d24c99e 100644
--- a/EdkModulePkg/Include/EdkPeim.h
+++ b/EdkModulePkg/Include/EdkPeim.h
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2006, Intel Corporation                                                         

+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        

@@ -31,10 +31,6 @@ Abstract:
 //

 #include <Common/FlashMap.h>

 #include <Common/DecompressLibraryHob.h>

-// BUGBUG: We must include this lib here due to ordering issues

-//

-#include <Library/PeCoffLib.h>

-

 //

 // BUGBUG: Performance related Guid.

 // It is Tiano-private, but is required for PeiCore

diff --git a/EdkModulePkg/Include/Guid/PeiPeCoffLoader.h b/EdkModulePkg/Include/Guid/PeiPeCoffLoader.h
index abafb71afd..4a732a14d8 100644
--- a/EdkModulePkg/Include/Guid/PeiPeCoffLoader.h
+++ b/EdkModulePkg/Include/Guid/PeiPeCoffLoader.h
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2006, Intel Corporation                                                         

+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        

@@ -20,6 +20,10 @@ Abstract:
 #ifndef __PEI_PE_COFF_LOADER_H__

 #define __PEI_PE_COFF_LOADER_H__

 

+//

+// MdePkg/Include/Common/PeCoffLoaderImageContext.h

+//

+#include <Common/PeCoffLoaderImageContext.h>

 

 #define EFI_PEI_PE_COFF_LOADER_GUID  \

   { 0xd8117cff, 0x94a6, 0x11d4, {0x9a, 0x3a, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } }