diff options
| author | Steven Kinney <steven.kinney@linaro.org> | 2013-11-22 08:15:09 -0600 |
|---|---|---|
| committer | Steven Kinney <steven.kinney@linaro.org> | 2013-11-22 08:15:09 -0600 |
| commit | aec0833cc55918a9111af736171ba8ceb976824e (patch) | |
| tree | 3b188d6e0c1075a5df74f724bb302486454e25e8 /OvmfPkg/OvmfPkgX64.fdf | |
| parent | e08b4a7ea684e3358f0281da5e23ae03b1b14116 (diff) | |
| parent | 0caeca1501ec2edee346a3108f45e556e7905204 (diff) | |
Merging uefi-next/linaro-release into masterlinaro-uefi-2013.11
Signed-off-by: Steven Kinney <steven.kinney@linaro.org>
Diffstat (limited to 'OvmfPkg/OvmfPkgX64.fdf')
| -rw-r--r-- | OvmfPkg/OvmfPkgX64.fdf | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index a7c9bcd6a..e2420c5cf 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -22,10 +22,10 @@ ErasePolarity = 1 BlockSize = 0x1000
NumBlocks = 0x100
-0x00000000|0x000E6000
+0x00000000|0x000EC000
FV = FVMAIN_COMPACT
-0x000E6000|0x1A000
+0x000EC000|0x14000
FV = SECFV
!else
[FD.OVMF]
@@ -83,7 +83,7 @@ READ_LOCK_STATUS = TRUE #
INF OvmfPkg/Sec/SecMain.inf
-INF RuleOverride=RESET_VECTOR UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.inf
+INF RuleOverride=RESET_VECTOR OvmfPkg/ResetVector/Bin/ResetVector.inf
################################################################################
[FV.MAINFV]
@@ -181,6 +181,7 @@ INF MdeModulePkg/Universal/Metronome/Metronome.inf INF PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
INF OvmfPkg/BlockMmioToBlockIoDxe/BlockIo.inf
+INF OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
INF OvmfPkg/VirtioScsiDxe/VirtioScsi.inf
INF OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.inf
|