ArmPlatformPkg/Bds: Allow to update EFI application boot entries

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

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
index 84d4fc590366c9fb9d6fcaa451d9f8b68853536b..f941a985a6a6067b886c3760fb4368f125c53c1e 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
@@ -1,6 +1,5 @@
-# FLASH layout file for ARM VE.\r
 #\r
-#  Copyright (c) 2011, ARM Limited. All rights reserved.\r
+#  Copyright (c) 2011-2014, 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
@@ -166,13 +165,16 @@ READ_LOCK_STATUS   = TRUE
 \r
   INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf\r
 \r
-  INF ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf\r
+  INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf\r
   INF ArmPlatformPkg/Drivers/SP804TimerDxe/SP804TimerDxe.inf\r
   INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf\r
   INF ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/PL111LcdGraphicsOutputDxe.inf\r
   INF ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf\r
 \r
   #\r
+  # Platform\r
+  #\r
+  INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.inf\r
 \r
 !if $(EDK2_ARMVE_STANDALONE) != 1\r
   #\r
@@ -186,24 +188,35 @@ READ_LOCK_STATUS   = TRUE
   #\r
   INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
   INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
-  INF FatPkg/EnhancedFatDxe/Fat.inf\r
+  INF FatBinPkg/EnhancedFatDxe/Fat.inf\r
   INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf\r
 \r
+  # Versatile Express FileSystem\r
+  INF ArmPlatformPkg/FileSystem/BootMonFs/BootMonFs.inf\r
+\r
   #\r
   # Multimedia Card Interface\r
   #\r
   INF EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf\r
   INF ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf\r
-  \r
+
+  #
+  # USB support\r
   #\r
-  # UEFI application (Shell Embedded Boot Loader) \r
-  #  \r
-  INF EmbeddedPkg/Ebl/Ebl.inf\r
-    \r
-!if $(EDK2_ARMVE_UEFI2_SHELL) == 1\r
-  INF ShellPkg/Application/Shell/Shell.inf\r
-!endif\r
-  \r
+  INF EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf
+\r
+  #\r
+  # Android Fastboot\r
+  #\r
+  INF EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf\r
+  INF EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf\r
+  INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf\r
+\r
+  #\r
+  # UEFI application (Shell Embedded Boot Loader)\r
+  #\r
+  INF ShellBinPkg/UefiShell/UefiShell.inf\r
+\r
   #\r
   # Bds\r
   #\r
@@ -337,3 +350,18 @@ READ_LOCK_STATUS   = TRUE
     UI     STRING ="$(MODULE_NAME)" Optional         \r
     PE32   PE32                         $(INF_OUTPUT)/$(MODULE_NAME).efi\r
   }\r
+\r
+[Rule.Common.UEFI_DRIVER.BINARY]\r
+  FILE DRIVER = $(NAMED_GUID) {\r
+    DXE_DEPEX DXE_DEPEX Optional      |.depex\r
+    PE32      PE32                    |.efi\r
+    UI        STRING="$(MODULE_NAME)" Optional\r
+    VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
+  }\r
+\r
+[Rule.Common.UEFI_APPLICATION.BINARY]\r
+  FILE APPLICATION = $(NAMED_GUID) {\r
+    PE32      PE32                    |.efi\r
+    UI        STRING="$(MODULE_NAME)" Optional\r
+    VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
+  }\r