UefiCpuPkg: Move AsmRelocateApLoopStart from Mpfuncs.nasm to AmdSev.nasm

[mirror_edk2.git] / ArmVirtPkg / ArmVirtXen.fdf

diff --git a/ArmVirtPkg/ArmVirtXen.fdf b/ArmVirtPkg/ArmVirtXen.fdf
index 653aa30b4d33a65fedf72cb8870271b82dd03b07..770fbf7289be49865f7ea9498a507047b4a9be3f 100644 (file)
--- a/ArmVirtPkg/ArmVirtXen.fdf
+++ b/ArmVirtPkg/ArmVirtXen.fdf
@@ -1,15 +1,9 @@
 #\r
 #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.\r
 #  Copyright (c) 2014, Linaro Limited. All rights reserved.\r
-#  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2015 - 2019, Intel Corporation. All rights reserved.<BR>\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  = 0x1fe000\r
+!endif\r
+!if $(FD_SIZE_IN_MB) == 3\r
+  DEFINE FVMAIN_COMPACT_SIZE  = 0x2fe000\r
+!endif\r
+\r
 [FD.XEN_EFI]\r
 BaseAddress   = 0x00000000|gArmTokenSpaceGuid.PcdFdBaseAddress\r
-Size          = 0x00200000|gArmTokenSpaceGuid.PcdFdSize\r
+Size          = $(FD_SIZE)|gArmTokenSpaceGuid.PcdFdSize\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
@@ -62,7 +64,12 @@ DATA = {
   0x01, 0x00, 0x00, 0x10,                         # code0: adr x1, .\r
   0xff, 0x07, 0x00, 0x14,                         # code1: b 0x2000\r
   0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, # text_offset: 512 KB\r
+!if $(FD_SIZE_IN_MB) == 2\r
   0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, # image_size: 2 MB\r
+!endif\r
+!if $(FD_SIZE_IN_MB) == 3\r
+  0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, # image_size: 3 MB\r
+!endif\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, # flags\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, # res2\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, # res3\r
@@ -82,12 +89,17 @@ DATA = {
   0xf6, 0x07, 0x00, 0xea, # b 0x2000\r
   0x18, 0x28, 0x6f, 0x01, # magic\r
   0x00, 0x00, 0x00, 0x00, # start\r
+!if $(FD_SIZE_IN_MB) == 2\r
   0x00, 0x00, 0x20, 0x00, # image size: 2 MB\r
+!endif\r
+!if $(FD_SIZE_IN_MB) == 3\r
+  0x00, 0x00, 0x30, 0x00, # image size: 3 MB\r
+!endif\r
   0x01, 0x02, 0x03, 0x04  # endiannness flag\r
 !endif\r
 }\r
 \r
-0x00002000|0x001fe000\r
+0x00002000|$(FVMAIN_COMPACT_SIZE)\r
 gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize\r
 FV = FVMAIN_COMPACT\r
 \r
@@ -104,6 +116,7 @@ FV = FVMAIN_COMPACT
 ################################################################################\r
 \r
 [FV.FvMain]\r
+FvNameGuid         = 4d2d8743-6337-4c3f-a1d9-7cc7efd283db\r
 BlockSize          = 0x40\r
 NumBlocks          = 0         # This FV gets compressed so make it just big enough\r
 FvAlignment        = 16        # FV alignment and FV attributes setting.\r
@@ -126,7 +139,7 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Core/Dxe/DxeMain.inf\r
   INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
   INF ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.inf\r
-  INF ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf\r
+  INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf\r
 \r
   #\r
   # PI DXE Drivers producing Architectural Protocols (EFI Services)\r
@@ -136,10 +149,10 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf\r
   INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf\r
 \r
-  INF MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf\r
+  INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf\r
 \r
   INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf\r
-  INF EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf\r
+  INF MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf\r
   INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf\r
   INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf\r
   INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf\r
@@ -162,11 +175,12 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
   INF FatPkg/EnhancedFatDxe/Fat.inf\r
   INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf\r
+  INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf\r
 \r
-  #\r
-  # UEFI application (Shell Embedded Boot Loader)\r
-  #\r
   INF ShellPkg/Application/Shell/Shell.inf\r
+  INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf\r
+  INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf\r
+  INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf\r
 \r
   #\r
   # Bds\r
@@ -174,7 +188,8 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
   INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf\r
   INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf\r
-  INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf\r
+  INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf\r
+  INF MdeModulePkg/Application/UiApp/UiApp.inf\r
 \r
   INF OvmfPkg/XenBusDxe/XenBusDxe.inf\r
   INF OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.inf\r
@@ -182,11 +197,17 @@ READ_LOCK_STATUS   = TRUE
   #\r
   # ACPI support\r
   #\r
+  INF ArmVirtPkg/XenPlatformHasAcpiDtDxe/XenPlatformHasAcpiDtDxe.inf\r
 !if $(ARCH) == AARCH64\r
   INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf\r
   INF ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf\r
 !endif\r
 \r
+ #\r
+ # Ramdisk support\r
+ #\r
+ INF MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf\r
+\r
 [FV.FVMAIN_COMPACT]\r
 FvAlignment        = 16\r
 ERASE_POLARITY     = 1\r
@@ -205,7 +226,7 @@ READ_STATUS        = TRUE
 READ_LOCK_CAP      = TRUE\r
 READ_LOCK_STATUS   = TRUE\r
 \r
-  INF ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf\r
+  INF RuleOverride = SELF_RELOC ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf\r
 \r
   FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {\r
     SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE {\r