ArmVExpressPkg: add support for embedding DTBs for AArch64 variants

If DTB_DIR=<path> is set during the build, incorporate DTBs from
that path for all AArch64 FVP platform variants so that they can
be loaded straight from the firmware image instead of from a file
system. This relieves a user of having to keep a DTB file with the
right name in the working directory of the model.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Olivier Martin <olivier.martin@arm.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17360 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf
index e7e6dc14464c3e6d1690e51b3aa6b8f539e9ecac..19157283a6e6db79928dfa25e3030f64bed88ef9 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf
@@ -212,6 +212,31 @@ READ_LOCK_STATUS   = TRUE
   # 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