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

[mirror_edk2.git] / ArmPlatformPkg / ArmVExpressPkg / ArmVExpress-CTA9x4.fdf

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
index a2a4add74dd738f48f731f83b536fd52c7e01c56..8b11010f51b958ccb8b271de12091ebd2ee833bc 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
@@ -137,6 +137,7 @@ READ_ENABLED_CAP   = TRUE
 READ_STATUS        = TRUE\r
 READ_LOCK_CAP      = TRUE\r
 READ_LOCK_STATUS   = TRUE\r
+FvNameGuid         = 1a9b3625-5286-4fa6-af5f-8eabc481f3cc\r
 \r
   INF MdeModulePkg/Core/Dxe/DxeMain.inf\r
 \r
@@ -194,11 +195,6 @@ READ_LOCK_STATUS   = TRUE
   # Versatile Express FileSystem\r
   INF ArmPlatformPkg/FileSystem/BootMonFs/BootMonFs.inf\r
 \r
-  #\r
-  # FDT installation\r
-  #\r
-  INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf\r
-\r
   #\r
   # Multimedia Card Interface\r
   #\r
@@ -223,7 +219,6 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf\r
   INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf\r
   INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf\r
-  INF MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf\r
   INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf\r
   INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf\r
   INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf\r
@@ -245,9 +240,19 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
   INF ArmPlatformPkg/Bds/Bds.inf\r
 \r
+  # Legacy Linux Loader\r
+  INF ArmPkg/Application/LinuxLoader/LinuxLoader.inf\r
+\r
   # 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
   # Example to add a Device Tree to the Firmware Volume\r
   #FILE FREEFORM = PCD(gArmVExpressTokenSpaceGuid.PcdFdtVExpressHwA9x4) {\r
   #  SECTION RAW = ArmPlatformPkg/ArmVExpressPkg/Fdts/vexpress-v2p-ca9.dtb\r