ArmPlatformPkg/ArmVExpressDxe: Load FDT into the EFI Configuration Table

[mirror_edk2.git] / ArmPlatformPkg / ArmVExpressPkg / ArmVExpress-FVP-AArch64.fdf

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf
index a74878ba2bda6fd6ab48c604e673412af11a8b7f..1c709771b5716f77460943de1ae08c817f7f56b7 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf
@@ -1,5 +1,5 @@
 #\r
-#  Copyright (c) 2011 - 2013, ARM Limited. All rights reserved.\r
+#  Copyright (c) 2011 - 2015, ARM Limited. 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
@@ -54,7 +54,11 @@ gArmTokenSpaceGuid.PcdSecureFvBaseAddress|gArmTokenSpaceGuid.PcdSecureFvSize
 FV = FVMAIN_SEC\r
 \r
 [FD.FVP_AARCH64_EFI]\r
+!ifdef ARM_FVP_RUN_NORFLASH\r
 BaseAddress   = 0x08000000|gArmTokenSpaceGuid.PcdFdBaseAddress  # The base address of the Firmware in Flash0.\r
+!else\r
+BaseAddress   = 0x88000000|gArmTokenSpaceGuid.PcdFdBaseAddress  # UEFI in DRAM + 128MB.\r
+!endif\r
 Size          = 0x04000000|gArmTokenSpaceGuid.PcdFdSize         # The size in bytes of the device (64MiB).\r
 ErasePolarity = 1\r
 \r
@@ -120,7 +124,12 @@ READ_STATUS        = TRUE
 READ_LOCK_CAP      = TRUE\r
 READ_LOCK_STATUS   = TRUE\r
 \r
+  APRIORI DXE {\r
+    INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
+  }\r
+\r
   INF MdeModulePkg/Core/Dxe/DxeMain.inf\r
+  INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
 \r
   #\r
   # PI DXE Drivers producing Architectural Protocols (EFI Services)\r
@@ -179,9 +188,14 @@ READ_LOCK_STATUS   = TRUE
   #\r
   # Platform Driver\r
   #\r
-  INF ArmPlatformPkg/ArmVExpressPkg/ArmFvpDxe/ArmFvpDxe.inf\r
+  INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf\r
   INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
-
+\r
+  #\r
+  # FDT installation\r
+  #\r
+  INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf\r
+\r
   #\r
   # UEFI application (Shell Embedded Boot Loader)\r
   #\r
@@ -193,6 +207,8 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
   INF ArmPlatformPkg/Bds/Bds.inf\r
 \r
+  # FV Filesystem\r
+  INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf\r
 \r
 [FV.FVMAIN_COMPACT]\r
 FvAlignment        = 16\r
@@ -212,6 +228,9 @@ READ_STATUS        = TRUE
 READ_LOCK_CAP      = TRUE\r
 READ_LOCK_STATUS   = TRUE\r
 \r
+!if $(EDK2_SKIP_PEICORE) == 1\r
+  INF ArmPlatformPkg/PrePi/PeiMPCore.inf\r
+!else\r
   INF ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf\r
   INF MdeModulePkg/Core/Pei/PeiMain.inf\r
   INF ArmPlatformPkg/PlatformPei/PlatformPeim.inf\r
@@ -221,6 +240,7 @@ READ_LOCK_STATUS   = TRUE
   INF IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf\r
   INF MdeModulePkg/Universal/Variable/Pei/VariablePei.inf\r
   INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.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
@@ -259,7 +279,7 @@ READ_LOCK_STATUS   = TRUE
 \r
 [Rule.Common.SEC]\r
   FILE SEC = $(NAMED_GUID) RELOCS_STRIPPED {\r
-    TE  TE Align = 128                  $(INF_OUTPUT)/$(MODULE_NAME).efi\r
+    TE  TE Align = 4K                  $(INF_OUTPUT)/$(MODULE_NAME).efi\r
   }\r
 \r
 [Rule.Common.PEI_CORE]\r