Removed CommonHeader.h from MdePkg & MdeModulePkg

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

10 files changed, 30 insertions, 100 deletions

diff --git a/MdeModulePkg/Core/DxeIplPeim/CommonHeader.h b/MdeModulePkg/Core/DxeIplPeim/CommonHeader.h
deleted file mode 100644
index 2240f6ddeb..0000000000
--- a/MdeModulePkg/Core/DxeIplPeim/CommonHeader.h
+++ /dev/null
@@ -1,56 +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 <PiPei.h>

-//

-// The protocols, PPI and GUID defintions for this module

-//

-#include <Ppi/DxeIpl.h>

-#include <Ppi/S3Resume.h>

-#include <Protocol/EdkDecompress.h>

-#include <Ppi/EndOfPeiPhase.h>

-#include <Protocol/CustomizedDecompress.h>

-#include <Protocol/Decompress.h>

-#include <Ppi/Security.h>

-#include <Ppi/SectionExtraction.h>

-#include <Ppi/LoadFile.h>

-#include <Ppi/RecoveryModule.h>

-#include <Ppi/MemoryDiscovered.h>

-//

-// The Library classes this module consumes

-//

-#include <Library/DebugLib.h>

-#include <Library/PeimEntryPoint.h>

-#include <Library/BaseLib.h>

-#include <Library/HobLib.h>

-#include <Library/PeiServicesLib.h>

-#include <Library/ReportStatusCodeLib.h>

-#include <Library/CacheMaintenanceLib.h>

-#include <Library/PeCoffLoaderLib.h>

-#include <Library/UefiDecompressLib.h>

-#include <Library/CustomDecompressLib.h>

-#include <Library/PeiServicesTablePointerLib.h>

-#include <Library/BaseMemoryLib.h>

-#include <Library/MemoryAllocationLib.h>

-#include <Library/PcdLib.h>

-#include <Library/PeCoffLib.h>

-

-#endif

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
index 5315b8b9dc..ae8b90be8f 100644
--- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
@@ -20,10 +20,34 @@ Abstract:
 #ifndef __PEI_DXEIPL_H__

 #define __PEI_DXEIPL_H__

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

+#include <PiPei.h>

+#include <Ppi/DxeIpl.h>

+#include <Ppi/S3Resume.h>

+#include <Protocol/EdkDecompress.h>

+#include <Ppi/EndOfPeiPhase.h>

+#include <Protocol/CustomizedDecompress.h>

+#include <Protocol/Decompress.h>

+#include <Ppi/Security.h>

+#include <Ppi/SectionExtraction.h>

+#include <Ppi/LoadFile.h>

+#include <Ppi/RecoveryModule.h>

+#include <Ppi/MemoryDiscovered.h>

+#include <Library/DebugLib.h>

+#include <Library/PeimEntryPoint.h>

+#include <Library/BaseLib.h>

+#include <Library/HobLib.h>

+#include <Library/PeiServicesLib.h>

+#include <Library/ReportStatusCodeLib.h>

+#include <Library/CacheMaintenanceLib.h>

+#include <Library/PeCoffLoaderLib.h>

+#include <Library/UefiDecompressLib.h>

+#include <Library/CustomDecompressLib.h>

+#include <Library/PeiServicesTablePointerLib.h>

+#include <Library/BaseMemoryLib.h>

+#include <Library/MemoryAllocationLib.h>

+#include <Library/PcdLib.h>

+#include <Library/PeCoffLib.h>

+

 

 #define STACK_SIZE      0x20000

 #define BSP_STORE_SIZE  0x4000

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
index eec1d864da..ebae17ccd2 100644
--- a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
@@ -20,11 +20,6 @@ Abstract:
 

 --*/

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

-

 #include "DxeIpl.h"

 

 // porting note remove later

diff --git a/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c b/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c
index d3fbcb2e08..63ee2af396 100644
--- a/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c
+++ b/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c
@@ -19,11 +19,6 @@ Abstract:
 

 --*/

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

-

 #include "DxeIpl.h"

 #include "VirtualMemory.h"

 

diff --git a/MdeModulePkg/Core/DxeIplPeim/Ia32/ImageRead.c b/MdeModulePkg/Core/DxeIplPeim/Ia32/ImageRead.c
index f7bef7eb3e..b4bd64067c 100644
--- a/MdeModulePkg/Core/DxeIplPeim/Ia32/ImageRead.c
+++ b/MdeModulePkg/Core/DxeIplPeim/Ia32/ImageRead.c
@@ -17,11 +17,6 @@ Abstract:
 

 --*/

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

-

 #include "DxeIpl.h"

 

 EFI_STATUS

diff --git a/MdeModulePkg/Core/DxeIplPeim/Ia32/VirtualMemory.c b/MdeModulePkg/Core/DxeIplPeim/Ia32/VirtualMemory.c
index f4a6a4faba..92f29daf8b 100644
--- a/MdeModulePkg/Core/DxeIplPeim/Ia32/VirtualMemory.c
+++ b/MdeModulePkg/Core/DxeIplPeim/Ia32/VirtualMemory.c
@@ -32,13 +32,10 @@ Abstract:
   

 --*/  

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

-

+#include "DxeIpl.h"

 #include "VirtualMemory.h"

 

+

 UINTN

 CreateIdentityMappingPageTables (

   VOID

diff --git a/MdeModulePkg/Core/DxeIplPeim/Ia32/VirtualMemory.h b/MdeModulePkg/Core/DxeIplPeim/Ia32/VirtualMemory.h
index 4e6614ecfb..89a7f2eceb 100644
--- a/MdeModulePkg/Core/DxeIplPeim/Ia32/VirtualMemory.h
+++ b/MdeModulePkg/Core/DxeIplPeim/Ia32/VirtualMemory.h
@@ -26,11 +26,6 @@ Abstract:
 #define _VIRTUAL_MEMORY_H_

 

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

-

 #define SYS_CODE64_SEL 0x38

 

 #pragma pack(1)

diff --git a/MdeModulePkg/Core/DxeIplPeim/Ipf/DxeLoadFunc.c b/MdeModulePkg/Core/DxeIplPeim/Ipf/DxeLoadFunc.c
index 3feb2e5ee5..34141ab9f6 100644
--- a/MdeModulePkg/Core/DxeIplPeim/Ipf/DxeLoadFunc.c
+++ b/MdeModulePkg/Core/DxeIplPeim/Ipf/DxeLoadFunc.c
@@ -19,11 +19,6 @@ Abstract:
 

 --*/

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

-

 #include "DxeIpl.h"

 

 VOID

diff --git a/MdeModulePkg/Core/DxeIplPeim/Ipf/ImageRead.c b/MdeModulePkg/Core/DxeIplPeim/Ipf/ImageRead.c
index 5002fe8c67..b04c9a7e1b 100644
--- a/MdeModulePkg/Core/DxeIplPeim/Ipf/ImageRead.c
+++ b/MdeModulePkg/Core/DxeIplPeim/Ipf/ImageRead.c
@@ -17,11 +17,6 @@ Abstract:
 

 --*/

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

-

 #include "DxeIpl.h"

 

 EFI_STATUS

diff --git a/MdeModulePkg/Core/DxeIplPeim/X64/DxeLoadFunc.c b/MdeModulePkg/Core/DxeIplPeim/X64/DxeLoadFunc.c
index 1d5709af5e..53febd563d 100644
--- a/MdeModulePkg/Core/DxeIplPeim/X64/DxeLoadFunc.c
+++ b/MdeModulePkg/Core/DxeIplPeim/X64/DxeLoadFunc.c
@@ -19,11 +19,6 @@ Abstract:
 

 --*/

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

-

 #include "DxeIpl.h"

 

 VOID