BaseTools Conf: Update tools_def and build_rule to remove IPF setting

[mirror_edk2.git] / BaseTools / Conf / build_rule.template

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
old mode 100644 (file)
new mode 100755 (executable)
index 496fd66..b2667c2
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -1,5 +1,5 @@
 #\r
-#  Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR>\r
 #  Portions copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR>\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -66,6 +66,8 @@
 #   $(LIBS)             Static library files of current module\r
 #   $(<tool>_FLAGS)     Tools flags of current module\r
 #   $(MODULE_NAME)      Current module name\r
+#   $(MODULE_NAME_GUID) Current module name with module FILE_GUID if same $(MODULE_NAME) exists\r
+#                       in different modules, otherwise its value is same as $(MODULE_NAME)\r
 #   $(MODULE_TYPE)      Current module type\r
 #   $(MODULE_GUID)      Current module guid\r
 #   $(ARCH)             Architecture of current module\r
@@ -128,14 +130,25 @@
     <Command.MSFT, Command.INTEL>\r
         "$(CC)" /Fo${dst} $(CC_FLAGS) $(INC) ${src}\r
 \r
-    <Command.GCC, Command.RVCT>\r
+    <Command.GCC, Command.GCCLD, Command.RVCT>\r
         # For RVCTCYGWIN CC_FLAGS must be first to work around pathing issues\r
-        "$(CC)" $(CC_FLAGS) -o ${dst} $(INC) ${src}\r
-        "$(SYMRENAME)" $(SYMRENAME_FLAGS) ${dst}\r
+        "$(CC)" $(CC_FLAGS) -c -o ${dst} $(INC) ${src}\r
 \r
-    <Command.ARMGCC, Command.ARMLINUXGCC, command.XCODE>\r
+    <Command.XCODE>\r
         "$(CC)" $(CC_FLAGS) -o ${dst} $(INC) ${src}\r
 \r
+[C-Code-File.BASE.AARCH64,C-Code-File.SEC.AARCH64,C-Code-File.PEI_CORE.AARCH64,C-Code-File.PEIM.AARCH64,C-Code-File.BASE.ARM,C-Code-File.SEC.ARM,C-Code-File.PEI_CORE.ARM,C-Code-File.PEIM.ARM]\r
+    <InputFile>\r
+        ?.c\r
+\r
+    <ExtraDependency>\r
+        $(MAKE_FILE)\r
+\r
+    <OutputFile>\r
+        $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj\r
+\r
+    <Command.GCC, Command.GCCLD, Command.RVCT>\r
+        "$(CC)" $(CC_FLAGS) $(CC_XIPFLAGS) -c -o ${dst} $(INC) ${src}\r
 \r
 [C-Header-File]\r
     <InputFile>\r
@@ -145,12 +158,11 @@
 \r
     <Command>\r
 \r
-\r
 [Assembly-Code-File.COMMON.COMMON]\r
     <InputFile.MSFT, InputFile.INTEL, InputFile.RVCT>\r
         ?.asm, ?.Asm, ?.ASM\r
 \r
-    <InputFile.GCC>\r
+    <InputFile.GCC, InputFile.GCCLD>\r
         ?.S, ?.s\r
 \r
     <ExtraDependency>\r
@@ -161,10 +173,40 @@
 \r
     <Command.MSFT, Command.INTEL>\r
         "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
-        Trim --source-code --convert-hex -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i\r
+        Trim --source-code --convert-hex --trim-long -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i\r
         "$(ASM)" /Fo${dst} $(ASM_FLAGS) /I${s_path} $(INC) ${d_path}(+)${s_base}.iii\r
 \r
-    <Command.GCC, Command.RVCT>\r
+    <Command.GCC, Command.GCCLD, Command.RVCT>\r
+        "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
+        Trim --trim-long --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i\r
+        # For RVCTCYGWIN ASM_FLAGS must be first to work around pathing issues\r
+        "$(ASM)" $(ASM_FLAGS) -o ${dst} $(INC) ${d_path}(+)${s_base}.iii\r
+\r
+[Assembly-Code-File.COMMON.ARM,Assembly-Code-File.COMMON.AARCH64]\r
+    # Remove --convert-hex for ARM as it breaks MSFT assemblers\r
+    <InputFile.MSFT, InputFile.INTEL, InputFile.RVCT>\r
+        ?.asm, ?.Asm, ?.ASM\r
+\r
+    <InputFile.GCC, InputFile.GCCLD>\r
+        ?.S, ?.s\r
+\r
+    <ExtraDependency>\r
+        $(MAKE_FILE)\r
+\r
+    <OutputFile>\r
+        $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj\r
+\r
+    <Command.INTEL>\r
+        "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
+        Trim --source-code --convert-hex --trim-long -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i\r
+        "$(ASM)" /Fo${dst} $(ASM_FLAGS) /I${s_path} $(INC) ${d_path}(+)${s_base}.iii\r
+\r
+    <Command.MSFT>\r
+        "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
+        Trim --source-code --trim-long -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i\r
+        "$(ASM)" /Fo${dst} $(ASM_FLAGS) /I${s_path} $(INC) ${d_path}(+)${s_base}.iii\r
+\r
+    <Command.GCC, Command.GCCLD, Command.RVCT>\r
         "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
         Trim --trim-long --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i\r
         # For RVCTCYGWIN ASM_FLAGS must be first to work around pathing issues\r
@@ -172,7 +214,7 @@
 \r
 [Nasm-Assembly-Code-File.COMMON.COMMON]\r
     <InputFile>\r
-        ?.nasm, ?.Nasm, ?.NASM\r
+        ?.nasm\r
 \r
     <ExtraDependency>\r
         $(MAKE_FILE)\r
@@ -185,21 +227,19 @@
         Trim --trim-long --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i\r
         "$(NASM)" -I${s_path}(+) $(NASM_FLAGS) -o $dst ${d_path}(+)${s_base}.iii\r
 \r
-[Assembly-Code-File.COMMON.IPF]\r
+[Device-Tree-Source-File]\r
     <InputFile>\r
-        ?.s\r
+        ?.dts\r
 \r
     <ExtraDependency>\r
         $(MAKE_FILE)\r
 \r
     <OutputFile>\r
-        $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj\r
+        $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dtb\r
 \r
-    <Command.MSFT, Command.INTEL>\r
-        "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
-        Trim --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i\r
-        # For RVCTCYGWIN ASM_FLAGS must be first to work around pathing issues\r
-        "$(ASM)" $(ASM_FLAGS) -o ${dst} ${d_path}(+)${s_base}.iii\r
+    <Command.GCC>\r
+        "$(DTCPP)" $(DTCPP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
+        "$(DTC)" $(DTC_FLAGS) -I dts -O dtb -o ${dst} ${d_path}(+)${s_base}.i\r
 \r
 [Visual-Form-Representation-File]\r
     <InputFile>\r
@@ -228,13 +268,13 @@
     <Command.MSFT, Command.INTEL>\r
         "$(SLINK)" $(SLINK_FLAGS) /OUT:${dst} @$(OBJECT_FILES_LIST)\r
 \r
-    <Command.GCC>\r
-        "$(SLINK)" -cr ${dst} $(SLINK_FLAGS) @$(OBJECT_FILES_LIST)\r
+    <Command.GCC, Command.GCCLD>\r
+        "$(SLINK)" cr ${dst} $(SLINK_FLAGS) @$(OBJECT_FILES_LIST)\r
     \r
     <Command.RVCT>\r
         "$(SLINK)" $(SLINK_FLAGS) ${dst} --via $(OBJECT_FILES_LIST)\r
     \r
-    <Command.RVCTCYGWIN, Command.ARMGCC, Command.ARMLINUXGCC>\r
+    <Command.RVCTCYGWIN>\r
         # $(OBJECT_FILES_LIST) has wrong paths for cygwin\r
         "$(SLINK)" $(SLINK_FLAGS) ${dst} $(OBJECT_FILES)\r
 \r
@@ -252,14 +292,16 @@
         $(DEBUG_DIR)(+)$(MODULE_NAME).dll\r
 \r
     <Command.MSFT, Command.INTEL>\r
+        "$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK2_FLAGS) $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST)\r
         "$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST)\r
 \r
     <Command.GCC>\r
-        "$(DLINK)" -o ${dst} $(DLINK_FLAGS) --start-group $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST) --end-group $(DLINK2_FLAGS)\r
+        "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -Wl,--start-group,@$(STATIC_LIBRARY_FILES_LIST),--end-group $(CC_FLAGS) $(DLINK2_FLAGS)\r
         "$(OBJCOPY)" $(OBJCOPY_FLAGS) ${dst}\r
 \r
-    <Command.ARMGCC, Command.ARMLINUXGCC>\r
-        "$(DLINK)" -o ${dst} $(DLINK_FLAGS) --start-group $(DLINK_SPATH) $(STATIC_LIBRARY_FILES) --end-group $(DLINK2_FLAGS)\r
+    <Command.GCCLD>\r
+        "$(DLINK)" -o ${dst} $(DLINK_FLAGS) --start-group $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST) --end-group $(DLINK2_FLAGS)\r
+        "$(OBJCOPY)" $(OBJCOPY_FLAGS) ${dst}\r
 \r
     <Command.RVCT>\r
         "$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) --via $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS)\r
@@ -272,6 +314,21 @@
         "$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) -filelist $(STATIC_LIBRARY_FILES_LIST)  $(DLINK2_FLAGS)\r
     \r
     \r
+[Static-Library-File.SEC.AARCH64, Static-Library-File.PEI_CORE.AARCH64, Static-Library-File.PEIM.AARCH64,Static-Library-File.SEC.ARM, Static-Library-File.PEI_CORE.ARM, Static-Library-File.PEIM.ARM]\r
+    <InputFile>\r
+        *.lib\r
+\r
+    <ExtraDependency>\r
+        $(MAKE_FILE)\r
+\r
+    <OutputFile>\r
+        $(DEBUG_DIR)(+)$(MODULE_NAME).dll\r
+\r
+    <Command.GCC>\r
+        "$(DLINK)" -o ${dst} $(DLINK_FLAGS) $(DLINK_XIPFLAGS) -Wl,--start-group,@$(STATIC_LIBRARY_FILES_LIST),--end-group $(CC_FLAGS) $(CC_XIPFLAGS) $(DLINK2_FLAGS)\r
+        "$(OBJCOPY)" $(OBJCOPY_FLAGS) ${dst}\r
+\r
+\r
 [Static-Library-File.USER_DEFINED]\r
     <InputFile>\r
         *.lib\r
@@ -286,10 +343,10 @@
         "$(DLINK)" $(DLINK_FLAGS) $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST)\r
 \r
     <Command.GCC>\r
-        "$(DLINK)" $(DLINK_FLAGS) --start-group $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST) --end-group $(DLINK2_FLAGS)\r
+        "$(DLINK)" $(DLINK_FLAGS) -Wl,--start-group,@$(STATIC_LIBRARY_FILES_LIST),--end-group $(DLINK2_FLAGS)\r
 \r
-    <Command.ARMGCC, Command.ARMLINUXGCC>\r
-        "$(DLINK)" $(DLINK_FLAGS) --start-group $(DLINK_SPATH) $(STATIC_LIBRARY_FILES) --end-group $(DLINK2_FLAGS)\r
+    <Command.GCCLD>\r
+        "$(DLINK)" $(DLINK_FLAGS) --start-group $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST) --end-group $(DLINK2_FLAGS)\r
 \r
     <Command.RVCT>\r
         "$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) --via $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS)\r
@@ -309,13 +366,13 @@
     <OutputFile>\r
         $(DEBUG_DIR)(+)$(MODULE_NAME).efi\r
 \r
-    <Command.MSFT, Command.INTEL, Command.RVCT, Command.ARMGCC, Command.ARMLINUXGCC>  \r
+    <Command.MSFT, Command.INTEL, Command.RVCT>\r
         "$(GENFW)" -e $(MODULE_TYPE) -o ${dst} ${src} $(GENFW_FLAGS)\r
         $(CP) ${dst} $(OUTPUT_DIR)\r
-        $(CP) ${dst} $(BIN_DIR)\r
+        $(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).efi\r
         -$(CP) $(DEBUG_DIR)(+)*.map $(OUTPUT_DIR)\r
         -$(CP) $(DEBUG_DIR)(+)*.pdb $(OUTPUT_DIR) \r
-    <Command.GCC>\r
+    <Command.GCC, Command.GCCLD>\r
         $(CP) ${src} $(DEBUG_DIR)(+)$(MODULE_NAME).debug\r
         $(OBJCOPY) --strip-unneeded -R .eh_frame ${src}\r
 \r
@@ -323,11 +380,11 @@
         #The below 2 lines are only needed for UNIXGCC tool chain, which genereates PE image directly\r
         #\r
         -$(OBJCOPY) $(OBJCOPY_ADDDEBUGFLAG) ${src}\r
-        -$(CP) $(DEBUG_DIR)(+)$(MODULE_NAME).debug $(BIN_DIR)\r
+        -$(CP) $(DEBUG_DIR)(+)$(MODULE_NAME).debug $(BIN_DIR)(+)$(MODULE_NAME_GUID).debug\r
 \r
         "$(GENFW)" -e $(MODULE_TYPE) -o ${dst} ${src} $(GENFW_FLAGS)\r
         $(CP) ${dst} $(OUTPUT_DIR)\r
-        $(CP) ${dst} $(BIN_DIR)\r
+        $(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).efi\r
         -$(CP) $(DEBUG_DIR)(+)*.map $(OUTPUT_DIR)\r
         \r
     <Command.XCODE>\r
@@ -337,7 +394,7 @@
         -$(DSYMUTIL) ${src}\r
         "$(GENFW)" -e $(MODULE_TYPE) -o ${dst} $(DEBUG_DIR)(+)$(MODULE_NAME).pecoff $(GENFW_FLAGS)\r
         $(CP) ${dst} $(OUTPUT_DIR)\r
-        $(CP) ${dst} $(BIN_DIR)\r
+        $(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).efi\r
         -$(CP) $(DEBUG_DIR)(+)*.map $(OUTPUT_DIR)\r
 \r
 [Dependency-Expression-File]\r
@@ -371,7 +428,7 @@
         Trim --source-code -l -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iiii $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii \r
         "$(ASL)" $(ASL_FLAGS) $(ASL_OUTFLAGS)${dst} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iiii\r
 \r
-    <Command.GCC>\r
+    <Command.GCC, Command.GCCLD>\r
         Trim --asl-file -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i -i $(INC_LIST) ${src}\r
         "$(ASLPP)" $(ASLPP_FLAGS) $(INC) -I${s_path} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i > $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii\r
         Trim --source-code -l -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iiii $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii \r
@@ -392,8 +449,8 @@
         "$(ASLDLINK)" /OUT:$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(ASLDLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj\r
         "$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(GENFW_FLAGS)\r
 \r
-    <Command.GCC>\r
-        "$(ASLCC)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(CC_FLAGS) $(ASLCC_FLAGS) $(INC) ${src}\r
+    <Command.GCC, Command.GCCLD>\r
+        "$(ASLCC)" -c -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(CC_FLAGS) $(ASLCC_FLAGS) $(INC) ${src}\r
         "$(ASLDLINK)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(ASLDLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj\r
         "$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(GENFW_FLAGS)\r
 \r
@@ -412,8 +469,8 @@
         "$(ASLDLINK)" /OUT:$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(ASLDLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj\r
         "$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(GENFW_FLAGS)\r
 \r
-    <Command.GCC>\r
-        "$(ASLCC)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(CC_FLAGS) $(ASLCC_FLAGS) $(INC) ${src}\r
+    <Command.GCC, Command.GCCLD>\r
+        "$(ASLCC)" -c -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(CC_FLAGS) $(ASLCC_FLAGS) $(INC) ${src}\r
         "$(ASLDLINK)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(ASLDLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj\r
         "$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(GENFW_FLAGS)\r
         \r
@@ -436,12 +493,12 @@
 \r
     <Command.MSFT, Command.INTEL>\r
         "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
-        Trim --source-code --convert-hex -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i\r
+        Trim --source-code --convert-hex --trim-long -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i\r
         cd $(OUTPUT_DIR)(+)${s_dir}\r
         "$(ASM16)" /nologo /c /omf $(INC) /Fo$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj ${d_path}(+)${s_base}.iii\r
         "$(ASMLINK)" $(ASMLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj,${dst},,,,\r
 \r
-    <Command.GCC>\r
+    <Command.GCC, Command.GCCLD>\r
       "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
       Trim --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i\r
       "$(ASM)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(ASM_FLAGS) $(INC) ${d_path}(+)${s_base}.iii\r
@@ -457,7 +514,7 @@
 \r
 [Nasm-to-Binary-Code-File]\r
     <InputFile>\r
-        ?.nasmb, ?.NASMB\r
+        ?.nasmb\r
 \r
     <ExtraDependency>\r
         $(MAKE_FILE)\r
@@ -469,7 +526,8 @@
         "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
         Trim --source-code --convert-hex -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i\r
         "$(NASM)" -I${s_path}(+) -l ${d_path}(+)${s_base}.lst $(NASMB_FLAGS) -o $dst ${d_path}(+)${s_base}.iii\r
-\r
+        # copy the output file with .com postfix that be same to the output file of .asm16\r
+        $(CP) ${dst} $(OUTPUT_DIR)(+)${s_base}.com\r
 \r
 [Microcode-File.USER_DEFINED, Microcode-File.Microcode]\r
     <InputFile>\r
@@ -493,7 +551,7 @@
 \r
     <Command>\r
         "$(GENFW)" -o ${dst} -j $(MICROCODE_BINARY_FILES) $(GENFW_FLAGS)\r
-        -$(CP) ${dst} $(BIN_DIR)\r
+        -$(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).bin\r
 \r
 [EFI-Image-File]\r
     <InputFile>\r
@@ -514,12 +572,23 @@
 \r
     <Command>\r
 \r
+[Image-Definition-File]\r
+    <InputFile>\r
+        *.idf, *.Idf, *.IDF\r
+\r
+    <OutputFile>\r
+        $(DEBUG_DIR)(+)AutoGen.c\r
+        $(DEBUG_DIR)(+)$(MODULE_NAME)ImgDefs.h\r
+        $(OUTPUT_DIR)(+)$(MODULE_NAME)Idf.hpk\r
+\r
+    <Command>\r
+\r
 [Efi-Image.UEFI_OPTIONROM]\r
     <InputFile>\r
         ?.efi, ?.EFI, ?.Efi\r
 \r
     <OutputFile>\r
-        $(BIN_DIR)(+)$(MODULE_NAME).rom\r
+        $(BIN_DIR)(+)$(MODULE_NAME_GUID).rom\r
 \r
     <Command>\r
         $(OPTROM) -i $(PCI_DEVICE_ID) -f $(PCI_VENDOR_ID) -l $(PCI_CLASS_CODE) -r $(PCI_REVISION) -o $dst $(OPTROM_FLAGS) $src\r
@@ -534,6 +603,16 @@
 \r
     <Command>\r
 \r
+[Image-Definition-File.UEFI_HII]\r
+    <InputFile>\r
+        *.idf, *.Idf, *.IDF\r
+\r
+    <OutputFile>\r
+        $(DEBUG_DIR)(+)$(MODULE_NAME)ImgDefs.h\r
+        $(OUTPUT_DIR)(+)$(MODULE_NAME)Idf.hpk\r
+\r
+    <Command>\r
+\r
 [Visual-Form-Representation-File.UEFI_HII]\r
     <InputFile>\r
         ?.vfr\r
@@ -557,18 +636,18 @@
     <OutputFile.MSFT, OutputFile.INTEL, OutputFile.GCC>\r
         $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.lib\r
 \r
-    <OutputFile.XCODE, OutputFile.RVCT, OutputFile.ARMGCC>\r
+    <OutputFile.XCODE, OutputFile.RVCT>\r
         $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc\r
 \r
     <Command.MSFT, Command.INTEL>\r
         "$(GENFW)" -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUID) --hiipackage $(HII_BINARY_PACKAGES) $(GENFW_FLAGS)\r
         "$(RC)" /Fo${dst} $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc\r
 \r
-    <Command.GCC>\r
+    <Command.GCC, Command.GCCLD>\r
         "$(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, Command.ARMLINUXGCC>  \r
+    <Command.XCODE, Command.RVCT>\r
         GenFw -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUID) --hiibinpackage $(HII_BINARY_PACKAGES)\r
         \r
         \r