Merging uefi-next/linaro-release into masterlinaro-uefi-2013.12

Signed-off-by: Steven Kinney <steven.kinney@linaro.org>

1 files changed, 98 insertions, 12 deletions

diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index e2420c5cf..d7221950b 100644
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -14,28 +14,112 @@
 ##

 

 ################################################################################

+

+#

+# Default flash size for DEBUG build is 2MB. For RELEASE it is 1MB.

+#

+# Defining FD_SIZE_1MB or FD_SIZE_2MB on the build command line can

+# override this.

+#

+[Defines]

+!if $(TARGET) == RELEASE

 !ifndef $(FD_SIZE_2MB)

+DEFINE FD_SIZE_1MB=

+!endif

+!endif

+

+!ifdef $(FD_SIZE_1MB)

 [FD.OVMF]

-BaseAddress   = 0xFFF00000

-Size          = 0x00100000

+BaseAddress   = 0xFFF00000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFdBaseAddress

+Size          = 0x00100000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFirmwareFdSize

 ErasePolarity = 1

-BlockSize     = 0x1000

+BlockSize     = 0x1000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFirmwareBlockSize

 NumBlocks     = 0x100

+!else

+[FD.OVMF]

+BaseAddress   = 0xFFE00000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFdBaseAddress

+Size          = 0x00200000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFirmwareFdSize

+ErasePolarity = 1

+BlockSize     = 0x1000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFirmwareBlockSize

+NumBlocks     = 0x200

+!endif

 

-0x00000000|0x000EC000

+0x00000000|0x0000e000

+gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize

+#NV_VARIABLE_STORE

+DATA = {

+  ## This is the EFI_FIRMWARE_VOLUME_HEADER

+  # ZeroVector []

+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

+  # FileSystemGuid: gEfiSystemNvDataFvGuid         =

+  #   { 0xFFF12B8D, 0x7696, 0x4C8B,

+  #     { 0xA9, 0x85, 0x27, 0x47, 0x07, 0x5B, 0x4F, 0x50 }}

+  0x8D, 0x2B, 0xF1, 0xFF, 0x96, 0x76, 0x8B, 0x4C,

+  0xA9, 0x85, 0x27, 0x47, 0x07, 0x5B, 0x4F, 0x50,

+  # FvLength: 0x20000

+  0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,

+  # Signature "_FVH"       # Attributes

+  0x5f, 0x46, 0x56, 0x48, 0xff, 0xfe, 0x04, 0x00,

+  # HeaderLength # CheckSum # ExtHeaderOffset #Reserved #Revision

+  0x48, 0x00, 0x19, 0xF9, 0x00, 0x00, 0x00, 0x02,

+  # Blockmap[0]: 0x20 Blocks * 0x1000 Bytes / Block

+  0x20, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,

+  # Blockmap[1]: End

+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

+  ## This is the VARIABLE_STORE_HEADER

+!if $(SECURE_BOOT_ENABLE) == TRUE

+  # Signature: gEfiAuthenticatedVariableGuid =

+  #   { 0xaaf32c78, 0x947b, 0x439a,

+  #     { 0xa1, 0x80, 0x2e, 0x14, 0x4e, 0xc3, 0x77, 0x92 }}

+  0x78, 0x2c, 0xf3, 0xaa, 0x7b, 0x94, 0x9a, 0x43,

+  0xa1, 0x80, 0x2e, 0x14, 0x4e, 0xc3, 0x77, 0x92,

+!else

+  # Signature: gEfiVariableGuid =

+  #   { 0xddcf3616, 0x3275, 0x4164,

+  #     { 0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d }}

+  0x16, 0x36, 0xcf, 0xdd, 0x75, 0x32, 0x64, 0x41,

+  0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d,

+!endif

+  # Size: 0xe000 (gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize) -

+  #         0x48 (size of EFI_FIRMWARE_VOLUME_HEADER) = 0xdfb8

+  # This can speed up the Variable Dispatch a bit.

+  0xB8, 0xDF, 0x00, 0x00,

+  # FORMATTED: 0x5A #HEALTHY: 0xFE #Reserved: UINT16 #Reserved1: UINT32

+  0x5A, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

+}

+

+0x0000e000|0x00001000

+#NV_EVENT_LOG

+gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashNvStorageEventLogBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashNvStorageEventLogSize

+

+0x0000f000|0x00001000

+gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize

+#NV_FTW_WORKING

+DATA = {

+  # EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER->Signature = gEdkiiWorkingBlockSignatureGuid         =

+  #  { 0x9e58292b, 0x7c68, 0x497d, { 0xa0, 0xce, 0x65,  0x0, 0xfd, 0x9f, 0x1b, 0x95 }}

+  0x2b, 0x29, 0x58, 0x9e, 0x68, 0x7c, 0x7d, 0x49,

+  0xa0, 0xce, 0x65,  0x0, 0xfd, 0x9f, 0x1b, 0x95,

+  # Crc:UINT32            #WorkingBlockValid:1, WorkingBlockInvalid:1, Reserved

+  0x2c, 0xaf, 0x2c, 0x64, 0xFE, 0xFF, 0xFF, 0xFF,

+  # WriteQueueSize: UINT64

+  0xE0, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

+}

+

+0x00010000|0x00010000

+#NV_FTW_SPARE

+gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize

+

+!ifdef $(FD_SIZE_1MB)

+0x00020000|0x000CC000

 FV = FVMAIN_COMPACT

 

 0x000EC000|0x14000

 FV = SECFV

-!else

-[FD.OVMF]

-BaseAddress   = 0xFFE00000

-Size          = 0x00200000

-ErasePolarity = 1

-BlockSize     = 0x1000

-NumBlocks     = 0x200

 

-0x00000000|0x001CC000

+!else

+0x00020000|0x001AC000

 FV = FVMAIN_COMPACT

 

 0x001CC000|0x34000

@@ -157,6 +241,7 @@ READ_LOCK_STATUS   = TRUE
 APRIORI DXE {

   INF  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf

   INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf

+  INF  OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf

 }

 

 #

@@ -184,6 +269,7 @@ INF  OvmfPkg/BlockMmioToBlockIoDxe/BlockIo.inf
 INF  OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf
 INF  OvmfPkg/VirtioBlkDxe/VirtioBlk.inf

 INF  OvmfPkg/VirtioScsiDxe/VirtioScsi.inf

+INF  OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf

 INF  OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.inf

 INF  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf