ArmPlatformPkg: Give a name to the FV

[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 1c709771b5716f77460943de1ae08c817f7f56b7..95d5b1d0c030ec58274219a3bb63938a134b61af 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf
@@ -123,6 +123,7 @@ READ_ENABLED_CAP   = TRUE
 READ_STATUS        = TRUE\r
 READ_LOCK_CAP      = TRUE\r
 READ_LOCK_STATUS   = TRUE\r
+FvNameGuid         = 87940482-fc81-41c3-87e6-399cf85ac8a0\r
 \r
   APRIORI DXE {\r
     INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
@@ -191,11 +192,6 @@ READ_LOCK_STATUS   = TRUE
   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
@@ -210,6 +206,38 @@ READ_LOCK_STATUS   = TRUE
   # FV Filesystem\r
   INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf\r
 \r
+  #\r
+  # FDT installation\r
+  #\r
+  # The UEFI driver is at the end of the list of the driver to be dispatched\r
+  # after the device drivers (eg: Ethernet) to ensure we have support for them.\r
+  INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf\r
+\r
+!ifdef $(DTB_DIR)\r
+  #\r
+  # Embed flattened device tree (FDT) images for all known\r
+  # variants of this platform\r
+  #\r
+  FILE RAW = PCD (gArmVExpressTokenSpaceGuid.PcdFdtFvpBaseAEMv8x4GicV2) {\r
+    $(DTB_DIR)/fvp-base-gicv2-psci.dtb\r
+  }\r
+  FILE RAW = PCD (gArmVExpressTokenSpaceGuid.PcdFdtFvpBaseAEMv8x4GicV2Legacy) {\r
+    $(DTB_DIR)/fvp-base-gicv2legacy-psci.dtb\r
+  }\r
+  FILE RAW = PCD (gArmVExpressTokenSpaceGuid.PcdFdtFvpBaseAEMv8x4GicV3) {\r
+    $(DTB_DIR)/fvp-base-gicv3-psci.dtb\r
+  }\r
+  FILE RAW = PCD (gArmVExpressTokenSpaceGuid.PcdFdtFvpFoundationGicV2) {\r
+    $(DTB_DIR)/fvp-foundation-gicv2-psci.dtb\r
+  }\r
+  FILE RAW = PCD (gArmVExpressTokenSpaceGuid.PcdFdtFvpFoundationGicV2Legacy) {\r
+    $(DTB_DIR)/fvp-foundation-gicv2legacy-psci.dtb\r
+  }\r
+  FILE RAW = PCD (gArmVExpressTokenSpaceGuid.PcdFdtFvpFoundationGicV3) {\r
+    $(DTB_DIR)/fvp-foundation-gicv3-psci.dtb\r
+  }\r
+!endif\r
+\r
 [FV.FVMAIN_COMPACT]\r
 FvAlignment        = 16\r
 ERASE_POLARITY     = 1\r