OvmfPkg: build OVMF_VARS.fd, OVMF_CODE.fd, OVMF.fd

OVMF_VARS.fd and OVMF_CODE.fd split the variable store and the firmware
code in separate files.

The PCDs' values continue to depend only on FD_SIZE_1MB vs. FD_SIZE_2MB.
With the split files, it must be ensured on the QEMU command line that
OVMF_VARS.fd and OVMF_CODE.fd be contiguously mapped so that they end
exactly at 4GB. See QEMU commit 637a5acb (first released in v2.0.0).

In this patch we must take care to assign each PCD only once.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15670 6f19259b-4bc3-4df7-8a09-765794883524

5 files changed, 164 insertions, 65 deletions

diff --git a/OvmfPkg/OvmfPkg.fdf.inc b/OvmfPkg/OvmfPkg.fdf.inc
new file mode 100644
index 0000000000..486bbc61ea
--- /dev/null
+++ b/OvmfPkg/OvmfPkg.fdf.inc
@@ -0,0 +1,62 @@
+## @file

+#  FDF include file that defines the main macros and sets the dependent PCDs.

+#

+#  Copyright (C) 2014, Red Hat, Inc.

+#  Copyright (c) 2006 - 2013, 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 which accompanies this

+#  distribution. The full text of the license may be found at

+#  http://opensource.org/licenses/bsd-license.php

+#

+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR

+#  IMPLIED.

+#

+##

+

+DEFINE BLOCK_SIZE        = 0x1000

+DEFINE VARS_SIZE         = 0x20000

+DEFINE VARS_BLOCKS       = 0x20

+

+!ifdef $(FD_SIZE_1MB)

+

+DEFINE FW_BASE_ADDRESS   = 0xFFF00000

+DEFINE FW_SIZE           = 0x00100000

+DEFINE FW_BLOCKS         = 0x100

+DEFINE CODE_BASE_ADDRESS = 0xFFF20000

+DEFINE CODE_SIZE         = 0x000E0000

+DEFINE CODE_BLOCKS       = 0xE0

+DEFINE FVMAIN_SIZE       = 0x000CC000

+DEFINE SECFV_OFFSET      = 0x000EC000

+DEFINE SECFV_SIZE        = 0x14000

+

+!else

+

+DEFINE FW_BASE_ADDRESS   = 0xFFE00000

+DEFINE FW_SIZE           = 0x00200000

+DEFINE FW_BLOCKS         = 0x200

+DEFINE CODE_BASE_ADDRESS = 0xFFE20000

+DEFINE CODE_SIZE         = 0x001E0000

+DEFINE CODE_BLOCKS       = 0x1E0

+DEFINE FVMAIN_SIZE       = 0x001AC000

+DEFINE SECFV_OFFSET      = 0x001CC000

+DEFINE SECFV_SIZE        = 0x34000

+

+!endif

+

+SET gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFdBaseAddress     = $(FW_BASE_ADDRESS)

+SET gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFirmwareFdSize    = $(FW_SIZE)

+SET gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFirmwareBlockSize = $(BLOCK_SIZE)

+

+SET gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashNvStorageVariableBase = $(FW_BASE_ADDRESS)

+SET gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize = 0xE000

+

+SET gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashNvStorageEventLogBase = gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashNvStorageVariableBase + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize

+SET gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashNvStorageEventLogSize = $(BLOCK_SIZE)

+

+SET gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashNvStorageFtwWorkingBase = gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashNvStorageEventLogBase + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashNvStorageEventLogSize

+SET gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize = $(BLOCK_SIZE)

+

+SET gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashNvStorageFtwSpareBase = gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashNvStorageFtwWorkingBase + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize

+SET gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize = 0x10000

diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
index f47655cb62..243cff3762 100644
--- a/OvmfPkg/OvmfPkgIa32.fdf
+++ b/OvmfPkg/OvmfPkgIa32.fdf
@@ -28,38 +28,52 @@ DEFINE FD_SIZE_1MB=
 !endif

 !endif

 

-!ifdef $(FD_SIZE_1MB)

-[FD.OVMF]

-BaseAddress   = 0xFFF00000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFdBaseAddress

-Size          = 0x00100000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFirmwareFdSize

-ErasePolarity = 1

-BlockSize     = 0x1000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFirmwareBlockSize

-NumBlocks     = 0x100

-!else

+!include OvmfPkg.fdf.inc

+

+#

+# Build the variable store and the firmware code as one unified flash device

+# image.

+#

 [FD.OVMF]

-BaseAddress   = 0xFFE00000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFdBaseAddress

-Size          = 0x00200000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFirmwareFdSize

+BaseAddress   = $(FW_BASE_ADDRESS)

+Size          = $(FW_SIZE)

 ErasePolarity = 1

-BlockSize     = 0x1000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFirmwareBlockSize

-NumBlocks     = 0x200

-!endif

+BlockSize     = $(BLOCK_SIZE)

+NumBlocks     = $(FW_BLOCKS)

 

 !include VarStore.fdf.inc

 

-!ifdef $(FD_SIZE_1MB)

-0x00020000|0x000CC000

+$(VARS_SIZE)|$(FVMAIN_SIZE)

 FV = FVMAIN_COMPACT

 

-0x000EC000|0x14000

+$(SECFV_OFFSET)|$(SECFV_SIZE)

 FV = SECFV

 

-!else

-0x00020000|0x001AC000

+#

+# Build the variable store and the firmware code as separate flash device

+# images.

+#

+[FD.OVMF_VARS]

+BaseAddress   = $(FW_BASE_ADDRESS)

+Size          = $(VARS_SIZE)

+ErasePolarity = 1

+BlockSize     = $(BLOCK_SIZE)

+NumBlocks     = $(VARS_BLOCKS)

+

+!include VarStore.fdf.inc

+

+[FD.OVMF_CODE]

+BaseAddress   = $(CODE_BASE_ADDRESS)

+Size          = $(CODE_SIZE)

+ErasePolarity = 1

+BlockSize     = $(BLOCK_SIZE)

+NumBlocks     = $(CODE_BLOCKS)

+

+0x00000000|$(FVMAIN_SIZE)

 FV = FVMAIN_COMPACT

 

-0x001CC000|0x34000

+$(FVMAIN_SIZE)|$(SECFV_SIZE)

 FV = SECFV

-!endif

 

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

 

diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index dd705a83fb..67c5f9c4e0 100644
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -28,38 +28,52 @@ DEFINE FD_SIZE_1MB=
 !endif

 !endif

 

-!ifdef $(FD_SIZE_1MB)

-[FD.OVMF]

-BaseAddress   = 0xFFF00000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFdBaseAddress

-Size          = 0x00100000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFirmwareFdSize

-ErasePolarity = 1

-BlockSize     = 0x1000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFirmwareBlockSize

-NumBlocks     = 0x100

-!else

+!include OvmfPkg.fdf.inc

+

+#

+# Build the variable store and the firmware code as one unified flash device

+# image.

+#

 [FD.OVMF]

-BaseAddress   = 0xFFE00000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFdBaseAddress

-Size          = 0x00200000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFirmwareFdSize

+BaseAddress   = $(FW_BASE_ADDRESS)

+Size          = $(FW_SIZE)

 ErasePolarity = 1

-BlockSize     = 0x1000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFirmwareBlockSize

-NumBlocks     = 0x200

-!endif

+BlockSize     = $(BLOCK_SIZE)

+NumBlocks     = $(FW_BLOCKS)

 

 !include VarStore.fdf.inc

 

-!ifdef $(FD_SIZE_1MB)

-0x00020000|0x000CC000

+$(VARS_SIZE)|$(FVMAIN_SIZE)

 FV = FVMAIN_COMPACT

 

-0x000EC000|0x14000

+$(SECFV_OFFSET)|$(SECFV_SIZE)

 FV = SECFV

 

-!else

-0x00020000|0x001AC000

+#

+# Build the variable store and the firmware code as separate flash device

+# images.

+#

+[FD.OVMF_VARS]

+BaseAddress   = $(FW_BASE_ADDRESS)

+Size          = $(VARS_SIZE)

+ErasePolarity = 1

+BlockSize     = $(BLOCK_SIZE)

+NumBlocks     = $(VARS_BLOCKS)

+

+!include VarStore.fdf.inc

+

+[FD.OVMF_CODE]

+BaseAddress   = $(CODE_BASE_ADDRESS)

+Size          = $(CODE_SIZE)

+ErasePolarity = 1

+BlockSize     = $(BLOCK_SIZE)

+NumBlocks     = $(CODE_BLOCKS)

+

+0x00000000|$(FVMAIN_SIZE)

 FV = FVMAIN_COMPACT

 

-0x001CC000|0x34000

+$(FVMAIN_SIZE)|$(SECFV_SIZE)

 FV = SECFV

-!endif

 

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

 

diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index 6ec8e883c8..1b029b8be3 100644
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -28,38 +28,52 @@ DEFINE FD_SIZE_1MB=
 !endif

 !endif

 

-!ifdef $(FD_SIZE_1MB)

-[FD.OVMF]

-BaseAddress   = 0xFFF00000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFdBaseAddress

-Size          = 0x00100000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFirmwareFdSize

-ErasePolarity = 1

-BlockSize     = 0x1000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFirmwareBlockSize

-NumBlocks     = 0x100

-!else

+!include OvmfPkg.fdf.inc

+

+#

+# Build the variable store and the firmware code as one unified flash device

+# image.

+#

 [FD.OVMF]

-BaseAddress   = 0xFFE00000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFdBaseAddress

-Size          = 0x00200000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFirmwareFdSize

+BaseAddress   = $(FW_BASE_ADDRESS)

+Size          = $(FW_SIZE)

 ErasePolarity = 1

-BlockSize     = 0x1000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFirmwareBlockSize

-NumBlocks     = 0x200

-!endif

+BlockSize     = $(BLOCK_SIZE)

+NumBlocks     = $(FW_BLOCKS)

 

 !include VarStore.fdf.inc

 

-!ifdef $(FD_SIZE_1MB)

-0x00020000|0x000CC000

+$(VARS_SIZE)|$(FVMAIN_SIZE)

 FV = FVMAIN_COMPACT

 

-0x000EC000|0x14000

+$(SECFV_OFFSET)|$(SECFV_SIZE)

 FV = SECFV

 

-!else

-0x00020000|0x001AC000

+#

+# Build the variable store and the firmware code as separate flash device

+# images.

+#

+[FD.OVMF_VARS]

+BaseAddress   = $(FW_BASE_ADDRESS)

+Size          = $(VARS_SIZE)

+ErasePolarity = 1

+BlockSize     = $(BLOCK_SIZE)

+NumBlocks     = $(VARS_BLOCKS)

+

+!include VarStore.fdf.inc

+

+[FD.OVMF_CODE]

+BaseAddress   = $(CODE_BASE_ADDRESS)

+Size          = $(CODE_SIZE)

+ErasePolarity = 1

+BlockSize     = $(BLOCK_SIZE)

+NumBlocks     = $(CODE_BLOCKS)

+

+0x00000000|$(FVMAIN_SIZE)

 FV = FVMAIN_COMPACT

 

-0x001CC000|0x34000

+$(FVMAIN_SIZE)|$(SECFV_SIZE)

 FV = SECFV

-!endif

 

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

 

diff --git a/OvmfPkg/VarStore.fdf.inc b/OvmfPkg/VarStore.fdf.inc
index 59b46988bc..8f91e39591 100644
--- a/OvmfPkg/VarStore.fdf.inc
+++ b/OvmfPkg/VarStore.fdf.inc
@@ -16,7 +16,6 @@
 ##

 

 0x00000000|0x0000e000

-gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize

 #NV_VARIABLE_STORE

 DATA = {

   ## This is the EFI_FIRMWARE_VOLUME_HEADER

@@ -62,10 +61,8 @@ DATA = {
 

 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         =

@@ -80,5 +77,3 @@ DATA = {
 

 0x00010000|0x00010000

 #NV_FTW_SPARE

-gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize

-