MdeModulePkg/PciBus: Simplify an complex if statement to pass VS2015

[mirror_edk2.git] / ArmPlatformPkg / ArmVExpressPkg / ArmVExpress-RTSM-AEMv8Ax4-foundation.fdf

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.fdf
index 647f9b6bbedd2c55803da614b2e14b5da3ce3744..402ee96e1ae1395217771f175dece669800a8469 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.fdf
@@ -1,5 +1,5 @@
 #\r
-#  Copyright (c) 2011 - 2014, 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
@@ -109,8 +109,14 @@ READ_ENABLED_CAP   = TRUE
 READ_STATUS        = TRUE\r
 READ_LOCK_CAP      = TRUE\r
 READ_LOCK_STATUS   = TRUE\r
+FvNameGuid         = 6685e0b5-d6bb-4c12-97ef-58bd87112dee\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
@@ -155,12 +161,12 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf\r
 \r
   #\r
-  # Platform Driver
-  #
-  INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf
-  INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
-
-  #
+  # Platform Driver\r
+  #\r
+  INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf\r
+  INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
+\r
+  #\r
   # UEFI application (Shell Embedded Boot Loader)\r
   #\r
   INF ShellBinPkg/UefiShell/UefiShell.inf\r
@@ -171,6 +177,18 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
   INF ArmPlatformPkg/Bds/Bds.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
+  # FV Filesystem\r
+  INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf\r
+\r
+  # Legacy Linux Loader\r
+  INF ArmPkg/Application/LinuxLoader/LinuxLoader.inf\r
 \r
 [FV.FVMAIN_COMPACT]\r
 FvAlignment        = 16\r