Maintainers.txt: Update email address

[mirror_edk2.git] / ArmVirtPkg / ArmVirtQemu.fdf

diff --git a/ArmVirtPkg/ArmVirtQemu.fdf b/ArmVirtPkg/ArmVirtQemu.fdf
index c6a22dc018f37d7720727d8251118b583b6cde0a..b5e2253295fe1665ca58e810fbf3525cf258588f 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemu.fdf
+++ b/ArmVirtPkg/ArmVirtQemu.fdf
@@ -3,13 +3,7 @@
 #  Copyright (c) 2014, Linaro Limited. All rights reserved.\r
 #  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.\r
 #\r
-#  This program and the accompanying materials\r
-#  are licensed and made available under the terms and conditions of the BSD License\r
-#  which accompanies this distribution.  The full text of the license may be found at\r
-#  http://opensource.org/licenses/bsd-license.php\r
-#\r
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
 \r
 ################################################################################\r
@@ -26,14 +20,22 @@
 #\r
 ################################################################################\r
 \r
+[Defines]\r
+!if $(FD_SIZE_IN_MB) == 2\r
+  DEFINE FVMAIN_COMPACT_SIZE  = 0x1ff000\r
+!endif\r
+!if $(FD_SIZE_IN_MB) == 3\r
+  DEFINE FVMAIN_COMPACT_SIZE  = 0x2ff000\r
+!endif\r
+\r
 [FD.QEMU_EFI]\r
 BaseAddress   = 0x00000000|gArmTokenSpaceGuid.PcdFdBaseAddress  # QEMU assigns 0 - 0x8000000 for a BootROM\r
-Size          = 0x00200000|gArmTokenSpaceGuid.PcdFdSize         # The size in bytes of the FLASH Device\r
+Size          = $(FD_SIZE)|gArmTokenSpaceGuid.PcdFdSize         # The size in bytes of the FLASH Device\r
 ErasePolarity = 1\r
 \r
 # This one is tricky, it must be: BlockSize * NumBlocks = Size\r
 BlockSize     = 0x00001000\r
-NumBlocks     = 0x200\r
+NumBlocks     = $(FD_NUM_BLOCKS)\r
 \r
 ################################################################################\r
 #\r
@@ -65,7 +67,7 @@ DATA = {
 !endif\r
 }\r
 \r
-0x00001000|0x001ff000\r
+0x00001000|$(FVMAIN_COMPACT_SIZE)\r
 gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize\r
 FV = FVMAIN_COMPACT\r
 \r
@@ -111,6 +113,12 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/Variable/Pei/VariablePei.inf\r
   INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf\r
 \r
+!if $(TPM2_ENABLE) == TRUE\r
+  INF MdeModulePkg/Universal/ResetSystemPei/ResetSystemPei.inf\r
+  INF OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf\r
+  INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf\r
+!endif\r
+\r
   FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {\r
     SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE {\r
       SECTION FV_IMAGE = FVMAIN\r