Revision: 15824
http://sourceforge.net/p/edk2/code/15824
Author: jljusten
Date: 2014-08-18 23:04:00 +0000 (Mon, 18 Aug 2014)
Log Message:
-----------
OvmfPkg: Build OVMF ResetVector during EDK II build process
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <[email protected]>
Reviewed-by: Liming Gao <[email protected]>
Modified Paths:
--------------
trunk/edk2/OvmfPkg/OvmfPkgIa32.dsc
trunk/edk2/OvmfPkg/OvmfPkgIa32.fdf
trunk/edk2/OvmfPkg/OvmfPkgIa32X64.dsc
trunk/edk2/OvmfPkg/OvmfPkgIa32X64.fdf
trunk/edk2/OvmfPkg/OvmfPkgX64.dsc
trunk/edk2/OvmfPkg/OvmfPkgX64.fdf
trunk/edk2/OvmfPkg/README
Modified: trunk/edk2/OvmfPkg/OvmfPkgIa32.dsc
===================================================================
--- trunk/edk2/OvmfPkg/OvmfPkgIa32.dsc 2014-08-18 23:03:53 UTC (rev 15823)
+++ trunk/edk2/OvmfPkg/OvmfPkgIa32.dsc 2014-08-18 23:04:00 UTC (rev 15824)
@@ -337,6 +337,8 @@
#
################################################################################
[Components]
+ OvmfPkg/ResetVector/ResetVector.inf
+
#
# SEC Phase modules
#
Modified: trunk/edk2/OvmfPkg/OvmfPkgIa32.fdf
===================================================================
--- trunk/edk2/OvmfPkg/OvmfPkgIa32.fdf 2014-08-18 23:03:53 UTC (rev 15823)
+++ trunk/edk2/OvmfPkg/OvmfPkgIa32.fdf 2014-08-18 23:04:00 UTC (rev 15824)
@@ -1,7 +1,7 @@
## @file
# Open Virtual Machine Firmware: FDF
#
-# Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD
License
@@ -136,7 +136,7 @@
#
INF OvmfPkg/Sec/SecMain.inf
-INF RuleOverride=RESET_VECTOR UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.inf
+INF RuleOverride=RESET_VECTOR OvmfPkg/ResetVector/ResetVector.inf
################################################################################
[FV.PEIFV]
@@ -452,5 +452,5 @@
[Rule.Common.SEC.RESET_VECTOR]
FILE RAW = $(NAMED_GUID) {
- RAW RAW |.raw
+ RAW BIN Align = 16 |.bin
}
Modified: trunk/edk2/OvmfPkg/OvmfPkgIa32X64.dsc
===================================================================
--- trunk/edk2/OvmfPkg/OvmfPkgIa32X64.dsc 2014-08-18 23:03:53 UTC (rev
15823)
+++ trunk/edk2/OvmfPkg/OvmfPkgIa32X64.dsc 2014-08-18 23:04:00 UTC (rev
15824)
@@ -343,6 +343,8 @@
#
################################################################################
[Components.IA32]
+ OvmfPkg/ResetVector/ResetVector.inf
+
#
# SEC Phase modules
#
Modified: trunk/edk2/OvmfPkg/OvmfPkgIa32X64.fdf
===================================================================
--- trunk/edk2/OvmfPkg/OvmfPkgIa32X64.fdf 2014-08-18 23:03:53 UTC (rev
15823)
+++ trunk/edk2/OvmfPkg/OvmfPkgIa32X64.fdf 2014-08-18 23:04:00 UTC (rev
15824)
@@ -1,7 +1,7 @@
## @file
# Open Virtual Machine Firmware: FDF
#
-# Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD
License
@@ -136,7 +136,7 @@
#
INF OvmfPkg/Sec/SecMain.inf
-INF RuleOverride=RESET_VECTOR USE = IA32
UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.inf
+INF RuleOverride=RESET_VECTOR OvmfPkg/ResetVector/ResetVector.inf
################################################################################
[FV.PEIFV]
@@ -452,5 +452,5 @@
[Rule.Common.SEC.RESET_VECTOR]
FILE RAW = $(NAMED_GUID) {
- RAW RAW |.raw
+ RAW BIN Align = 16 |.bin
}
Modified: trunk/edk2/OvmfPkg/OvmfPkgX64.dsc
===================================================================
--- trunk/edk2/OvmfPkg/OvmfPkgX64.dsc 2014-08-18 23:03:53 UTC (rev 15823)
+++ trunk/edk2/OvmfPkg/OvmfPkgX64.dsc 2014-08-18 23:04:00 UTC (rev 15824)
@@ -342,6 +342,8 @@
#
################################################################################
[Components]
+ OvmfPkg/ResetVector/ResetVector.inf
+
#
# SEC Phase modules
#
Modified: trunk/edk2/OvmfPkg/OvmfPkgX64.fdf
===================================================================
--- trunk/edk2/OvmfPkg/OvmfPkgX64.fdf 2014-08-18 23:03:53 UTC (rev 15823)
+++ trunk/edk2/OvmfPkg/OvmfPkgX64.fdf 2014-08-18 23:04:00 UTC (rev 15824)
@@ -1,7 +1,7 @@
## @file
# Open Virtual Machine Firmware: FDF
#
-# Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD
License
@@ -136,7 +136,7 @@
#
INF OvmfPkg/Sec/SecMain.inf
-INF RuleOverride=RESET_VECTOR OvmfPkg/ResetVector/Bin/ResetVector.inf
+INF RuleOverride=RESET_VECTOR OvmfPkg/ResetVector/ResetVector.inf
################################################################################
[FV.PEIFV]
@@ -452,5 +452,5 @@
[Rule.Common.SEC.RESET_VECTOR]
FILE RAW = $(NAMED_GUID) {
- RAW RAW |.raw
+ RAW BIN Align = 16 |.bin
}
Modified: trunk/edk2/OvmfPkg/README
===================================================================
--- trunk/edk2/OvmfPkg/README 2014-08-18 23:03:53 UTC (rev 15823)
+++ trunk/edk2/OvmfPkg/README 2014-08-18 23:04:00 UTC (rev 15824)
@@ -30,6 +30,7 @@
* A properly configured ASL compiler:
- Intel ASL compiler: Available from http://www.acpica.org
- Microsoft ASL compiler: Available from http://www.acpi.info
+* NASM: http://www.nasm.us/
Update Conf/target.txt ACTIVE_PLATFORM for OVMF:
PEI arch DXE arch UEFI interfaces
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
