Sync EDKII BaseTools to BaseTools project r1971

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

37 files changed, 237 insertions, 75 deletions

diff --git a/BaseTools/Source/C/Common/BasePeCoff.c b/BaseTools/Source/C/Common/BasePeCoff.c
index 5ffb5d4503..878c1c611b 100644
--- a/BaseTools/Source/C/Common/BasePeCoff.c
+++ b/BaseTools/Source/C/Common/BasePeCoff.c
@@ -2,8 +2,8 @@
 

   Functions to get info and load PE/COFF image.

 

-Copyright (c) 2004 - 2008, Intel Corporation                                                         

-All rights reserved. This program and the accompanying materials                          

+Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>

+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                                            

@@ -71,6 +71,14 @@ PeCoffLoaderRelocateIpfImage (
   IN UINT64      Adjust

   );

 

+RETURN_STATUS

+PeCoffLoaderRelocateArmImage (

+  IN UINT16      **Reloc,

+  IN OUT CHAR8   *Fixup,

+  IN OUT CHAR8   **FixupData,

+  IN UINT64      Adjust

+  );

+

 STATIC

 RETURN_STATUS

 PeCoffLoaderGetPeHeader (

@@ -777,9 +785,11 @@ Returns:
       default:

         switch (MachineType) {

         case EFI_IMAGE_MACHINE_IA32:

-        case EFI_IMAGE_MACHINE_ARMT:

           Status = PeCoffLoaderRelocateIa32Image (Reloc, Fixup, &FixupData, Adjust);

           break;

+        case EFI_IMAGE_MACHINE_ARMT:

+          Status = PeCoffLoaderRelocateArmImage (&Reloc, Fixup, &FixupData, Adjust);

+          break;

         case EFI_IMAGE_MACHINE_X64:

           Status = PeCoffLoaderRelocateX64Image (Reloc, Fixup, &FixupData, Adjust);

           break;

diff --git a/BaseTools/Source/C/Common/BinderFuncs.c b/BaseTools/Source/C/Common/BinderFuncs.c
index 89e75efa3d..5ee55480bd 100644
--- a/BaseTools/Source/C/Common/BinderFuncs.c
+++ b/BaseTools/Source/C/Common/BinderFuncs.c
@@ -1,7 +1,7 @@
 /** @file

 

-Copyright (c) 1999 - 2008, Intel Corporation

-All rights reserved. This program and the accompanying materials

+Copyright (c) 1999 - 2008, Intel Corporation. All rights reserved.<BR>

+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

diff --git a/BaseTools/Source/C/Common/BinderFuncs.h b/BaseTools/Source/C/Common/BinderFuncs.h
index 779c5a2e06..48dc82eb70 100644
--- a/BaseTools/Source/C/Common/BinderFuncs.h
+++ b/BaseTools/Source/C/Common/BinderFuncs.h
@@ -1,7 +1,7 @@
 /** @file

 

-Copyright (c) 1999 - 2008, Intel Corporation

-All rights reserved. This program and the accompanying materials

+Copyright (c) 1999 - 2008, Intel Corporation. All rights reserved.<BR>

+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

diff --git a/BaseTools/Source/C/Common/CommonLib.c b/BaseTools/Source/C/Common/CommonLib.c
index a0c6603a85..cb72e2723f 100644
--- a/BaseTools/Source/C/Common/CommonLib.c
+++ b/BaseTools/Source/C/Common/CommonLib.c
@@ -1,7 +1,7 @@
 /** @file

 

-Copyright (c) 2004 - 2008, Intel Corporation                                                         

-All rights reserved. This program and the accompanying materials                          

+Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>

+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                                            

diff --git a/BaseTools/Source/C/Common/CommonLib.h b/BaseTools/Source/C/Common/CommonLib.h
index 7e4af036e5..f407e6d1e9 100644
--- a/BaseTools/Source/C/Common/CommonLib.h
+++ b/BaseTools/Source/C/Common/CommonLib.h
@@ -1,7 +1,7 @@
 /** @file

 

-Copyright (c) 2004 - 2008, Intel Corporation

-All rights reserved. This program and the accompanying materials

+Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>

+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

diff --git a/BaseTools/Source/C/Common/Compress.h b/BaseTools/Source/C/Common/Compress.h
index 10d0c72a16..11245b1178 100644
--- a/BaseTools/Source/C/Common/Compress.h
+++ b/BaseTools/Source/C/Common/Compress.h
@@ -1,7 +1,7 @@
 /** @file

 

-Copyright (c) 2004 - 2008, Intel Corporation                                              

-All rights reserved. This program and the accompanying materials                          

+Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>

+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                                            

diff --git a/BaseTools/Source/C/Common/Crc32.c b/BaseTools/Source/C/Common/Crc32.c
index f52b51453a..8e5915dd0e 100644
--- a/BaseTools/Source/C/Common/Crc32.c
+++ b/BaseTools/Source/C/Common/Crc32.c
@@ -1,7 +1,7 @@
 /** @file

 

-Copyright (c) 2004, Intel Corporation                                                         

-All rights reserved. This program and the accompanying materials                          

+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>

+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                                            

diff --git a/BaseTools/Source/C/Common/Crc32.h b/BaseTools/Source/C/Common/Crc32.h
index e598a916a0..760327f99c 100644
--- a/BaseTools/Source/C/Common/Crc32.h
+++ b/BaseTools/Source/C/Common/Crc32.h
@@ -1,7 +1,7 @@
 /** @file

 

-Copyright (c) 2004 - 2008, Intel Corporation                                                         

-All rights reserved. This program and the accompanying materials                          

+Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>

+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                                            

diff --git a/BaseTools/Source/C/Common/Decompress.c b/BaseTools/Source/C/Common/Decompress.c
index 8ccb21f211..a12fc595a7 100644
--- a/BaseTools/Source/C/Common/Decompress.c
+++ b/BaseTools/Source/C/Common/Decompress.c
@@ -1,7 +1,7 @@
 /** @file

 

-Copyright (c) 2004 - 2008, Intel Corporation

-All rights reserved. This program and the accompanying materials

+Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>

+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

diff --git a/BaseTools/Source/C/Common/Decompress.h b/BaseTools/Source/C/Common/Decompress.h
index 3d5c0cd54d..b5c978855c 100644
--- a/BaseTools/Source/C/Common/Decompress.h
+++ b/BaseTools/Source/C/Common/Decompress.h
@@ -1,7 +1,7 @@
 /** @file

 

-Copyright (c) 2006 - 2008, Intel Corporation                                                         

-All rights reserved. This program and the accompanying materials                          

+Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>

+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                                            

diff --git a/BaseTools/Source/C/Common/EfiCompress.c b/BaseTools/Source/C/Common/EfiCompress.c
index aafa9c6e24..ed491ae36d 100644
--- a/BaseTools/Source/C/Common/EfiCompress.c
+++ b/BaseTools/Source/C/Common/EfiCompress.c
@@ -1,7 +1,7 @@
 /** @file

 

-Copyright (c) 2006 - 2008, Intel Corporation                                              

-All rights reserved. This program and the accompanying materials                          

+Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>

+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                                            

diff --git a/BaseTools/Source/C/Common/EfiUtilityMsgs.c b/BaseTools/Source/C/Common/EfiUtilityMsgs.c
index 0e7608d1cf..dc9b0ffaa2 100644
--- a/BaseTools/Source/C/Common/EfiUtilityMsgs.c
+++ b/BaseTools/Source/C/Common/EfiUtilityMsgs.c
@@ -1,7 +1,7 @@
 /** @file

 

-Copyright (c) 2004 - 2008, Intel Corporation

-All rights reserved. This program and the accompanying materials

+Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>

+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

diff --git a/BaseTools/Source/C/Common/EfiUtilityMsgs.h b/BaseTools/Source/C/Common/EfiUtilityMsgs.h
index 8986a592d7..35cb1802fe 100644
--- a/BaseTools/Source/C/Common/EfiUtilityMsgs.h
+++ b/BaseTools/Source/C/Common/EfiUtilityMsgs.h
@@ -1,7 +1,7 @@
 /** @file

 

-Copyright (c) 2004 - 2008, Intel Corporation                                                         

-All rights reserved. This program and the accompanying materials                          

+Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>

+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                                            

diff --git a/BaseTools/Source/C/Common/FirmwareVolumeBuffer.c b/BaseTools/Source/C/Common/FirmwareVolumeBuffer.c
index 2d3b1353cb..c8586b4078 100644
--- a/BaseTools/Source/C/Common/FirmwareVolumeBuffer.c
+++ b/BaseTools/Source/C/Common/FirmwareVolumeBuffer.c
@@ -1,7 +1,7 @@
 /** @file

 

-Copyright (c) 1999 - 2008, Intel Corporation

-All rights reserved. This program and the accompanying materials

+Copyright (c) 1999 - 2008, Intel Corporation. All rights reserved.<BR>

+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

diff --git a/BaseTools/Source/C/Common/FirmwareVolumeBufferLib.h b/BaseTools/Source/C/Common/FirmwareVolumeBufferLib.h
index 5a52695a7f..12c64f6172 100644
--- a/BaseTools/Source/C/Common/FirmwareVolumeBufferLib.h
+++ b/BaseTools/Source/C/Common/FirmwareVolumeBufferLib.h
@@ -1,7 +1,7 @@
 /** @file

 

-Copyright (c) 1999 - 2008, Intel Corporation

-All rights reserved. This program and the accompanying materials

+Copyright (c) 1999 - 2008, Intel Corporation. All rights reserved.<BR>

+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

diff --git a/BaseTools/Source/C/Common/FvLib.c b/BaseTools/Source/C/Common/FvLib.c
index a6f17e17a8..1b289d83cd 100644
--- a/BaseTools/Source/C/Common/FvLib.c
+++ b/BaseTools/Source/C/Common/FvLib.c
@@ -1,7 +1,7 @@
 /** @file

 

-Copyright (c) 2004 - 2008, Intel Corporation                                                         

-All rights reserved. This program and the accompanying materials                          

+Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>

+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                                            

diff --git a/BaseTools/Source/C/Common/FvLib.h b/BaseTools/Source/C/Common/FvLib.h
index 43d3737f68..7815baae3f 100644
--- a/BaseTools/Source/C/Common/FvLib.h
+++ b/BaseTools/Source/C/Common/FvLib.h
@@ -1,7 +1,7 @@
 /** @file

 

-Copyright (c) 2004 - 2008, Intel Corporation                                                         

-All rights reserved. This program and the accompanying materials                          

+Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>

+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                                            

diff --git a/BaseTools/Source/C/Common/GNUmakefile b/BaseTools/Source/C/Common/GNUmakefile
index 172802d7ed..1aade7f7b8 100644
--- a/BaseTools/Source/C/Common/GNUmakefile
+++ b/BaseTools/Source/C/Common/GNUmakefile
@@ -1,8 +1,8 @@
 ## @file

 # Windows makefile for 'Common' module build.

 #

-# Copyright (c) 2007 - 2010, Intel Corporation<BR>

-# All rights reserved. This program and the accompanying materials

+# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>

+# 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

diff --git a/BaseTools/Source/C/Common/Makefile b/BaseTools/Source/C/Common/Makefile
index 017c5a63d7..41119b11ab 100644
--- a/BaseTools/Source/C/Common/Makefile
+++ b/BaseTools/Source/C/Common/Makefile
@@ -1,8 +1,8 @@
 ## @file

 # Windows makefile for 'Common' module build.

 #

-# Copyright (c) 2007 - 2010, Intel Corporation<BR>

-# All rights reserved. This program and the accompanying materials

+# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>

+# 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

diff --git a/BaseTools/Source/C/Common/MemoryFile.c b/BaseTools/Source/C/Common/MemoryFile.c
index cace6282ac..a93a505788 100644
--- a/BaseTools/Source/C/Common/MemoryFile.c
+++ b/BaseTools/Source/C/Common/MemoryFile.c
@@ -1,7 +1,7 @@
 /** @file

 

-Copyright (c) 2004 - 2008, Intel Corporation                                                         

-All rights reserved. This program and the accompanying materials                          

+Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>

+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                                            

diff --git a/BaseTools/Source/C/Common/MemoryFile.h b/BaseTools/Source/C/Common/MemoryFile.h
index 9148d9d06c..baab40baa2 100644
--- a/BaseTools/Source/C/Common/MemoryFile.h
+++ b/BaseTools/Source/C/Common/MemoryFile.h
@@ -1,7 +1,7 @@
 /** @file

 

-Copyright (c) 2004 - 2008, Intel Corporation                                                         

-All rights reserved. This program and the accompanying materials                          

+Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>

+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                                            

diff --git a/BaseTools/Source/C/Common/MyAlloc.c b/BaseTools/Source/C/Common/MyAlloc.c
index 64c5ff783e..7b0493aaa0 100644
--- a/BaseTools/Source/C/Common/MyAlloc.c
+++ b/BaseTools/Source/C/Common/MyAlloc.c
@@ -1,7 +1,7 @@
 /** @file

 

-Copyright (c) 2004 - 2008, Intel Corporation                                                         

-All rights reserved. This program and the accompanying materials                          

+Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>

+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                                            

diff --git a/BaseTools/Source/C/Common/MyAlloc.h b/BaseTools/Source/C/Common/MyAlloc.h
index 9dbe91cd41..217beb1484 100644
--- a/BaseTools/Source/C/Common/MyAlloc.h
+++ b/BaseTools/Source/C/Common/MyAlloc.h
@@ -1,7 +1,7 @@
 /** @file

 

-Copyright (c) 2004 - 2008, Intel Corporation                                                         

-All rights reserved. This program and the accompanying materials                          

+Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>

+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                                            

diff --git a/BaseTools/Source/C/Common/OsPath.c b/BaseTools/Source/C/Common/OsPath.c
index 088730689d..419c8f8b8c 100644
--- a/BaseTools/Source/C/Common/OsPath.c
+++ b/BaseTools/Source/C/Common/OsPath.c
@@ -1,7 +1,7 @@
 /** @file

 

-Copyright (c) 2007 - 2008, Intel Corporation                                                         

-All rights reserved. This program and the accompanying materials                          

+Copyright (c) 2007 - 2008, Intel Corporation. All rights reserved.<BR>

+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                                            

diff --git a/BaseTools/Source/C/Common/OsPath.h b/BaseTools/Source/C/Common/OsPath.h
index 0386dfa50d..9e7df070c5 100644
--- a/BaseTools/Source/C/Common/OsPath.h
+++ b/BaseTools/Source/C/Common/OsPath.h
@@ -1,7 +1,7 @@
 /** @file

 

-Copyright (c) 2007 - 2008, Intel Corporation                                                         

-All rights reserved. This program and the accompanying materials                          

+Copyright (c) 2007 - 2008, Intel Corporation. All rights reserved.<BR>

+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                                            

diff --git a/BaseTools/Source/C/Common/ParseGuidedSectionTools.c b/BaseTools/Source/C/Common/ParseGuidedSectionTools.c
index b643cdeb4f..8ddfd00b7e 100644
--- a/BaseTools/Source/C/Common/ParseGuidedSectionTools.c
+++ b/BaseTools/Source/C/Common/ParseGuidedSectionTools.c
@@ -1,7 +1,7 @@
 /** @file

 

-Copyright (c) 2007 - 2008, Intel Corporation                                                         

-All rights reserved. This program and the accompanying materials                          

+Copyright (c) 2007 - 2008, Intel Corporation. All rights reserved.<BR>

+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                                            

diff --git a/BaseTools/Source/C/Common/ParseGuidedSectionTools.h b/BaseTools/Source/C/Common/ParseGuidedSectionTools.h
index d30afff1cc..b4c55974e3 100644
--- a/BaseTools/Source/C/Common/ParseGuidedSectionTools.h
+++ b/BaseTools/Source/C/Common/ParseGuidedSectionTools.h
@@ -1,7 +1,7 @@
 /** @file

 

-Copyright (c) 2007 - 2008, Intel Corporation                                                         

-All rights reserved. This program and the accompanying materials                          

+Copyright (c) 2007 - 2008, Intel Corporation. All rights reserved.<BR>

+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                                            

diff --git a/BaseTools/Source/C/Common/ParseInf.c b/BaseTools/Source/C/Common/ParseInf.c
index 2ce25be86f..eb01d30527 100644
--- a/BaseTools/Source/C/Common/ParseInf.c
+++ b/BaseTools/Source/C/Common/ParseInf.c
@@ -1,7 +1,7 @@
 /** @file

 

-Copyright (c) 2004 - 2010, Intel Corporation                                                         

-All rights reserved. This program and the accompanying materials                          

+Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>

+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                                            

diff --git a/BaseTools/Source/C/Common/ParseInf.h b/BaseTools/Source/C/Common/ParseInf.h
index af532b8a18..88ded8760e 100644
--- a/BaseTools/Source/C/Common/ParseInf.h
+++ b/BaseTools/Source/C/Common/ParseInf.h
@@ -1,7 +1,7 @@
 /** @file

 

-Copyright (c) 2004 - 2008, Intel Corporation                                                         

-All rights reserved. This program and the accompanying materials                          

+Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>

+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                                            

diff --git a/BaseTools/Source/C/Common/PeCoffLib.h b/BaseTools/Source/C/Common/PeCoffLib.h
index 077a66c5d7..31c6f0fca1 100644
--- a/BaseTools/Source/C/Common/PeCoffLib.h
+++ b/BaseTools/Source/C/Common/PeCoffLib.h
@@ -1,8 +1,8 @@
 /** @file

 	Function prototypes and defines on Memory Only PE COFF loader

 

-	Copyright (c) 2006, Intel Corporation                                                         

-	All rights reserved. This program and the accompanying materials                          

+	Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>

+  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                                            

@@ -144,4 +144,38 @@ PeCoffLoaderGetEntryPoint (
   )

 ;

 

+//

+// These functions are used by the ARM PE/COFF relocation code and by

+// the ELF to PE/COFF converter so that is why they are public

+//

+

+/**

+  Pass in a pointer to an ARM MOVT or MOVW immediate instruciton and 

+  return the immediate data encoded in the instruction

+

+  @param  Instruction   Pointer to ARM MOVT or MOVW immediate instruction

+

+  @return Immediate address encoded in the instruction

+

+**/

+UINT16

+ThumbMovtImmediateAddress (

+  IN UINT16 *Instruction

+  );

+

+/**

+  Update an ARM MOVT or MOVW immediate instruction immediate data.

+

+  @param  Instruction   Pointer to ARM MOVT or MOVW immediate instruction

+  @param  Address       New addres to patch into the instruction

+

+**/

+VOID

+ThumbMovtImmediatePatch (

+  IN OUT UINT16 *Instruction,

+  IN     UINT16 Address

+  );

+

+

+

 #endif

diff --git a/BaseTools/Source/C/Common/PeCoffLoaderEx.c b/BaseTools/Source/C/Common/PeCoffLoaderEx.c
index fedc0941cb..5d827cefe4 100644
--- a/BaseTools/Source/C/Common/PeCoffLoaderEx.c
+++ b/BaseTools/Source/C/Common/PeCoffLoaderEx.c
@@ -1,7 +1,7 @@
 /** @file

 

-Copyright (c) 2004 - 2008, Intel Corporation                                                         

-All rights reserved. This program and the accompanying materials                          

+Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>

+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                                            

@@ -315,3 +315,121 @@ PeCoffLoaderRelocateX64Image (
   return RETURN_SUCCESS;

 }

 

+/**

+  Pass in a pointer to an ARM MOVT or MOVW immediate instruciton and 

+  return the immediate data encoded in the instruction

+

+  @param  Instruction   Pointer to ARM MOVT or MOVW immediate instruction

+

+  @return Immediate address encoded in the instruction

+

+**/

+UINT16

+ThumbMovtImmediateAddress (

+  IN UINT16 *Instruction

+  )

+{

+  UINT32  Movt;

+  UINT16  Address;

+

+  // Thumb2 is two 16-bit instructions working together. Not a single 32-bit instruction

+  // Example MOVT R0, #0 is 0x0000f2c0 or 0xf2c0 0x0000

+  Movt = (*Instruction << 16) | (*(Instruction + 1)); 

+

+  // imm16 = imm4:i:imm3:imm8

+  //         imm4 -> Bit19:Bit16

+  //         i    -> Bit26

+  //         imm3 -> Bit14:Bit12

+  //         imm8 -> Bit7:Bit0

+  Address  = (UINT16)(Movt & 0x000000ff);          // imm8

+  Address |= (UINT16)((Movt >> 4) &  0x0000f700);  // imm4 imm3

+  Address |= (((Movt & BIT26) != 0) ? BIT11 : 0);  // i

+  return Address;

+}

+

+

+/**

+  Update an ARM MOVT or MOVW immediate instruction immediate data.

+

+  @param  Instruction   Pointer to ARM MOVT or MOVW immediate instruction

+  @param  Address       New addres to patch into the instruction

+**/

+VOID

+ThumbMovtImmediatePatch (

+  IN OUT UINT16 *Instruction,

+  IN     UINT16 Address

+  )

+{

+  UINT16  Patch;

+

+  // First 16-bit chunk of instruciton

+  Patch  = ((Address >> 12) & 0x000f);             // imm4 

+  Patch |= (((Address & BIT11) != 0) ? BIT10 : 0); // i

+  *Instruction = (*Instruction & ~0x040f) | Patch;

+

+  // Second 16-bit chunk of instruction

+  Patch  =  Address & 0x000000ff;          // imm8

+  Patch |=  ((Address << 4) & 0x00007000); // imm3

+  Instruction++;

+  *Instruction = (*Instruction & ~0x70ff) | Patch;

+}

+

+/**

+  Performs an ARM-based specific relocation fixup and is a no-op on other

+  instruction sets.

+

+  @param  Reloc       Pointer to the relocation record.

+  @param  Fixup       Pointer to the address to fix up.

+  @param  FixupData   Pointer to a buffer to log the fixups.

+  @param  Adjust      The offset to adjust the fixup.

+

+  @return Status code.

+

+**/

+RETURN_STATUS

+PeCoffLoaderRelocateArmImage (

+  IN UINT16      **Reloc,

+  IN OUT CHAR8   *Fixup,

+  IN OUT CHAR8   **FixupData,

+  IN UINT64      Adjust

+  )

+{

+  UINT16      *Fixup16;

+  UINT16      FixupVal;

+  UINT16      *Addend;

+

+  Fixup16    = (UINT16 *) Fixup;

+

+  switch ((**Reloc) >> 12) {

+  case EFI_IMAGE_REL_BASED_ARM_THUMB_MOVW:

+    FixupVal = ThumbMovtImmediateAddress (Fixup16) + (UINT16)Adjust;

+    ThumbMovtImmediatePatch (Fixup16, FixupVal);

+

+    if (*FixupData != NULL) {

+      *FixupData             = ALIGN_POINTER (*FixupData, sizeof (UINT16));

+      *(UINT16 *)*FixupData  = *Fixup16;

+      *FixupData             = *FixupData + sizeof (UINT16);

+    }

+    break;

+

+  case EFI_IMAGE_REL_BASED_ARM_THUMB_MOVT:

+    // For MOVT you need to know the lower 16-bits do do the math

+    // So this relocation entry is really two entries.

+    *Reloc = *Reloc + 1;

+    Addend = *Reloc; 

+    FixupVal = (UINT16)(((ThumbMovtImmediateAddress (Fixup16) << 16) + Adjust + *Addend) >> 16);

+    ThumbMovtImmediatePatch (Fixup16, FixupVal);

+

+    if (*FixupData != NULL) {

+      *FixupData             = ALIGN_POINTER (*FixupData, sizeof (UINT16));

+      *(UINT16 *)*FixupData  = *Fixup16;

+      *FixupData             = *FixupData + sizeof (UINT16);

+    }

+    break;

+  

+  default:

+    return RETURN_UNSUPPORTED;

+  }

+

+  return RETURN_SUCCESS;

+}

diff --git a/BaseTools/Source/C/Common/SimpleFileParsing.c b/BaseTools/Source/C/Common/SimpleFileParsing.c
index 68cdc630c1..0f6151819c 100644
--- a/BaseTools/Source/C/Common/SimpleFileParsing.c
+++ b/BaseTools/Source/C/Common/SimpleFileParsing.c
@@ -1,7 +1,7 @@
 /** @file

 

-Copyright (c) 2004 - 2008, Intel Corporation                                                         

-All rights reserved. This program and the accompanying materials                          

+Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>

+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                                            

diff --git a/BaseTools/Source/C/Common/SimpleFileParsing.h b/BaseTools/Source/C/Common/SimpleFileParsing.h
index 7b33727d68..d871eb7fe3 100644
--- a/BaseTools/Source/C/Common/SimpleFileParsing.h
+++ b/BaseTools/Source/C/Common/SimpleFileParsing.h
@@ -1,7 +1,7 @@
 /** @file

 

-Copyright (c) 2004 - 2008, Intel Corporation                                                         

-All rights reserved. This program and the accompanying materials                          

+Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>

+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                                            

diff --git a/BaseTools/Source/C/Common/StringFuncs.c b/BaseTools/Source/C/Common/StringFuncs.c
index f65ba96661..bccb0b2d34 100644
--- a/BaseTools/Source/C/Common/StringFuncs.c
+++ b/BaseTools/Source/C/Common/StringFuncs.c
@@ -1,7 +1,7 @@
 /** @file

 

-Copyright (c) 2007 - 2008, Intel Corporation                                                         

-All rights reserved. This program and the accompanying materials                          

+Copyright (c) 2007 - 2008, Intel Corporation. All rights reserved.<BR>

+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                                            

diff --git a/BaseTools/Source/C/Common/StringFuncs.h b/BaseTools/Source/C/Common/StringFuncs.h
index cf18460c4c..2c764115e5 100644
--- a/BaseTools/Source/C/Common/StringFuncs.h
+++ b/BaseTools/Source/C/Common/StringFuncs.h
@@ -1,7 +1,7 @@
 /**

 

-Copyright (c) 2007 - 2008, Intel Corporation                                                         

-All rights reserved. This program and the accompanying materials                          

+Copyright (c) 2007 - 2008, Intel Corporation. All rights reserved.<BR>

+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                                            

diff --git a/BaseTools/Source/C/Common/TianoCompress.c b/BaseTools/Source/C/Common/TianoCompress.c
index 625f99eaca..a34f1d2a7d 100644
--- a/BaseTools/Source/C/Common/TianoCompress.c
+++ b/BaseTools/Source/C/Common/TianoCompress.c
@@ -1,7 +1,7 @@
 /** @file

 

-Copyright (c) 2006 - 2008, Intel Corporation                                              

-All rights reserved. This program and the accompanying materials                          

+Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>

+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                                            

diff --git a/BaseTools/Source/C/Common/WinNtInclude.h b/BaseTools/Source/C/Common/WinNtInclude.h
index 96c17993a1..bd33e3dd2a 100644
--- a/BaseTools/Source/C/Common/WinNtInclude.h
+++ b/BaseTools/Source/C/Common/WinNtInclude.h
@@ -1,7 +1,7 @@
 /** @file

 

-Copyright (c) 2006 - 2008, Intel Corporation

-All rights reserved. This program and the accompanying materials

+Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>

+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