1. Fixed PCD SizeTable issue in AutoGen.c

2. Added ACPI table module support
3. Added USER_DEFINED support for SEC module

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

diff --git a/BaseTools/Bin/Win32/build.exe b/BaseTools/Bin/Win32/build.exe
index 055d212469f8feece4238bdf225b5ea49028e310..0be2f1014bb798fc2c1c238ba11f501fd9963be3 100644 (file)
Binary files a/BaseTools/Bin/Win32/build.exe and b/BaseTools/Bin/Win32/build.exe differ

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index e389ede4b22a3ac9cb2d31d730d335c7a3adb652..2cabd4fd39cfc07908cb012dd4ab4f77e2738a8e 100644 (file)
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -38,6 +38,7 @@ FileTypeMapping = {
     ".asl"  :   "Acpi-Source-Language",
     ".Asl"  :   "Acpi-Source-Language",
     ".ASL"  :   "Acpi-Source-Language",
+    ".aslc" :   "Acpi-Table-Source",
     ".obj"  :   "Object",
     ".o"    :   "Object",
     ".lib"  :   "Static-Library",
@@ -46,6 +47,22 @@ FileTypeMapping = {
     ".so"   :   "Dynamic-Library",
 }
 
+ObjectFileMapping = {
+    "C-Code"                        :   ".obj",
+#    "C-Header"                      :   ".gch",
+    "Masm-Code"                     :   ".obj",
+    "Iasm-Code"                     :   ".obj",      # IPF assembly code
+    "Gasm-Code"                     :   ".obj",      # GNU assembly code
+    "Visual-Form-Representation"    :   ".obj",
+    "Preprocessed-Code"             :   ".obj",
+    "Object"                        :   ".dll",
+    "Static-Library"                :   ".dll",
+               "Dynamic-Library"               :   ".efi",
+    "Dependency-Expression"         :   ".depex",
+               "Acpi-Source-Language"          :   ".aml",
+               "Acpi-Table-Source"             :   ".acpi",
+}
+
 DefaultToolCode = ["CC", "ASM", "SLINK", "DLINK", "PCH", "PP", "ASL"]
 
 ToolCodeMapping = {
@@ -60,6 +77,8 @@ ToolCodeMapping = {
     "Object"                        :   ["SLINK"],
     "Static-Library"                :   ["DLINK"],
     "Dependency-Expression"         :   ["PP"],
+               "Acpi-Source-Language"          :   ["PP", "ASL"],
+               "Acpi-Table-Source"             :   ["CC", "DLINK"],
 }
 
 ToolChainFamilyMapping = {
@@ -124,6 +143,23 @@ ${END}\t"$(PP)" $(VFRPP_FLAGS) $(INC) $(WORKSPACE)${_sep_}${fpath} > $(@D)${_sep
 \tVfrCompile -od $(DEBUG_DIR)${_sep_}${fdir} $(@D)${_sep_}${fbase}.iii
 \t"$(CC)" /Fo$@ $(CC_FLAGS) $(INC) $(DEBUG_DIR)${_sep_}${fdir}${_sep_}${fbase}.c
 ''',
+
+"Acpi-Source-Language" :
+'''
+$(OUTPUT_DIR)${_sep_}${fdir}${_sep_}${fbase}.aml : $(COMMON_DEPS)
+${BEGIN}$(OUTPUT_DIR)${_sep_}${fdir}${_sep_}${fbase}.aml : $(WORKSPACE)${_sep_}${fdep}
+${END}\t"$(PP)" $(APP_FLAGS) $(INC) $(WORKSPACE)${_sep_}${fpath} > $(@D)${_sep_}${fbase}.i
+\t"$(ASL)" /nologo /Fo$@ $(@D)${_sep_}${fbase}.i
+''',
+
+"Acpi-Table-Source" :
+'''
+$(OUTPUT_DIR)${_sep_}${fdir}${_sep_}${fbase}.acpi : $(COMMON_DEPS)
+${BEGIN}$(OUTPUT_DIR)${_sep_}${fdir}${_sep_}${fbase}.acpi : $(WORKSPACE)${_sep_}${fdep}
+${END}\t"$(CC)" /Fo$(@D)${_sep_}${fbase}.obj $(CC_FLAGS) $(INC) $(WORKSPACE)${_sep_}${fpath}
+\t"$(DLINK)" /out:$(@D)${_sep_}${fbase}.dll $(DLINK_FLAGS) $(DLINK_SPATH) $(LIBS)
+\tGenFw -o $@ -c $(@D)${_sep_}${fbase}.dll
+''',
 },
 
 #