8 files changed, 38 insertions, 0 deletions
diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc
index f4a1c447be..24deb22b22 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc
@@ -265,6 +265,11 @@
   #
   ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.inf
 
+  # SMBIOS Support
+
+  ArmPlatformPkg/PlatformSmbiosDxe/PlatformSmbiosDxe.inf
+  MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
+ 
   #
   # Filesystems
   #
diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf
index 9f1389d564..87708ad5f7 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf
@@ -111,6 +111,12 @@ READ_LOCK_STATUS   = TRUE
   INF ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf
 
   #
+  # SMBIOS Support
+  #
+  INF ArmPlatformPkg/PlatformSmbiosDxe/PlatformSmbiosDxe.inf
+  INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
+  
+  #
   # Filesystems
   #
 !ifndef $(ARM_BIGLITTLE_TC2)
diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc
index fcb6388f3c..0efd4f19b5 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc
@@ -317,3 +317,5 @@
   #
   MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
   ArmPlatformPkg/Bds/Bds.inf
+
+  MdeModulePkg/Universal/Fdt/FdtTableDxe/FdtTableDxe.inf
diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf
index 1ce86fc6a5..9d7c2372b7 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf
@@ -211,6 +211,19 @@ READ_LOCK_STATUS   = TRUE
   # FV Filesystem
   INF MdeModulePkg/Universal/FvSimpleFilesystemDxe/FvSimpleFilesystemDxe.inf
 
+  #
+  # Embedded device tree image
+  #
+  INF MdeModulePkg/Universal/Fdt/FdtTableDxe/FdtTableDxe.inf
+
+  FILE FREEFORM = PCD(gEfiMdeModulePkgTokenSpaceGuid.PcdFdtImage) {
+!ifdef ARM_FOUNDATION_FVP
+    SECTION RAW = ArmPlatformPkg/ArmVExpressPkg/fvp-foundation-gicv2-psci.dtb
+!else
+    SECTION RAW = ArmPlatformPkg/ArmVExpressPkg/fvp-base-gicv2-psci.dtb
+!endif
+  }
+
 [FV.FVMAIN_COMPACT]
 FvAlignment        = 16
 ERASE_POLARITY     = 1
diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc
index fcb1d110b3..ee7f591489 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc
@@ -255,6 +255,12 @@
   ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf
 
   #
+  # SMBIOS Support
+  #
+  ArmPlatformPkg/PlatformSmbiosDxe/PlatformSmbiosDxe.inf
+  MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
+ 
+  #
   # Semi-hosting filesystem
   #
   ArmPkg/Filesystem/SemihostFs/SemihostFs.inf
diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf
index 2e04f2c8f6..542e24767b 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf
@@ -160,6 +160,12 @@ READ_LOCK_STATUS   = TRUE
   INF ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf
 
   #
+  # SMBIOS Support
+  #
+  INF ArmPlatformPkg/PlatformSmbiosDxe/PlatformSmbiosDxe.inf
+  INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
+
+  #
   # Semi-hosting filesystem
   #
   INF ArmPkg/Filesystem/SemihostFs/SemihostFs.inf
diff --git a/ArmPlatformPkg/ArmVExpressPkg/fvp-base-gicv2-psci.dtb b/ArmPlatformPkg/ArmVExpressPkg/fvp-base-gicv2-psci.dtb
new file mode 100644
index 0000000000..5bfdcf1da5
--- /dev/null
+++ b/ArmPlatformPkg/ArmVExpressPkg/fvp-base-gicv2-psci.dtb
diff --git a/ArmPlatformPkg/ArmVExpressPkg/fvp-foundation-gicv2-psci.dtb b/ArmPlatformPkg/ArmVExpressPkg/fvp-foundation-gicv2-psci.dtb
new file mode 100644
index 0000000000..70175e892b
--- /dev/null
+++ b/ArmPlatformPkg/ArmVExpressPkg/fvp-foundation-gicv2-psci.dtb