Implemented feature request hsd202262 and incorporated SMM support

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

diff --git a/BaseTools/Bin/Win32/GenFds.exe b/BaseTools/Bin/Win32/GenFds.exe
index de91228890fe07b8add1001618c3a69d484473e7..3c99a52615bdd5d2d7de2e0d31f6924f8883e74f 100755 (executable)
Binary files a/BaseTools/Bin/Win32/GenFds.exe and b/BaseTools/Bin/Win32/GenFds.exe differ

diff --git a/BaseTools/Bin/Win32/GenFfs.exe b/BaseTools/Bin/Win32/GenFfs.exe
index 360d56a98c9b4fcf5528cfd2e6671a9f33d888cd..c43f7d383e2ae6e43aecb2016489b7c0347a830e 100755 (executable)
Binary files a/BaseTools/Bin/Win32/GenFfs.exe and b/BaseTools/Bin/Win32/GenFfs.exe differ

diff --git a/BaseTools/Bin/Win32/GenSec.exe b/BaseTools/Bin/Win32/GenSec.exe
index a226dab1dac369fbc5d3cf7a8f73db598ed4e546..0350f0e99a95d3f840756725640ca3ffb0a570f6 100755 (executable)
Binary files a/BaseTools/Bin/Win32/GenSec.exe and b/BaseTools/Bin/Win32/GenSec.exe differ

diff --git a/BaseTools/Bin/Win32/build.exe b/BaseTools/Bin/Win32/build.exe
index 9105bec833f7b6e71bb7083d59a366a677881b84..adc984b097d1700763b51c54e0405eabe6b435cb 100755 (executable)
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 3e3e379d26ed2906e83a5c2d00d8223af25e5def..27ebc20edee3bf3d7528eb28ee24b911dede1fdd 100644 (file)
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -380,3 +380,14 @@
         $(DEBUG_DIR)(+)$(MODULE_NAME)StrDefs.h\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
+\r
+    <Command>\r
+        $(OPTROM) -i $(PCI_DEVICE_ID) -f $(PCI_VENDOR_ID) -l $(PCI_CLASS_CODE) -o $dst $(OPTROM_FLAGS) $src\r
+\r

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index 113f4e238309e3ab40c651c4132fb18aa860064e..2b0d2d7ffce800ba661c454d8e3ad17525348cb8 100644 (file)
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -2028,6 +2028,12 @@ RELEASE_MYTOOLS_IPF_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_*_*_VFR_PATH                      = VfrCompile\r
 *_*_*_VFR_FLAGS                     = -l -n\r
 \r
+##################\r
+# OptionRom tool definitions\r
+##################\r
+*_*_*_OPTROM_PATH                   = EfiRom\r
+*_*_*_OPTROM_FLAGS                  = -e\r
+\r
 ##################\r
 # Asl Compiler definitions\r
 ##################\r