1. Removed the unnecessary #include statements and include files

2. Removed the unnecessary library and include path from MSA files


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

Tools/Source/TianoTools/PeCoffLoader/BasePeCoff.c

@@ -22,11 +22,9 @@ Revision History
 --*/
 
 
-#define EFI_SPECIFICATION_VERSION    0x00000000
-#define EDK_RELEASE_VERSION          0x00020000
-#include <Base.h>
+#include <Common/UefiBaseTypes.h>
+#include <Common/EfiImage.h>
 #include <Library/PeCoffLib.h>
-#include <Library/BaseMemoryLib.h>
 
 STATIC
 RETURN_STATUS
@@ -600,11 +598,11 @@ Returns:
     //
     RelocDir = &TeHdr->DataDirectory[0];
     RelocBase = (EFI_IMAGE_BASE_RELOCATION *)(UINTN)(
-		                                ImageContext->ImageAddress + 
-		                                RelocDir->VirtualAddress +
-		                                sizeof(EFI_TE_IMAGE_HEADER) - 
-		                                TeHdr->StrippedSize
-		                                );
+                                    ImageContext->ImageAddress + 
+                                    RelocDir->VirtualAddress +
+                                    sizeof(EFI_TE_IMAGE_HEADER) - 
+                                    TeHdr->StrippedSize
+                                    );
     RelocBaseEnd = (EFI_IMAGE_BASE_RELOCATION *) ((UINTN) RelocBase + (UINTN) RelocDir->Size - 1);
   }
   
@@ -620,10 +618,10 @@ Returns:
       FixupBase = PeCoffLoaderImageAddress (ImageContext, RelocBase->VirtualAddress);
     } else {
       FixupBase = (CHAR8 *)(UINTN)(ImageContext->ImageAddress +
-	  	              RelocBase->VirtualAddress +
-	  	              sizeof(EFI_TE_IMAGE_HEADER) - 
-	  	              TeHdr->StrippedSize
-	  	              );
+                    RelocBase->VirtualAddress +
+                    sizeof(EFI_TE_IMAGE_HEADER) - 
+                    TeHdr->StrippedSize
+                    );
     }
 
     if ((CHAR8 *) RelocEnd < (CHAR8 *) ((UINTN) ImageContext->ImageAddress) ||
@@ -836,9 +834,9 @@ Returns:
     TeHdr             = (EFI_TE_IMAGE_HEADER *) (UINTN) (ImageContext->ImageAddress);
 
     FirstSection = (EFI_IMAGE_SECTION_HEADER *) (
-		      (UINTN)ImageContext->ImageAddress +
-		      sizeof(EFI_TE_IMAGE_HEADER)
-		      );
+          (UINTN)ImageContext->ImageAddress +
+          sizeof(EFI_TE_IMAGE_HEADER)
+          );
     NumberOfSections  = (UINTN) (TeHdr->NumberOfSections);
 
   }
@@ -933,9 +931,9 @@ Returns:
                                                                 );
   } else {
     ImageContext->EntryPoint =  (PHYSICAL_ADDRESS) (
-		                   (UINTN)ImageContext->ImageAddress +
-		                   (UINTN)TeHdr->AddressOfEntryPoint +
-		                   (UINTN)sizeof(EFI_TE_IMAGE_HEADER) -
+                       (UINTN)ImageContext->ImageAddress +
+                       (UINTN)TeHdr->AddressOfEntryPoint +
+                       (UINTN)sizeof(EFI_TE_IMAGE_HEADER) -
           (UINTN) TeHdr->StrippedSize
       );
   }
@@ -976,11 +974,11 @@ Returns:
                     );
     } else {
       DebugEntry = (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *)(UINTN)(
-	  	                                         ImageContext->ImageAddress +
-	  	                                         ImageContext->DebugDirectoryEntryRva +
-	  	                                         sizeof(EFI_TE_IMAGE_HEADER) -
-	  	                                         TeHdr->StrippedSize
-	  	                                         );
+                                               ImageContext->ImageAddress +
+                                               ImageContext->DebugDirectoryEntryRva +
+                                               sizeof(EFI_TE_IMAGE_HEADER) -
+                                               TeHdr->StrippedSize
+                                               );
     }
 
     if (DebugEntry != NULL) {
@@ -999,9 +997,9 @@ Returns:
           ImageContext->CodeView = PeCoffLoaderImageAddress (ImageContext, TempDebugEntryRva);
         } else {
           ImageContext->CodeView = (VOID *)(
-		  	              (UINTN)ImageContext->ImageAddress +
-		  	              (UINTN)TempDebugEntryRva +
-		  	              (UINTN)sizeof(EFI_TE_IMAGE_HEADER) -
+                      (UINTN)ImageContext->ImageAddress +
+                      (UINTN)TempDebugEntryRva +
+                      (UINTN)sizeof(EFI_TE_IMAGE_HEADER) -
                 (UINTN) TeHdr->StrippedSize
             );
         }

Tools/Source/TianoTools/PeCoffLoader/Common/EfiImage.h

@@ -1,19 +1,19 @@
 /** @file
-	EFI image format for PE32+. Please note some data structures are different
-	for IA-32 and Itanium-based images, look for UINTN and the #ifdef EFI_IA64
+  EFI image format for PE32+. Please note some data structures are different
+  for IA-32 and Itanium-based images, look for UINTN and the #ifdef EFI_IA64
 
-	@bug Fix text - doc as defined in MSFT EFI specification.
+  @bug Fix text - doc as defined in MSFT EFI specification.
 
-	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                                            
+  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.             
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-	Module Name:	EfiImage.h
+  Module Name:  EfiImage.h
 
 **/
 

Tools/Source/TianoTools/PeCoffLoader/Ia32/PeCoffLoaderEx.c

@@ -21,15 +21,7 @@ Revision History
 
 --*/
 
-
-#define EFI_SPECIFICATION_VERSION    0x00000000
-#define EDK_RELEASE_VERSION          0x00020000
-#include <Base.h>
-#include <Library/PeCoffLib.h>
-#include <Library/BaseMemoryLib.h>
-
-
-
+#include <Common/UefiBaseTypes.h>
 
 RETURN_STATUS
 PeCoffLoaderRelocateImageEx (

Tools/Source/TianoTools/PeCoffLoader/Ipf/PeCoffLoaderEx.c

@@ -22,11 +22,9 @@ Revision History
 
 --*/
 
-#define EFI_SPECIFICATION_VERSION    0x00000000
-#define EDK_RELEASE_VERSION          0x00020000
-#include <Base.h>
+#include <Common/UefiBaseTypes.h>
+#include <Common/EfiImage.h>
 #include <Library/PeCoffLib.h>
-#include <Library/BaseMemoryLib.h>
 
 
 

Tools/Source/TianoTools/PeCoffLoader/X64/PeCoffLoaderEx.c

@@ -22,11 +22,9 @@ Revision History
 
 --*/
 
-#define EFI_SPECIFICATION_VERSION    0x00000000
-#define EDK_RELEASE_VERSION          0x00020000
-#include <Base.h>
+#include <Common/UefiBaseTypes.h>
+#include <Common/EfiImage.h>
 #include <Library/PeCoffLib.h>
-#include <Library/BaseMemoryLib.h>
 
 
 

Tools/Source/TianoTools/PeCoffLoader/build.xml

@@ -125,11 +125,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
       <includepath path="${PACKAGE_DIR}/${LibName}"/>
       <includepath path="${PACKAGE_DIR}/Include"/>
-      <includepath path="${PACKAGE_DIR}/Include"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>
-      <includepath path="${PACKAGE_DIR}/Include/Library"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
     </cc>
   </target>
@@ -150,11 +146,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
       <includepath path="${PACKAGE_DIR}/${LibName}"/>
       <includepath path="${PACKAGE_DIR}/Include"/>
-      <includepath path="${PACKAGE_DIR}/Include"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>
-      <includepath path="${PACKAGE_DIR}/Include/Library"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
     </cc>
   </target>
@@ -175,11 +167,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
       <includepath path="${PACKAGE_DIR}/${LibName}"/>
       <includepath path="${PACKAGE_DIR}/Include"/>
-      <includepath path="${PACKAGE_DIR}/Include"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>
-      <includepath path="${PACKAGE_DIR}/Include/Library"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
     </cc>
   </target>