Remove the BugBug in package header file for DXE_CORE and DXE_DRIVER which force...

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

diff --git a/EdkModulePkg/Include/EdkDxe.h b/EdkModulePkg/Include/EdkDxe.h
index 3e1b3d56106c684274e5bac57fc3c31c5bc3819b..80a55a3e4d49815f49c8d71f6faeca6b61a586b4 100644 (file)
--- a/EdkModulePkg/Include/EdkDxe.h
+++ b/EdkModulePkg/Include/EdkDxe.h
@@ -1,6 +1,6 @@
 /*++\r
 \r
 /*++\r
 \r

-Copyright (c) 2006, Intel Corporation                                                         \r
+Copyright (c) 2006 - 2007, Intel Corporation                                                         \r

 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r


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

-//\r

 #include <Common/FlashMap.h>\r
 #include <Common/FlashMap.h>\r

-// BUGBUG: We must include this lib here due to ordering issues\r
-//\r
-#include <Library/PeCoffLib.h>\r
-\r
-\r

 #include <Guid/MemoryTypeInformation.h>\r
 #include <Guid/FlashMapHob.h>\r
 #include <Guid/SystemNvDataGuid.h>\r
 #include <Guid/MemoryTypeInformation.h>\r
 #include <Guid/FlashMapHob.h>\r
 #include <Guid/SystemNvDataGuid.h>\r

diff --git a/EdkModulePkg/Include/EdkDxeCore.h b/EdkModulePkg/Include/EdkDxeCore.h
index d1e57e0775fd7e4c658e7584af24adff3d409dec..2308e97d147c7c12807fec307b73f337b8dc0c67 100644 (file)
--- a/EdkModulePkg/Include/EdkDxeCore.h
+++ b/EdkModulePkg/Include/EdkDxeCore.h
@@ -1,6 +1,6 @@
 /*++\r
 \r
 /*++\r
 \r

-Copyright (c) 2006, Intel Corporation                                                         \r
+Copyright (c) 2006 - 2007, Intel Corporation                                                         \r

 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r


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

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

 #include <Common/DecompressLibraryHob.h>\r
 #include <Common/DecompressLibraryHob.h>\r

-#include <Library/PeCoffLib.h>\r

 \r
 //\r
 // BUGBUG: Performance related protocol and Guid.\r
 \r
 //\r
 // BUGBUG: Performance related protocol and Guid.\r

diff --git a/EdkModulePkg/Include/EdkPeiCore.h b/EdkModulePkg/Include/EdkPeiCore.h
index 4e07efb01b2cb9e1ba765c45badc388d26b9cd9e..c7870af01e57cb0ab2cbae509701b29adb74e196 100644 (file)
--- a/EdkModulePkg/Include/EdkPeiCore.h
+++ b/EdkModulePkg/Include/EdkPeiCore.h
@@ -1,6 +1,6 @@
 /*++\r
 \r
 /*++\r
 \r

-Copyright (c) 2006, Intel Corporation                                                         \r
+Copyright (c) 2006 - 2007, Intel Corporation                                                         \r

 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r


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

-//\r
-// BUGBUG: We must include this lib here due to ordering issues\r
-//\r
-#include <Library/PeCoffLib.h>\r

 \r
 #include <Guid/PeiPeCoffLoader.h>\r
 \r
 \r
 #include <Guid/PeiPeCoffLoader.h>\r
 \r

diff --git a/EdkModulePkg/Include/EdkPeim.h b/EdkModulePkg/Include/EdkPeim.h
index e76d83df851f34e47bb7e40a12d555bf7bd74dfd..229d24c99e8d3f3260cf655165e5030265789ea6 100644 (file)
--- a/EdkModulePkg/Include/EdkPeim.h
+++ b/EdkModulePkg/Include/EdkPeim.h
@@ -1,6 +1,6 @@
 /*++\r
 \r
 /*++\r
 \r

-Copyright (c) 2006, Intel Corporation                                                         \r
+Copyright (c) 2006 - 2007, Intel Corporation                                                         \r

 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r


@@ -31,10 +31,6 @@ Abstract:
 //\r
 #include <Common/FlashMap.h>\r
 #include <Common/DecompressLibraryHob.h>\r
 //\r
 #include <Common/FlashMap.h>\r
 #include <Common/DecompressLibraryHob.h>\r

-// BUGBUG: We must include this lib here due to ordering issues\r
-//\r
-#include <Library/PeCoffLib.h>\r
-\r

 //\r
 // BUGBUG: Performance related Guid.\r
 // It is Tiano-private, but is required for PeiCore\r
 //\r
 // BUGBUG: Performance related Guid.\r
 // It is Tiano-private, but is required for PeiCore\r

diff --git a/EdkModulePkg/Include/Guid/PeiPeCoffLoader.h b/EdkModulePkg/Include/Guid/PeiPeCoffLoader.h
index abafb71afd33c8e69e2dd54a9813c1c79fc011e2..4a732a14d8d42fc488d572aabb5b43149f8289b8 100644 (file)
--- a/EdkModulePkg/Include/Guid/PeiPeCoffLoader.h
+++ b/EdkModulePkg/Include/Guid/PeiPeCoffLoader.h
@@ -1,6 +1,6 @@
 /*++\r
 \r
 /*++\r
 \r

-Copyright (c) 2006, Intel Corporation                                                         \r
+Copyright (c) 2006 - 2007, Intel Corporation                                                         \r

 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r


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

+//\r
+// MdePkg/Include/Common/PeCoffLoaderImageContext.h\r
+//\r
+#include <Common/PeCoffLoaderImageContext.h>\r

 \r
 #define EFI_PEI_PE_COFF_LOADER_GUID  \\r
   { 0xd8117cff, 0x94a6, 0x11d4, {0x9a, 0x3a, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } }\r
 \r
 #define EFI_PEI_PE_COFF_LOADER_GUID  \\r
   { 0xd8117cff, 0x94a6, 0x11d4, {0x9a, 0x3a, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } }\r