[mirror_edk2.git] / ArmPlatformPkg / Documentation / patches / BaseTools-Pending-Patches.patch

Index: BaseTools/Conf/build_rule.template
===================================================================
--- BaseTools/Conf/build_rule.template	(revision 12664)
+++ 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 12664)
+++ 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 12664)
+++ 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
 
     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 12664)
+++ 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 12664)
+++ 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/C/GenFv/GenFv.c
===================================================================
--- BaseTools/Source/C/GenFv/GenFv.c	(revision 12664)
+++ 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 12664)
+++ 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
Commit	Line	Data
09bb585c	1	Index: BaseTools/Conf/build_rule.template
	2	===================================================================
	3	--- BaseTools/Conf/build_rule.template (revision 12664)
	4	+++ BaseTools/Conf/build_rule.template (working copy)
9703e347	5	@@ -129,7 +129,7 @@
	6	"$(CC)" $(CC_FLAGS) -o ${dst} $(INC) ${src}\r
	7	"$(SYMRENAME)" $(SYMRENAME_FLAGS) ${dst}\r
	8	\r
	9	- <Command.ARMGCC>\r
	10	+ <Command.ARMGCC, Command.ARMLINUXGCC>\r
	11	"$(CC)" $(CC_FLAGS) -o ${dst} $(INC) ${src}\r
	12	\r
	13	\r
	14	@@ -217,7 +217,7 @@
	15	<Command.RVCT>\r
	16	"$(SLINK)" $(SLINK_FLAGS) ${dst} --via $(OBJECT_FILES_LIST)\r
	17	\r
	18	- <Command.RVCTCYGWIN, Command.ARMGCC>\r
	19	+ <Command.RVCTCYGWIN, Command.ARMGCC, Command.ARMLINUXGCC>\r
	20	# $(OBJECT_FILES_LIST) has wrong paths for cygwin\r
	21	"$(SLINK)" $(SLINK_FLAGS) ${dst} $(OBJECT_FILES)\r
	22	\r
	23	@@ -241,7 +241,7 @@
	24	"$(DLINK)" -o ${dst} $(DLINK_FLAGS) -\( $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST) -\) $(DLINK2_FLAGS)\r
	25	"$(OBJCOPY)" $(OBJCOPY_FLAGS) ${dst}\r
	26	\r
	27	- <Command.ARMGCC>\r
	28	+ <Command.ARMGCC, Command.ARMLINUXGCC>\r
	29	"$(DLINK)" -o ${dst} $(DLINK_FLAGS) -\( $(DLINK_SPATH) $(STATIC_LIBRARY_FILES) -\) $(DLINK2_FLAGS)\r
	30	\r
	31	<Command.RVCT>\r
	32	@@ -271,7 +271,7 @@
	33	<Command.GCC>\r
	34	"$(DLINK)" $(DLINK_FLAGS) -\( $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST) -\) $(DLINK2_FLAGS)\r
	35	\r
	36	- <Command.ARMGCC>\r
	37	+ <Command.ARMGCC, Command.ARMLINUXGCC>\r
	38	"$(DLINK)" $(DLINK_FLAGS) -\( $(DLINK_SPATH) $(STATIC_LIBRARY_FILES) -\) $(DLINK2_FLAGS)\r
	39	\r
	40	<Command.RVCT>\r
	41	@@ -292,7 +292,7 @@
	42	<OutputFile>\r
	43	$(DEBUG_DIR)(+)$(MODULE_NAME).efi\r
	44	\r
	45	- <Command.MSFT, Command.INTEL, Command.RVCT, Command.ARMGCC> \r
	46	+ <Command.MSFT, Command.INTEL, Command.RVCT, Command.ARMGCC, Command.ARMLINUXGCC> \r
	47	"$(GENFW)" -e $(MODULE_TYPE) -o ${dst} ${src} $(GENFW_FLAGS)\r
	48	$(CP) ${dst} $(OUTPUT_DIR)\r
	49	$(CP) ${dst} $(BIN_DIR)\r
	50	@@ -536,7 +536,7 @@
	51	"$(GENFW)" -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUID) --hiibinpackage $(HII_BINARY_PACKAGES) $(GENFW_FLAGS)\r
	52	"$(RC)" $(RC_FLAGS) $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc ${dst}\r
	53	\r
	54	- <Command.XCODE, Command.RVCT, Command.ARMGCC> \r
	55	+ <Command.XCODE, Command.RVCT, Command.ARMGCC, Command.ARMLINUXGCC> \r
	56	GenFw -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUID) --hiibinpackage $(HII_BINARY_PACKAGES)\r
	57	\r
	58	\r
09bb585c	59	Index: BaseTools/Conf/tools_def.template
	60	===================================================================
	61	--- BaseTools/Conf/tools_def.template (revision 12664)
	62	+++ BaseTools/Conf/tools_def.template (working copy)
	63	@@ -467,6 +467,7 @@
	64	# MSFT - Microsoft\r
	65	# GCC - GNU GCC\r
	66	# INTEL - INTEL\r
	67	+# RVCT - ARM RealView Toolchain\r
9703e347	68	####################################################################################\r
597cb96f	69	####################################################################################\r
597cb96f	70	#\r
09bb585c	71	@@ -4173,11 +4174,69 @@
09bb585c	72	*_ARMGCC_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h\r
9703e347	73	\r
597cb96f	74	*_ARMGCC_ARM_SLINK_FLAGS = -rc\r
09bb585c	75	-*_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
	76	+*_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
	77	\r
	78	DEBUG_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -combine -O0\r
	79	RELEASE_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -combine -Wno-unused\r
597cb96f	80	\r
9703e347	81	+####################################################################################\r
	82	+#\r
	83	+# ARM GNU/Linux GCC\r
	84	+#\r
	85	+####################################################################################\r
	86	+# ARMLINUXGCC - ARM version of the GCC cross compiler\r
	87	+\r
	88	+_ARMLINUXGCC__*_FAMILY = GCC\r
	89	+_ARMLINUXGCC__*_BUILDRULEFAMILY = ARMLINUXGCC\r
	90	+\r
	91	+_ARMLINUXGCC__MAKE_PATH = make\r
	92	+_ARMLINUXGCC__MAKE_FLAGS = --no-print-directory\r
	93	+\r
	94	+##################\r
	95	+# ASL definitions\r
	96	+##################\r
	97	+_ARMLINUXGCC__ASL_PATH = DEF(UNIX_IASL_BIN)\r
	98	+_ARMLINUXGCC__ASL_FLAGS = DEF(IASL_FLAGS)\r
	99	+_ARMLINUXGCC__ASL_OUTFLAGS = DEF(IASL_OUTFLAGS)\r
	100	+_ARMLINUXGCC__ASLPP_FLAGS = -x c -E -P\r
	101	+_ARMLINUXGCC__ASLCC_FLAGS = -x c\r
	102	+_ARMLINUXGCC__ASLDLINK_FLAGS = DEF(GCC_DLINK_FLAGS_COMMON) --entry _ReferenceAcpiTable\r
	103	+\r
	104	+##################\r
	105	+# ARM definitions\r
	106	+##################\r
	107	+\r
	108	+*_ARMLINUXGCC_ARM_ASLCC_PATH = ENV(ARMLINUXGCC_TOOLS_PATH)arm-linux-gnueabi-gcc\r
	109	+*_ARMLINUXGCC_ARM_ASLDLINK_PATH = ENV(ARMLINUXGCC_TOOLS_PATH)arm-linux-gnueabi-ld\r
	110	+*_ARMLINUXGCC_ARM_ASLPP_PATH = ENV(ARMLINUXGCC_TOOLS_PATH)arm-linux-gnueabi-gcc\r
	111	+\r
	112	+*_ARMLINUXGCC_ARM_CC_PATH = ENV(ARMLINUXGCC_TOOLS_PATH)arm-linux-gnueabi-gcc\r
	113	+*_ARMLINUXGCC_ARM_SLINK_PATH = ENV(ARMLINUXGCC_TOOLS_PATH)arm-linux-gnueabi-ar\r
	114	+*_ARMLINUXGCC_ARM_DLINK_PATH = ENV(ARMLINUXGCC_TOOLS_PATH)arm-linux-gnueabi-ld\r
	115	+*_ARMLINUXGCC_ARM_ASM_PATH = ENV(ARMLINUXGCC_TOOLS_PATH)arm-linux-gnueabi-as\r
	116	+*_ARMLINUXGCC_ARM_PP_PATH = ENV(ARMLINUXGCC_TOOLS_PATH)arm-linux-gnueabi-gcc\r
	117	+*_ARMLINUXGCC_ARM_VFRPP_PATH = ENV(ARMLINUXGCC_TOOLS_PATH)arm-linux-gnueabi-gcc\r
	118	+\r
	119	+#\r
	120	+# Use default values, or override in DSC file\r
	121	+#\r
	122	+*_ARMLINUXGCC_ARM_ARCHCC_FLAGS = -mthumb\r
	123	+*_ARMLINUXGCC_ARM_ARCHASM_FLAGS = \r
	124	+*_ARMLINUXGCC_ARM_ARCHDLINK_FLAGS =\r
	125	+*_ARMLINUXGCC_ARM_PLATFORM_FLAGS = -march=armv7-a\r
	126	+\r
	127	+ DEBUG_ARMLINUXGCC_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) -mlittle-endian -g\r
	128	+RELEASE_ARMLINUXGCC_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) -mlittle-endian\r
	129	+\r
	130	+*_ARMLINUXGCC_ARM_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h\r
	131	+*_ARMLINUXGCC_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h\r
	132	+\r
	133	+*_ARMLINUXGCC_ARM_SLINK_FLAGS = -rc\r
09bb585c	134	+*_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
9703e347	135	+\r
	136	+ DEBUG_ARMLINUXGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -Wno-address -O0\r
	137	+RELEASE_ARMLINUXGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -Wno-address -Wno-unused-but-set-variable\r
09bb585c	138	+\r
597cb96f	139	#################\r
597cb96f	140	# ASM 16 linker defintions\r
09bb585c	141	#################\r
	142	Index: BaseTools/Source/Python/Workspace/MetaFileParser.py
	143	===================================================================
	144	--- BaseTools/Source/Python/Workspace/MetaFileParser.py (revision 12664)
	145	+++ BaseTools/Source/Python/Workspace/MetaFileParser.py (working copy)
	146	@@ -1280,6 +1280,9 @@
	147	Records = IncludedFileTable.GetAll()
	148	if Records:
	149	self._Content[self._ContentIndex:self._ContentIndex] = Records
	150	+ self._Content.pop(self._ContentIndex-1)
	151	+ self._ValueList = None
	152	+ self._ContentIndex -= 1
	153
	154	def __ProcessSkuId(self):
	155	self._ValueList = [ReplaceMacro(Value, self._Macros, RaiseError=True)
	156	Index: BaseTools/Source/Python/Workspace/WorkspaceDatabase.py
	157	===================================================================
	158	--- BaseTools/Source/Python/Workspace/WorkspaceDatabase.py (revision 12664)
	159	+++ BaseTools/Source/Python/Workspace/WorkspaceDatabase.py (working copy)
	160	@@ -2319,7 +2319,7 @@
	161	# @param GlobalMacros Global macros used for replacement during file parsing\r
	162	# @prarm RenewDb=False Create new database file if it's already there\r
	163	#\r
	164	- def __init__(self, DbPath, RenewDb=False):\r
	165	+ def __init__(self, DbPath, RenewDb=False, DbSignature={}):\r
	166	self._DbClosedFlag = False\r
	167	if not DbPath:\r
	168	DbPath = os.path.normpath(os.path.join(GlobalData.gWorkspace, self._DB_PATH_))\r
	169	@@ -2331,7 +2331,7 @@
	170	os.makedirs(DbDir)\r
	171	\r
	172	# remove db file in case inconsistency between db and file in file system\r
	173	- if self._CheckWhetherDbNeedRenew(RenewDb, DbPath):\r
	174	+ if self._CheckWhetherDbNeedRenew(RenewDb, DbPath, DbSignature):\r
	175	os.remove(DbPath)\r
	176	\r
	177	# create db with optimized parameters\r
	178	@@ -2367,7 +2367,38 @@
	179	#\r
	180	# @return Bool value for whether need renew workspace databse\r
	181	#\r
	182	- def _CheckWhetherDbNeedRenew (self, force, DbPath):\r
	183	+ def _CheckWhetherDbNeedRenew (self, force, DbPath, DbSignature):\r
	184	+ DbDir = os.path.split(DbPath)[0]\r
	185	+ MacroFilePath = os.path.normpath(os.path.join(DbDir, "build.mac"))\r
	186	+ MacroMatch = False\r
	187	+ if os.path.exists(MacroFilePath) and os.path.isfile(MacroFilePath):\r
	188	+ LastMacros = None\r
	189	+ try:\r
	190	+ f = open(MacroFilePath,'r')\r
	191	+ LastMacros = pickle.load(f)\r
	192	+ f.close()\r
	193	+ except IOError:\r
	194	+ pass\r
	195	+ except:\r
	196	+ f.close()\r
	197	+\r
	198	+ if LastMacros != None and type(LastMacros) is DictType:\r
	199	+ if LastMacros == DbSignature:\r
	200	+ MacroMatch = True\r
	201	+\r
	202	+ if not MacroMatch:\r
	203	+ # save command line macros to file\r
	204	+ try:\r
205	+ f = open(MacroFilePath,'w')\r
206	+ pickle.dump(DbSignature, f, 2)\r
207	+ f.close()\r
208	+ except IOError:\r
209	+ pass\r
210	+ except:\r
211	+ f.close()\r
212	+\r
213	+ force = True\r
214	+\r
215	# if database does not exist, we need do nothing\r
216	if not os.path.exists(DbPath): return False\r
217	\r
218	Index: BaseTools/Source/Python/build/build.py
219	===================================================================
220	--- BaseTools/Source/Python/build/build.py (revision 12664)
221	+++ BaseTools/Source/Python/build/build.py (working copy)
222	@@ -704,6 +704,8 @@
223	#\r
224	def __init__(self, Target, WorkspaceDir, BuildOptions):\r
225	self.WorkspaceDir = WorkspaceDir\r
226	+ DbSignature = {'Target': Target, 'BuildOptions': BuildOptions }\r
227	+ \r
228	self.Target = Target\r
229	self.PlatformFile = BuildOptions.PlatformFile\r
230	self.ModuleFile = BuildOptions.ModuleFile\r
231	@@ -726,7 +728,7 @@
232	if BuildOptions.DisableCache:\r
233	self.Db = WorkspaceDatabase(":memory:")\r
234	else:\r
235	- self.Db = WorkspaceDatabase(None, self.Reparse)\r
236	+ self.Db = WorkspaceDatabase(None, self.Reparse, DbSignature)\r
237	self.BuildDatabase = self.Db.BuildObject\r
238	self.Platform = None\r
239	self.LoadFixAddress = 0\r
240	Index: BaseTools/Source/C/GenFv/GenFv.c
241	===================================================================
242	--- BaseTools/Source/C/GenFv/GenFv.c (revision 12664)
243	+++ BaseTools/Source/C/GenFv/GenFv.c (working copy)
244	@@ -623,12 +623,7 @@
597cb96f	245	);\r
	246	} else {\r
	247	VerboseMsg ("Create Fv image and its map file");\r
09bb585c	248	- //\r
	249	- // Will take rebase action at below situation:\r
	250	- // 1. ForceRebase Flag specified to TRUE;\r
	251	- // 2. ForceRebase Flag not specified, BaseAddress greater than zero.\r
	252	- //\r
	253	- if (((mFvDataInfo.BaseAddress > 0) && (mFvDataInfo.ForceRebase == -1)) \|\| (mFvDataInfo.ForceRebase == 1)) {\r
597cb96f	254	+ if (mFvDataInfo.BaseAddressSet) {\r
	255	VerboseMsg ("FvImage Rebase Address is 0x%llX", (unsigned long long) mFvDataInfo.BaseAddress);\r
	256	}\r
	257	//\r
09bb585c	258	Index: BaseTools/Source/C/GenFv/GenFvInternalLib.c
	259	===================================================================
	260	--- BaseTools/Source/C/GenFv/GenFvInternalLib.c (revision 12664)
	261	+++ BaseTools/Source/C/GenFv/GenFvInternalLib.c (working copy)
	262	@@ -506,6 +506,7 @@
597cb96f	263	\r
	264	EFI_STATUS\r
	265	AddPadFile (\r
	266	+ IN FV_INFO *FvInfo,\r
	267	IN OUT MEMORY_FILE *FvImage,\r
	268	IN UINT32 DataAlignment,\r
	269	IN VOID *FvEnd,\r
09bb585c	270	@@ -537,6 +538,8 @@
597cb96f	271	{\r
	272	EFI_FFS_FILE_HEADER *PadFile;\r
	273	UINTN PadFileSize;\r
	274	+ UINTN PadFileOffset;\r
	275	+ UINTN ExtHeaderSize;\r
	276	\r
	277	//\r
	278	// Verify input parameters.\r
09bb585c	279	@@ -559,32 +562,29 @@
597cb96f	280	// This is the earliest possible valid offset (current plus pad file header\r
	281	// plus the next file header)\r
	282	//\r
	283	- PadFileSize = (UINTN) FvImage->CurrentFilePointer - (UINTN) FvImage->FileImage + (sizeof (EFI_FFS_FILE_HEADER) * 2);\r
	284	+ // The padding is added into its own FFS file (which requires a header) added before the aligned file:\r
	285	+ // \| ... FV data before AlignedFile ... \| Pad File FFS Header \| Padding \| AlignedFile FFS Header (+ ExtHeader) \| AlignedData\r
	286	\r
	287	//\r
	288	- // Add whatever it takes to get to the next aligned address\r
	289	+ // Calculate the Offset of the Pad File from the beginning of the FV file\r
	290	//\r
	291	- while ((PadFileSize % DataAlignment) != 0) {\r
	292	- PadFileSize++;\r
	293	- }\r
	294	- //\r
	295	- // Subtract the next file header size\r
	296	- //\r
	297	- PadFileSize -= sizeof (EFI_FFS_FILE_HEADER);\r
	298	-\r
	299	- //\r
	300	- // Subtract the starting offset to get size\r
	301	- //\r
	302	- PadFileSize -= (UINTN) FvImage->CurrentFilePointer - (UINTN) FvImage->FileImage;\r
	303	+ PadFileOffset = (UINTN) FvImage->CurrentFilePointer - (UINTN) FvImage->FileImage;\r
	304	\r
	305	//\r
	306	- // Append extension header size\r
	307	+ // Get the size of the extension header if exists\r
	308	//\r
	309	if (ExtHeader != NULL) {\r
	310	- PadFileSize = PadFileSize + ExtHeader->ExtHeaderSize;\r
	311	+ ExtHeaderSize = ExtHeader->ExtHeaderSize;\r
	312	+ } else {\r
	313	+ ExtHeaderSize = 0;\r
	314	}\r
	315	\r
	316	//\r
	317	+ // Calculate the Size of the Padding to ensure the alignment of the data of the Next file\r
	318	+ //\r
	319	+ PadFileSize = DataAlignment - ((FvInfo->BaseAddress + PadFileOffset + sizeof (EFI_FFS_FILE_HEADER) + ExtHeaderSize) & (DataAlignment - 1));\r
	320	+\r
	321	+ //\r
	322	// Verify that we have enough space for the file header\r
	323	//\r
	324	if (((UINTN) FvImage->CurrentFilePointer + PadFileSize) > (UINTN) FvEnd) {\r
09bb585c	325	@@ -1115,7 +1115,7 @@
597cb96f	326	//\r
	327	// Add pad file if necessary\r
	328	//\r
	329	- Status = AddPadFile (FvImage, 1 << CurrentFileAlignment, *VtfFileImage, NULL);\r
	330	+ Status = AddPadFile (FvInfo, FvImage, 1 << CurrentFileAlignment, *VtfFileImage, NULL);\r
	331	if (EFI_ERROR (Status)) {\r
	332	Error (NULL, 0, 4002, "Resource", "FV space is full, could not add pad file for data alignment property.");\r
	333	free (FileBuffer);\r
09bb585c	334	@@ -2304,7 +2304,7 @@
597cb96f	335	//\r
	336	// Add FV Extended Header contents to the FV as a PAD file\r
	337	//\r
	338	- AddPadFile (&FvImageMemoryFile, 4, VtfFileImage, FvExtHeader);\r
	339	+ AddPadFile (&mFvDataInfo, &FvImageMemoryFile, 4, VtfFileImage, FvExtHeader);\r
	340	\r
	341	//\r
	342	// Fv Extension header change update Fv Header Check sum\r
09bb585c	343	@@ -2825,20 +2825,12 @@
	344	PeFileBuffer = NULL;\r
	345	\r
597cb96f	346	//\r
09bb585c	347	- // Don't need to relocate image when BaseAddress is zero and no ForceRebase Flag specified.\r
09bb585c	348	+ // Don't need to relocate image when BaseAddress is not set.\r
597cb96f	349	//\r
09bb585c	350	- if ((FvInfo->BaseAddress == 0) && (FvInfo->ForceRebase == -1)) {\r
597cb96f	351	+ if (FvInfo->BaseAddressSet == FALSE) {\r
	352	return EFI_SUCCESS;\r
	353	}\r
09bb585c	354	- \r
	355	- //\r
	356	- // If ForceRebase Flag specified to FALSE, will always not take rebase action.\r
	357	- //\r
	358	- if (FvInfo->ForceRebase == 0) {\r
	359	- return EFI_SUCCESS;\r
	360	- }\r
	361	\r
	362	-\r
597cb96f	363	XipBase = FvInfo->BaseAddress + XipOffset;\r
09bb585c	364	\r
09bb585c	365	//\r