-Index: BaseTools/Conf/build_rule.template
-===================================================================
---- BaseTools/Conf/build_rule.template (revision 12691)
-+++ BaseTools/Conf/build_rule.template (working copy)
-@@ -129,7 +129,7 @@
- "$(CC)" $(CC_FLAGS) -o ${dst} $(INC) ${src}\r
- "$(SYMRENAME)" $(SYMRENAME_FLAGS) ${dst}\r
- \r
-- <Command.ARMGCC>\r
-+ <Command.ARMGCC, Command.ARMLINUXGCC>\r
- "$(CC)" $(CC_FLAGS) -o ${dst} $(INC) ${src}\r
- \r
- \r
-@@ -217,7 +217,7 @@
- <Command.RVCT>\r
- "$(SLINK)" $(SLINK_FLAGS) ${dst} --via $(OBJECT_FILES_LIST)\r
- \r
-- <Command.RVCTCYGWIN, Command.ARMGCC>\r
-+ <Command.RVCTCYGWIN, Command.ARMGCC, Command.ARMLINUXGCC>\r
- # $(OBJECT_FILES_LIST) has wrong paths for cygwin\r
- "$(SLINK)" $(SLINK_FLAGS) ${dst} $(OBJECT_FILES)\r
- \r
-@@ -241,7 +241,7 @@
- "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -\( $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST) -\) $(DLINK2_FLAGS)\r
- "$(OBJCOPY)" $(OBJCOPY_FLAGS) ${dst}\r
- \r
-- <Command.ARMGCC>\r
-+ <Command.ARMGCC, Command.ARMLINUXGCC>\r
- "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -\( $(DLINK_SPATH) $(STATIC_LIBRARY_FILES) -\) $(DLINK2_FLAGS)\r
- \r
- <Command.RVCT>\r
-@@ -271,7 +271,7 @@
- <Command.GCC>\r
- "$(DLINK)" $(DLINK_FLAGS) -\( $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST) -\) $(DLINK2_FLAGS)\r
- \r
-- <Command.ARMGCC>\r
-+ <Command.ARMGCC, Command.ARMLINUXGCC>\r
- "$(DLINK)" $(DLINK_FLAGS) -\( $(DLINK_SPATH) $(STATIC_LIBRARY_FILES) -\) $(DLINK2_FLAGS)\r
- \r
- <Command.RVCT>\r
-@@ -292,7 +292,7 @@
- <OutputFile>\r
- $(DEBUG_DIR)(+)$(MODULE_NAME).efi\r
- \r
-- <Command.MSFT, Command.INTEL, Command.RVCT, Command.ARMGCC> \r
-+ <Command.MSFT, Command.INTEL, Command.RVCT, Command.ARMGCC, Command.ARMLINUXGCC> \r
- "$(GENFW)" -e $(MODULE_TYPE) -o ${dst} ${src} $(GENFW_FLAGS)\r
- $(CP) ${dst} $(OUTPUT_DIR)\r
- $(CP) ${dst} $(BIN_DIR)\r
-@@ -536,7 +536,7 @@
- "$(GENFW)" -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUID) --hiibinpackage $(HII_BINARY_PACKAGES) $(GENFW_FLAGS)\r
- "$(RC)" $(RC_FLAGS) $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc ${dst}\r
- \r
-- <Command.XCODE, Command.RVCT, Command.ARMGCC> \r
-+ <Command.XCODE, Command.RVCT, Command.ARMGCC, Command.ARMLINUXGCC> \r
- GenFw -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUID) --hiibinpackage $(HII_BINARY_PACKAGES)\r
- \r
- \r
-Index: BaseTools/Conf/tools_def.template
-===================================================================
---- BaseTools/Conf/tools_def.template (revision 12691)
-+++ BaseTools/Conf/tools_def.template (working copy)
-@@ -467,6 +467,7 @@
- # MSFT - Microsoft\r
- # GCC - GNU GCC\r
- # INTEL - INTEL\r
-+# RVCT - ARM RealView Toolchain\r
- ####################################################################################\r
- ####################################################################################\r
- #\r
-@@ -4173,11 +4174,69 @@
- *_ARMGCC_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h\r
- \r
- *_ARMGCC_ARM_SLINK_FLAGS = -rc\r
--*_ARMGCC_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\r
-+*_ARMGCC_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\r
- \r
- DEBUG_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -combine -O0\r
- RELEASE_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -combine -Wno-unused\r
- \r
-+####################################################################################\r
-+#\r
-+# ARM GNU/Linux GCC\r
-+#\r
-+####################################################################################\r
-+# ARMLINUXGCC - ARM version of the GCC cross compiler\r
-+\r
-+*_ARMLINUXGCC_*_*_FAMILY = GCC\r
-+*_ARMLINUXGCC_*_*_BUILDRULEFAMILY = ARMLINUXGCC\r
-+\r
-+*_ARMLINUXGCC_*_MAKE_PATH = make\r
-+*_ARMLINUXGCC_*_MAKE_FLAGS = --no-print-directory\r
-+\r
-+##################\r
-+# ASL definitions\r
-+##################\r
-+*_ARMLINUXGCC_*_ASL_PATH = DEF(UNIX_IASL_BIN)\r
-+*_ARMLINUXGCC_*_ASL_FLAGS = DEF(IASL_FLAGS)\r
-+*_ARMLINUXGCC_*_ASL_OUTFLAGS = DEF(IASL_OUTFLAGS)\r
-+*_ARMLINUXGCC_*_ASLPP_FLAGS = -x c -E -P\r
-+*_ARMLINUXGCC_*_ASLCC_FLAGS = -x c\r
-+*_ARMLINUXGCC_*_ASLDLINK_FLAGS = DEF(GCC_DLINK_FLAGS_COMMON) --entry _ReferenceAcpiTable\r
-+\r
-+##################\r
-+# ARM definitions\r
-+##################\r
-+\r
-+*_ARMLINUXGCC_ARM_ASLCC_PATH = ENV(ARMLINUXGCC_TOOLS_PATH)arm-linux-gnueabi-gcc\r
-+*_ARMLINUXGCC_ARM_ASLDLINK_PATH = ENV(ARMLINUXGCC_TOOLS_PATH)arm-linux-gnueabi-ld\r
-+*_ARMLINUXGCC_ARM_ASLPP_PATH = ENV(ARMLINUXGCC_TOOLS_PATH)arm-linux-gnueabi-gcc\r
-+\r
-+*_ARMLINUXGCC_ARM_CC_PATH = ENV(ARMLINUXGCC_TOOLS_PATH)arm-linux-gnueabi-gcc\r
-+*_ARMLINUXGCC_ARM_SLINK_PATH = ENV(ARMLINUXGCC_TOOLS_PATH)arm-linux-gnueabi-ar\r
-+*_ARMLINUXGCC_ARM_DLINK_PATH = ENV(ARMLINUXGCC_TOOLS_PATH)arm-linux-gnueabi-ld\r
-+*_ARMLINUXGCC_ARM_ASM_PATH = ENV(ARMLINUXGCC_TOOLS_PATH)arm-linux-gnueabi-as\r
-+*_ARMLINUXGCC_ARM_PP_PATH = ENV(ARMLINUXGCC_TOOLS_PATH)arm-linux-gnueabi-gcc\r
-+*_ARMLINUXGCC_ARM_VFRPP_PATH = ENV(ARMLINUXGCC_TOOLS_PATH)arm-linux-gnueabi-gcc\r
-+\r
-+#\r
-+# Use default values, or override in DSC file\r
-+#\r
-+*_ARMLINUXGCC_ARM_ARCHCC_FLAGS = -mthumb\r
-+*_ARMLINUXGCC_ARM_ARCHASM_FLAGS = \r
-+*_ARMLINUXGCC_ARM_ARCHDLINK_FLAGS =\r
-+*_ARMLINUXGCC_ARM_PLATFORM_FLAGS = -march=armv7-a\r
-+\r
-+ DEBUG_ARMLINUXGCC_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) -mlittle-endian -g\r
-+RELEASE_ARMLINUXGCC_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) -mlittle-endian\r
-+\r
-+*_ARMLINUXGCC_ARM_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h\r
-+*_ARMLINUXGCC_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h\r
-+\r
-+*_ARMLINUXGCC_ARM_SLINK_FLAGS = -rc\r
-+*_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\r
-+\r
-+ DEBUG_ARMLINUXGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -Wno-address -O0\r
-+RELEASE_ARMLINUXGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -Wno-address -Wno-unused-but-set-variable\r
-+\r
- #################\r
- # ASM 16 linker defintions\r
- #################\r
-Index: BaseTools/Source/Python/Workspace/MetaFileParser.py
-===================================================================
---- BaseTools/Source/Python/Workspace/MetaFileParser.py (revision 12691)
-+++ BaseTools/Source/Python/Workspace/MetaFileParser.py (working copy)
-@@ -1280,6 +1280,9 @@
- Records = IncludedFileTable.GetAll()
- if Records:
- self._Content[self._ContentIndex:self._ContentIndex] = Records
-+ self._Content.pop(self._ContentIndex-1)
-+ self._ValueList = None
-+ self._ContentIndex -= 1
+From 7686eed1a9ed96791cfa65ec5b2f5fdaca538e53 Mon Sep 17 00:00:00 2001
+From: Olivier Martin <olivier.martin@arm.com>
+Date: Tue, 11 Jun 2013 10:56:12 +0100
+Subject: [PATCH 3/8] BaseTools/GenFw: Set the PE/COFF attribute BaseOfCode with the address of the first '.text' section
+
+Before this change the alignment of the first code section was not taken into account.
+
+Change-Id: I6e6b07edb2f7e7179c9467b43857c44a8309cb68
+Contributed-under: TianoCore Contribution Agreement 1.0
+Signed-off-by: Olivier Martin <olivier.martin@arm.com>
+---
+ BaseTools/Source/C/GenFw/Elf32Convert.c | 20 +++++++++++++++++++-
+ BaseTools/Source/C/GenFw/Elf64Convert.c | 19 ++++++++++++++++++-
+ 2 files changed, 37 insertions(+), 2 deletions(-)
+ mode change 100644 => 100755 BaseTools/Source/C/GenFw/Elf32Convert.c
+ mode change 100644 => 100755 BaseTools/Source/C/GenFw/Elf64Convert.c
+
+diff --git a/BaseTools/Source/C/GenFw/Elf32Convert.c b/BaseTools/Source/C/GenFw/Elf32Convert.c
+old mode 100644
+new mode 100755
+index ddb45ac..58ac333
+--- a/BaseTools/Source/C/GenFw/Elf32Convert.c
++++ b/BaseTools/Source/C/GenFw/Elf32Convert.c
+@@ -1,6 +1,7 @@
+ /** @file
- def __ProcessSkuId(self):
- self._ValueList = [ReplaceMacro(Value, self._Macros, RaiseError=True)
-Index: BaseTools/Source/Python/Workspace/WorkspaceDatabase.py
-===================================================================
---- BaseTools/Source/Python/Workspace/WorkspaceDatabase.py (revision 12691)
-+++ BaseTools/Source/Python/Workspace/WorkspaceDatabase.py (working copy)
-@@ -2319,7 +2319,7 @@
- # @param GlobalMacros Global macros used for replacement during file parsing\r
- # @prarm RenewDb=False Create new database file if it's already there\r
- #\r
-- def __init__(self, DbPath, RenewDb=False):\r
-+ def __init__(self, DbPath, RenewDb=False, DbSignature={}):\r
- self._DbClosedFlag = False\r
- if not DbPath:\r
- DbPath = os.path.normpath(os.path.join(GlobalData.gWorkspace, self._DB_PATH_))\r
-@@ -2331,7 +2331,7 @@
- os.makedirs(DbDir)\r
- \r
- # remove db file in case inconsistency between db and file in file system\r
-- if self._CheckWhetherDbNeedRenew(RenewDb, DbPath):\r
-+ if self._CheckWhetherDbNeedRenew(RenewDb, DbPath, DbSignature):\r
- os.remove(DbPath)\r
- \r
- # create db with optimized parameters\r
-@@ -2367,7 +2367,38 @@
- #\r
- # @return Bool value for whether need renew workspace databse\r
- #\r
-- def _CheckWhetherDbNeedRenew (self, force, DbPath):\r
-+ def _CheckWhetherDbNeedRenew (self, force, DbPath, DbSignature):\r
-+ DbDir = os.path.split(DbPath)[0]\r
-+ MacroFilePath = os.path.normpath(os.path.join(DbDir, "build.mac"))\r
-+ MacroMatch = False\r
-+ if os.path.exists(MacroFilePath) and os.path.isfile(MacroFilePath):\r
-+ LastMacros = None\r
-+ try:\r
-+ f = open(MacroFilePath,'r')\r
-+ LastMacros = pickle.load(f)\r
-+ f.close()\r
-+ except IOError:\r
-+ pass\r
-+ except:\r
-+ f.close()\r
-+\r
-+ if LastMacros != None and type(LastMacros) is DictType:\r
-+ if LastMacros == DbSignature:\r
-+ MacroMatch = True\r
-+\r
-+ if not MacroMatch:\r
-+ # save command line macros to file\r
-+ try:\r
-+ f = open(MacroFilePath,'w')\r
-+ pickle.dump(DbSignature, f, 2)\r
-+ f.close()\r
-+ except IOError:\r
-+ pass\r
-+ except:\r
-+ f.close()\r
-+\r
-+ force = True\r
-+\r
- # if database does not exist, we need do nothing\r
- if not os.path.exists(DbPath): return False\r
- \r
-Index: BaseTools/Source/Python/build/build.py
-===================================================================
---- BaseTools/Source/Python/build/build.py (revision 12691)
-+++ BaseTools/Source/Python/build/build.py (working copy)
-@@ -704,6 +704,8 @@
- #\r
- def __init__(self, Target, WorkspaceDir, BuildOptions):\r
- self.WorkspaceDir = WorkspaceDir\r
-+ DbSignature = {'Target': Target, 'BuildOptions': BuildOptions }\r
-+ \r
- self.Target = Target\r
- self.PlatformFile = BuildOptions.PlatformFile\r
- self.ModuleFile = BuildOptions.ModuleFile\r
-@@ -726,7 +728,7 @@
- if BuildOptions.DisableCache:\r
- self.Db = WorkspaceDatabase(":memory:")\r
- else:\r
-- self.Db = WorkspaceDatabase(None, self.Reparse)\r
-+ self.Db = WorkspaceDatabase(None, self.Reparse, DbSignature)\r
- self.BuildDatabase = self.Db.BuildObject\r
- self.Platform = None\r
- self.LoadFixAddress = 0\r
-Index: BaseTools/Source/Python/Trim/Trim.py
-===================================================================
---- BaseTools/Source/Python/Trim/Trim.py (revision 12691)
-+++ BaseTools/Source/Python/Trim/Trim.py (working copy)
-@@ -37,7 +37,9 @@
- ## Regular expression for matching "#pragma pack"
- gPragmaPattern = re.compile("^\s*#pragma\s+pack", re.MULTILINE)
- ## Regular expression for matching HEX number
--gHexNumberPattern = re.compile("0[xX]([0-9a-fA-F]+)")
-+gHexNumberPattern = re.compile("(0[xX])([0-9a-fA-F]+)U?")
-+## Regular expression for matching decimal number
-+gDecNumberPattern = re.compile("([0-9]+)U?")
- ## Regular expression for matching "Include ()" in asl file
- gAslIncludePattern = re.compile("^(\s*)[iI]nclude\s*\(\"?([^\"\(\)]+)\"\)", re.MULTILINE)
- ## Regular expression for matching C style #include "XXX.asl" in asl file
-@@ -169,10 +171,15 @@
+ Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
++Portions copyright (c) 2013, ARM Ltd. All rights reserved.<BR>
- # convert HEX number format if indicated
- if ConvertHex:
-- Line = gHexNumberPattern.sub(r"0\1h", Line)
-+ Line = gHexNumberPattern.sub(r"0\2h", Line)
-+ else:
-+ Line = gHexNumberPattern.sub(r"\1\2", Line)
- if TrimLong:
- Line = gLongNumberPattern.sub(r"\1", Line)
+ This program and the accompanying materials are licensed and made available
+ under the terms and conditions of the BSD License which accompanies this
+@@ -18,6 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ #include <windows.h>
+ #include <io.h>
+ #endif
++#include <assert.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -264,9 +266,12 @@ ScanSections32 (
+ EFI_IMAGE_OPTIONAL_HEADER_UNION *NtHdr;
+ UINT32 CoffEntry;
+ UINT32 SectionCount;
++ BOOLEAN FoundText;
-+ # convert Decimal number format
-+ Line = gDecNumberPattern.sub(r"\1", Line)
+ CoffEntry = 0;
+ mCoffOffset = 0;
++ mTextOffset = 0;
++ FoundText = FALSE;
+
+ //
+ // Coff file start with a DOS header.
+@@ -291,7 +296,6 @@ ScanSections32 (
+ // First text sections.
+ //
+ mCoffOffset = CoffAlign(mCoffOffset);
+- mTextOffset = mCoffOffset;
+ SectionCount = 0;
+ for (i = 0; i < mEhdr->e_shnum; i++) {
+ Elf_Shdr *shdr = GetShdrByIndex(i);
+@@ -315,12 +319,26 @@ ScanSections32 (
+ (mEhdr->e_entry < shdr->sh_addr + shdr->sh_size)) {
+ CoffEntry = mCoffOffset + mEhdr->e_entry - shdr->sh_addr;
+ }
++
++ //
++ // Set mTextOffset with the offset of the first '.text' section
++ //
++ if (!FoundText) {
++ mTextOffset = mCoffOffset;
++ FoundText = TRUE;
++ }
++
+ mCoffSectionsOffset[i] = mCoffOffset;
+ mCoffOffset += shdr->sh_size;
+ SectionCount ++;
+ }
+ }
+
++ if (!FoundText) {
++ Error (NULL, 0, 3000, "Invalid", "Did not find any '.text' section.");
++ assert (FALSE);
++ }
++
+ if (mEhdr->e_machine != EM_ARM) {
+ mCoffOffset = CoffAlign(mCoffOffset);
+ }
+diff --git a/BaseTools/Source/C/GenFw/Elf64Convert.c b/BaseTools/Source/C/GenFw/Elf64Convert.c
+old mode 100644
+new mode 100755
+index 72d6cd1..713f8f7
+--- a/BaseTools/Source/C/GenFw/Elf64Convert.c
++++ b/BaseTools/Source/C/GenFw/Elf64Convert.c
+@@ -19,6 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ #include <windows.h>
+ #include <io.h>
+ #endif
++#include <assert.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -258,9 +259,12 @@ ScanSections64 (
+ EFI_IMAGE_OPTIONAL_HEADER_UNION *NtHdr;
+ UINT32 CoffEntry;
+ UINT32 SectionCount;
++ BOOLEAN FoundText;
+
+ CoffEntry = 0;
+ mCoffOffset = 0;
++ mTextOffset = 0;
++ FoundText = FALSE;
+
+ //
+ // Coff file start with a DOS header.
+@@ -286,7 +290,6 @@ ScanSections64 (
+ // First text sections.
+ //
+ mCoffOffset = CoffAlign(mCoffOffset);
+- mTextOffset = mCoffOffset;
+ SectionCount = 0;
+ for (i = 0; i < mEhdr->e_shnum; i++) {
+ Elf_Shdr *shdr = GetShdrByIndex(i);
+@@ -310,12 +313,26 @@ ScanSections64 (
+ (mEhdr->e_entry < shdr->sh_addr + shdr->sh_size)) {
+ CoffEntry = (UINT32) (mCoffOffset + mEhdr->e_entry - shdr->sh_addr);
+ }
++
++ //
++ // Set mTextOffset with the offset of the first '.text' section
++ //
++ if (!FoundText) {
++ mTextOffset = mCoffOffset;
++ FoundText = TRUE;
++ }
++
+ mCoffSectionsOffset[i] = mCoffOffset;
+ mCoffOffset += (UINT32) shdr->sh_size;
+ SectionCount ++;
+ }
+ }
+
++ if (!FoundText) {
++ Error (NULL, 0, 3000, "Invalid", "Did not find any '.text' section.");
++ assert (FALSE);
++ }
+
- if LineNumber != None:
- EdkLogger.verbose("Got line directive: line=%d" % LineNumber)
- # in case preprocessor removed some lines, like blank or comment lines
-Index: BaseTools/Source/C/GenFv/GenFv.c
-===================================================================
---- BaseTools/Source/C/GenFv/GenFv.c (revision 12691)
-+++ BaseTools/Source/C/GenFv/GenFv.c (working copy)
-@@ -623,12 +623,7 @@
- );\r
- } else {\r
- VerboseMsg ("Create Fv image and its map file");\r
-- //\r
-- // Will take rebase action at below situation:\r
-- // 1. ForceRebase Flag specified to TRUE;\r
-- // 2. ForceRebase Flag not specified, BaseAddress greater than zero.\r
-- //\r
-- if (((mFvDataInfo.BaseAddress > 0) && (mFvDataInfo.ForceRebase == -1)) || (mFvDataInfo.ForceRebase == 1)) {\r
-+ if (mFvDataInfo.BaseAddressSet) {\r
- VerboseMsg ("FvImage Rebase Address is 0x%llX", (unsigned long long) mFvDataInfo.BaseAddress);\r
- }\r
- //\r
-Index: BaseTools/Source/C/GenFv/GenFvInternalLib.c
-===================================================================
---- BaseTools/Source/C/GenFv/GenFvInternalLib.c (revision 12691)
-+++ BaseTools/Source/C/GenFv/GenFvInternalLib.c (working copy)
-@@ -506,6 +506,7 @@
- \r
- EFI_STATUS\r
- AddPadFile (\r
-+ IN FV_INFO *FvInfo,\r
- IN OUT MEMORY_FILE *FvImage,\r
- IN UINT32 DataAlignment,\r
- IN VOID *FvEnd,\r
-@@ -537,6 +538,8 @@
- {\r
- EFI_FFS_FILE_HEADER *PadFile;\r
- UINTN PadFileSize;\r
-+ UINTN PadFileOffset;\r
-+ UINTN ExtHeaderSize;\r
- \r
- //\r
- // Verify input parameters.\r
-@@ -559,32 +562,29 @@
- // This is the earliest possible valid offset (current plus pad file header\r
- // plus the next file header)\r
- //\r
-- PadFileSize = (UINTN) FvImage->CurrentFilePointer - (UINTN) FvImage->FileImage + (sizeof (EFI_FFS_FILE_HEADER) * 2);\r
-+ // The padding is added into its own FFS file (which requires a header) added before the aligned file:\r
-+ // | ... FV data before AlignedFile ... | Pad File FFS Header | Padding | AlignedFile FFS Header (+ ExtHeader) | AlignedData\r
- \r
- //\r
-- // Add whatever it takes to get to the next aligned address\r
-+ // Calculate the Offset of the Pad File from the beginning of the FV file\r
- //\r
-- while ((PadFileSize % DataAlignment) != 0) {\r
-- PadFileSize++;\r
-- }\r
-- //\r
-- // Subtract the next file header size\r
-- //\r
-- PadFileSize -= sizeof (EFI_FFS_FILE_HEADER);\r
--\r
-- //\r
-- // Subtract the starting offset to get size\r
-- //\r
-- PadFileSize -= (UINTN) FvImage->CurrentFilePointer - (UINTN) FvImage->FileImage;\r
-+ PadFileOffset = (UINTN) FvImage->CurrentFilePointer - (UINTN) FvImage->FileImage;\r
- \r
- //\r
-- // Append extension header size\r
-+ // Get the size of the extension header if exists\r
- //\r
- if (ExtHeader != NULL) {\r
-- PadFileSize = PadFileSize + ExtHeader->ExtHeaderSize;\r
-+ ExtHeaderSize = ExtHeader->ExtHeaderSize;\r
-+ } else {\r
-+ ExtHeaderSize = 0;\r
- }\r
- \r
- //\r
-+ // Calculate the Size of the Padding to ensure the alignment of the data of the Next file\r
-+ //\r
-+ PadFileSize = DataAlignment - ((FvInfo->BaseAddress + PadFileOffset + sizeof (EFI_FFS_FILE_HEADER) + ExtHeaderSize) & (DataAlignment - 1));\r
-+\r
-+ //\r
- // Verify that we have enough space for the file header\r
- //\r
- if (((UINTN) FvImage->CurrentFilePointer + PadFileSize) > (UINTN) FvEnd) {\r
-@@ -1115,7 +1115,7 @@
- //\r
- // Add pad file if necessary\r
- //\r
-- Status = AddPadFile (FvImage, 1 << CurrentFileAlignment, *VtfFileImage, NULL);\r
-+ Status = AddPadFile (FvInfo, FvImage, 1 << CurrentFileAlignment, *VtfFileImage, NULL);\r
- if (EFI_ERROR (Status)) {\r
- Error (NULL, 0, 4002, "Resource", "FV space is full, could not add pad file for data alignment property.");\r
- free (FileBuffer);\r
-@@ -2304,7 +2304,7 @@
- //\r
- // Add FV Extended Header contents to the FV as a PAD file\r
- //\r
-- AddPadFile (&FvImageMemoryFile, 4, VtfFileImage, FvExtHeader);\r
-+ AddPadFile (&mFvDataInfo, &FvImageMemoryFile, 4, VtfFileImage, FvExtHeader);\r
- \r
- //\r
- // Fv Extension header change update Fv Header Check sum\r
-@@ -2825,20 +2825,12 @@
- PeFileBuffer = NULL;\r
- \r
- //\r
-- // Don't need to relocate image when BaseAddress is zero and no ForceRebase Flag specified.\r
-+ // Don't need to relocate image when BaseAddress is not set.\r
- //\r
-- if ((FvInfo->BaseAddress == 0) && (FvInfo->ForceRebase == -1)) {\r
-+ if (FvInfo->BaseAddressSet == FALSE) {\r
- return EFI_SUCCESS;\r
- }\r
-- \r
-- //\r
-- // If ForceRebase Flag specified to FALSE, will always not take rebase action.\r
-- //\r
-- if (FvInfo->ForceRebase == 0) {\r
-- return EFI_SUCCESS;\r
-- }\r
- \r
--\r
- XipBase = FvInfo->BaseAddress + XipOffset;\r
- \r
- //\r
+ if (mEhdr->e_machine != EM_ARM) {
+ mCoffOffset = CoffAlign(mCoffOffset);
+ }
+--
+1.7.0.4
+
projects / mirror_edk2.git / blobdiff