OvmfPkg: Build OVMF ResetVector during EDK II build process

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15824 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index f7064b737004f92aca8b00ba35a47a370b796ef5..1ceb9099ea20d8c85fb2783a74dba71283a2538b 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -337,6 +337,8 @@
 #\r
 ################################################################################\r
 [Components]\r
+  OvmfPkg/ResetVector/ResetVector.inf\r
+\r
   #\r
   # SEC Phase modules\r
   #\r

diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
index 243cff3762b659a0c4feb15b19719d583b01eb7c..e9714456336b7fc76a41208bdd086288a971afe9 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32.fdf
+++ b/OvmfPkg/OvmfPkgIa32.fdf
@@ -1,7 +1,7 @@
 ## @file\r
 #  Open Virtual Machine Firmware: FDF\r
 #\r
-#  Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -136,7 +136,7 @@ READ_LOCK_STATUS   = TRUE
 #\r
 INF  OvmfPkg/Sec/SecMain.inf\r
 \r
-INF  RuleOverride=RESET_VECTOR UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.inf\r
+INF  RuleOverride=RESET_VECTOR OvmfPkg/ResetVector/ResetVector.inf\r
 \r
 ################################################################################\r
 [FV.PEIFV]\r
@@ -452,5 +452,5 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
 \r
 [Rule.Common.SEC.RESET_VECTOR]\r
   FILE RAW = $(NAMED_GUID) {\r
-    RAW RAW                |.raw\r
+    RAW BIN   Align = 16   |.bin\r
   }\r

diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index 26d1132a85fe05b58889142d8853ac64c75abe6d..66a4bc322f2fa61b17acf3411c65f0e5f60abbe9 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -343,6 +343,8 @@
 #\r
 ################################################################################\r
 [Components.IA32]\r
+  OvmfPkg/ResetVector/ResetVector.inf\r
+\r
   #\r
   # SEC Phase modules\r
   #\r

diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index 67c5f9c4e0dd4da1777f3f266b7ee16665f9787e..218a78eb9efbeef41e10d013053b3f0c399dde87 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -1,7 +1,7 @@
 ## @file\r
 #  Open Virtual Machine Firmware: FDF\r
 #\r
-#  Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -136,7 +136,7 @@ READ_LOCK_STATUS   = TRUE
 #\r
 INF  OvmfPkg/Sec/SecMain.inf\r
 \r
-INF  RuleOverride=RESET_VECTOR USE = IA32 UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.inf\r
+INF  RuleOverride=RESET_VECTOR OvmfPkg/ResetVector/ResetVector.inf\r
 \r
 ################################################################################\r
 [FV.PEIFV]\r
@@ -452,5 +452,5 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
 \r
 [Rule.Common.SEC.RESET_VECTOR]\r
   FILE RAW = $(NAMED_GUID) {\r
-    RAW RAW                |.raw\r
+    RAW BIN   Align = 16   |.bin\r
   }\r

diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index 66459c217f0af2def0ec5f53ff010e3ed890776e..73a6460a4ecb971cf39b7031c0b9e4c713c25714 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -342,6 +342,8 @@
 #\r
 ################################################################################\r
 [Components]\r
+  OvmfPkg/ResetVector/ResetVector.inf\r
+\r
   #\r
   # SEC Phase modules\r
   #\r

diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index 1b029b8be398465419af5be6bc3b0494ec10036a..29382fb8f866eb136f48ccbb372ea5d6c3f6076b 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -1,7 +1,7 @@
 ## @file\r
 #  Open Virtual Machine Firmware: FDF\r
 #\r
-#  Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -136,7 +136,7 @@ READ_LOCK_STATUS   = TRUE
 #\r
 INF  OvmfPkg/Sec/SecMain.inf\r
 \r
-INF  RuleOverride=RESET_VECTOR OvmfPkg/ResetVector/Bin/ResetVector.inf\r
+INF  RuleOverride=RESET_VECTOR OvmfPkg/ResetVector/ResetVector.inf\r
 \r
 ################################################################################\r
 [FV.PEIFV]\r
@@ -452,5 +452,5 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
 \r
 [Rule.Common.SEC.RESET_VECTOR]\r
   FILE RAW = $(NAMED_GUID) {\r
-    RAW RAW                |.raw\r
+    RAW BIN   Align = 16   |.bin\r
   }\r

diff --git a/OvmfPkg/README b/OvmfPkg/README
index 3243dc685c67ac5214dfc5dafde70791a5d6b9ca..44942e67eab536f418da374d257a1be324039306 100644 (file)
--- a/OvmfPkg/README
+++ b/OvmfPkg/README
@@ -30,6 +30,7 @@ Pre-requisites:
 * A properly configured ASL compiler:\r
   - Intel ASL compiler: Available from http://www.acpica.org\r
   - Microsoft ASL compiler: Available from http://www.acpi.info\r
+* NASM: http://www.nasm.us/\r
 \r
 Update Conf/target.txt ACTIVE_PLATFORM for OVMF:\r
                              PEI arch   DXE arch   UEFI interfaces\r