Patch ARM BaseToolslinaro-uefi-2011.12

3 files changed, 22 insertions, 35 deletions

diff --git a/edk2/BaseTools/Conf/tools_def.template b/edk2/BaseTools/Conf/tools_def.template
index ee7e23eee..68caf86fe 100644
--- a/edk2/BaseTools/Conf/tools_def.template
+++ b/edk2/BaseTools/Conf/tools_def.template
@@ -4320,7 +4320,7 @@ RELEASE_ARMLINUXGCC_ARM_ASM_FLAGS   = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) -mlittl
 *_ARMLINUXGCC_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h

 

 *_ARMLINUXGCC_ARM_SLINK_FLAGS =  -rc

-*_ARMLINUXGCC_ARM_DLINK_FLAGS =  $(ARCHDLINK_FLAGS)  --oformat=elf32-littlearm --emit-relocs -nostdlib -u $(IMAGE_ENTRY_POINT) -e $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map

+*_ARMLINUXGCC_ARM_DLINK_FLAGS =  $(ARCHDLINK_FLAGS) -Ttext=0x0 --oformat=elf32-littlearm --emit-relocs -nostdlib -u $(IMAGE_ENTRY_POINT) -e $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map

 

   DEBUG_ARMLINUXGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -Wno-address -O0

 RELEASE_ARMLINUXGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -Wno-address -Wno-unused-but-set-variable

diff --git a/edk2/BaseTools/Source/C/GenFv/GenFv.c b/edk2/BaseTools/Source/C/GenFv/GenFv.c
index fa86d009d..27bd2afc7 100644
--- a/edk2/BaseTools/Source/C/GenFv/GenFv.c
+++ b/edk2/BaseTools/Source/C/GenFv/GenFv.c
@@ -623,12 +623,7 @@ Returns:
               );

   } else {

     VerboseMsg ("Create Fv image and its map file");

-    //

-    // Will take rebase action at below situation:

-    // 1. ForceRebase Flag specified to TRUE;

-    // 2. ForceRebase Flag not specified, BaseAddress greater than zero.

-    //

-    if (((mFvDataInfo.BaseAddress > 0) && (mFvDataInfo.ForceRebase == -1)) || (mFvDataInfo.ForceRebase == 1)) {

+    if (mFvDataInfo.BaseAddressSet) {

       VerboseMsg ("FvImage Rebase Address is 0x%llX", (unsigned long long) mFvDataInfo.BaseAddress);

     }

     //

diff --git a/edk2/BaseTools/Source/C/GenFv/GenFvInternalLib.c b/edk2/BaseTools/Source/C/GenFv/GenFvInternalLib.c
index c01e504cb..90512a443 100644
--- a/edk2/BaseTools/Source/C/GenFv/GenFvInternalLib.c
+++ b/edk2/BaseTools/Source/C/GenFv/GenFvInternalLib.c
@@ -506,6 +506,7 @@ Returns:
 

 EFI_STATUS

 AddPadFile (

+  IN FV_INFO          *FvInfo,

   IN OUT MEMORY_FILE  *FvImage,

   IN UINT32           DataAlignment,

   IN VOID             *FvEnd,

@@ -537,6 +538,8 @@ Returns:
 {

   EFI_FFS_FILE_HEADER *PadFile;

   UINTN               PadFileSize;

+  UINTN               PadFileOffset;

+  UINTN               ExtHeaderSize;

 

   //

   // Verify input parameters.

@@ -559,32 +562,29 @@ Returns:
   // This is the earliest possible valid offset (current plus pad file header

   // plus the next file header)

   //

-  PadFileSize = (UINTN) FvImage->CurrentFilePointer - (UINTN) FvImage->FileImage + (sizeof (EFI_FFS_FILE_HEADER) * 2);

+  // The padding is added into its own FFS file (which requires a header) added before the aligned file:

+  // | ... FV data before AlignedFile ... | Pad File FFS Header | Padding | AlignedFile FFS Header (+ ExtHeader) | AlignedData

 

   //

-  // Add whatever it takes to get to the next aligned address

+  // Calculate the Offset of the Pad File from the beginning of the FV file

   //

-  while ((PadFileSize % DataAlignment) != 0) {

-    PadFileSize++;

-  }

-  //

-  // Subtract the next file header size

-  //

-  PadFileSize -= sizeof (EFI_FFS_FILE_HEADER);

-

-  //

-  // Subtract the starting offset to get size

-  //

-  PadFileSize -= (UINTN) FvImage->CurrentFilePointer - (UINTN) FvImage->FileImage;

+  PadFileOffset = (UINTN) FvImage->CurrentFilePointer - (UINTN) FvImage->FileImage;

   

   //

-  // Append extension header size

+  // Get the size of the extension header if exists

   //

   if (ExtHeader != NULL) {

-    PadFileSize = PadFileSize + ExtHeader->ExtHeaderSize;

+    ExtHeaderSize = ExtHeader->ExtHeaderSize;

+  } else {

+    ExtHeaderSize = 0;

   }

 

   //

+  // Calculate the Size of the Padding to ensure the alignment of the data of the Next file

+  //

+  PadFileSize = DataAlignment - ((FvInfo->BaseAddress + PadFileOffset + sizeof (EFI_FFS_FILE_HEADER) + ExtHeaderSize) & (DataAlignment - 1));

+

+  //

   // Verify that we have enough space for the file header

   //

   if (((UINTN) FvImage->CurrentFilePointer + PadFileSize) > (UINTN) FvEnd) {

@@ -1115,7 +1115,7 @@ Returns:
   //

   // Add pad file if necessary

   //

-  Status = AddPadFile (FvImage, 1 << CurrentFileAlignment, *VtfFileImage, NULL);

+  Status = AddPadFile (FvInfo, FvImage, 1 << CurrentFileAlignment, *VtfFileImage, NULL);

   if (EFI_ERROR (Status)) {

     Error (NULL, 0, 4002, "Resource", "FV space is full, could not add pad file for data alignment property.");

     free (FileBuffer);

@@ -2304,7 +2304,7 @@ Returns:
     //

     // Add FV Extended Header contents to the FV as a PAD file

     //

-    AddPadFile (&FvImageMemoryFile, 4, VtfFileImage, FvExtHeader);

+    AddPadFile (&mFvDataInfo, &FvImageMemoryFile, 4, VtfFileImage, FvExtHeader);

 

     //

     // Fv Extension header change update Fv Header Check sum

@@ -2825,20 +2825,12 @@ Returns:
   PeFileBuffer       = NULL;

 

   //

-  // Don't need to relocate image when BaseAddress is zero and no ForceRebase Flag specified.

-  //

-  if ((FvInfo->BaseAddress == 0) && (FvInfo->ForceRebase == -1)) {

-    return EFI_SUCCESS;

-  }

-  

-  //

-  // If ForceRebase Flag specified to FALSE, will always not take rebase action.

+  // Don't need to relocate image when BaseAddress is not set.

   //

-  if (FvInfo->ForceRebase == 0) {

+  if (FvInfo->BaseAddressSet == FALSE) {

     return EFI_SUCCESS;

   }

 

-

   XipBase = FvInfo->BaseAddress + XipOffset;

 

   //