Update GenFw and Genfv tool to support Microcode and FvMap. And Update build rules...

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

diff --git a/BaseTools/Bin/Win32/GenFv.exe b/BaseTools/Bin/Win32/GenFv.exe
index 38417c599f6647dcfe9f42b2f582000466aa3248..a46e5e6b1cd6661fa28f1cf8be28c1fa5989953f 100755 (executable)
Binary files a/BaseTools/Bin/Win32/GenFv.exe and b/BaseTools/Bin/Win32/GenFv.exe differ

diff --git a/BaseTools/Bin/Win32/GenFw.exe b/BaseTools/Bin/Win32/GenFw.exe
index 857ffbedddddcb4a8f24ee961ee6e6280fac11df..10834538d2c398f22c6583b4e93bb4d6a15d0a2a 100755 (executable)
Binary files a/BaseTools/Bin/Win32/GenFw.exe and b/BaseTools/Bin/Win32/GenFw.exe differ

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index eee3e0df48f0af3a6e9c49928131ab452d99507f..a45bf1f80039bad20e5bc85b125291ef3c6b7eb5 100644 (file)
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -25,6 +25,7 @@ FileTypeMapping = {
     ".dxs"  :   "Dependency-Expression",
     ".Dxs"  :   "Dependency-Expression",
     ".DXS"  :   "Dependency-Expression",
     ".dxs"  :   "Dependency-Expression",
     ".Dxs"  :   "Dependency-Expression",
     ".DXS"  :   "Dependency-Expression",

+    ".TXT"  :   "MicorCode-Text",

     ".fv"   :   "FirmwareVolume",
     ".Fv"   :   "FirmwareVolume",
     ".FV"   :   "FirmwareVolume",
     ".fv"   :   "FirmwareVolume",
     ".Fv"   :   "FirmwareVolume",
     ".FV"   :   "FirmwareVolume",


@@ -66,6 +67,7 @@ ObjectFileMapping = {
     "Acpi-Source-Language"          :   ".aml",
     "Acpi-Table-Source"             :   ".acpi",
     "Masm16-Code"                   :   ".com",
     "Acpi-Source-Language"          :   ".aml",
     "Acpi-Table-Source"             :   ".acpi",
     "Masm16-Code"                   :   ".com",

+    "MicorCode-Text"                :   ".bin",

 }
 
 DefaultToolCode = ["CC", "ASM", "SLINK", "DLINK", "PCH", "PP", "ASL", "ASMLINK"]
 }
 
 DefaultToolCode = ["CC", "ASM", "SLINK", "DLINK", "PCH", "PP", "ASL", "ASMLINK"]


@@ -104,6 +106,7 @@ ToolChainFamilyMapping = {
     "Acpi-Source-Language"          :   ["MSFT", "INTEL"],
     "Acpi-Table-Source"             :   ["MSFT", "INTEL"],
     "Masm16-Code"                   :   ["MSFT"],
     "Acpi-Source-Language"          :   ["MSFT", "INTEL"],
     "Acpi-Table-Source"             :   ["MSFT", "INTEL"],
     "Masm16-Code"                   :   ["MSFT"],

+    "MicorCode-Text"                :   ["MSFT", "INTEL"], 

 }
 
 ## Build rules for makefile
 }
 
 ## Build rules for makefile


@@ -173,11 +176,18 @@ ${END}\t"$(CC)" /Fo$(@D)${_sep_}${fbase}.obj $(CC_FLAGS) $(INC) $(WORKSPACE)${_s
 
 "Masm16-Code" : '''\
 $(OUTPUT_DIR)${_sep_}${fdir}${_sep_}${fbase}.com : $(COMMON_DEPS)
 
 "Masm16-Code" : '''\
 $(OUTPUT_DIR)${_sep_}${fdir}${_sep_}${fbase}.com : $(COMMON_DEPS)

-\tpushd .
+${BEGIN}$(OUTPUT_DIR)${_sep_}${fdir}${_sep_}${fbase}.com : $(WORKSPACE)${_sep_}${fdep}
+${END}\tpushd .

 \tcd $(OUTPUT_DIR)${_sep_}${fdir}
 \t"$(ASM)" /nologo /omf $(WORKSPACE)${_sep_}${fpath} /Bl"$(ASMLINK)" $(ASMLINK_FLAGS)
 \t-copy ${fbase}.com $(OUTPUT_DIR)${_sep_}${fbase}.com /Y & popd
 ''',
 \tcd $(OUTPUT_DIR)${_sep_}${fdir}
 \t"$(ASM)" /nologo /omf $(WORKSPACE)${_sep_}${fpath} /Bl"$(ASMLINK)" $(ASMLINK_FLAGS)
 \t-copy ${fbase}.com $(OUTPUT_DIR)${_sep_}${fbase}.com /Y & popd
 ''',

+
+"MicorCode-Text" : '''\
+$(OUTPUT_DIR)${_sep_}${fdir}${_sep_}${fbase}.bin : $(COMMON_DEPS)
+${BEGIN}$(OUTPUT_DIR)${_sep_}${fdir}${_sep_}${fbase}.bin : $(WORKSPACE)${_sep_}${fdep}
+${END}\tGenFw -o $@ -m $(WORKSPACE)${_sep_}${fpath}
+''',

 },
 
 #
 },
 
 #