Revert "ArmPlatformPkg/ArmVExpressDxe: Change FDT default file names."

[mirror_edk2.git] / ArmPlatformPkg / ArmRealViewEbPkg / ArmRealViewEb-RTSM-MPCore.fdf

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf
index 70fc87bcf53c2e55d80c34cf37ed9c75d8959ebe..bedcf77c537c0d879b55799086e5c7204c98d781 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf
@@ -1,14 +1,14 @@
-# FLASH layout file for ARM VE.\r
+# FLASH layout file for ARM RealView EB.\r
 #\r
-#  Copyright (c) 2011, 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
-#  which accompanies this distribution.  The full text of the license may be found at        \r
-#  http://opensource.org/licenses/bsd-license.php                                            \r
+#  Copyright (c) 2011-2014, ARM Limited. All rights reserved.\r
 #\r
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+#  This program and the accompanying materials\r
+#  are licensed and made available under the terms and conditions of the BSD License\r
+#  which accompanies this distribution.  The full text of the license may be found at\r
+#  http://opensource.org/licenses/bsd-license.php\r
+#\r
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
 \r
 ################################################################################\r
@@ -53,7 +53,7 @@ NumBlocks     = 0x20
 gArmTokenSpaceGuid.PcdSecureFvBaseAddress|gArmTokenSpaceGuid.PcdSecureFvSize\r
 FV = FVMAIN_SEC\r
 \r
-0x00050000|0x00100000\r
+0x00050000|0x00150000\r
 gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize\r
 FV = FVMAIN_COMPACT\r
 \r
@@ -108,11 +108,12 @@ READ_ENABLED_CAP   = TRUE
 READ_STATUS        = TRUE\r
 READ_LOCK_CAP      = TRUE\r
 READ_LOCK_STATUS   = TRUE\r
+FvNameGuid         = 14801114-da6a-4113-985b-dc876337a15e\r
 \r
-  INF MdeModulePkg/Core/Dxe/DxeMain.inf \r
+  INF MdeModulePkg/Core/Dxe/DxeMain.inf\r
 \r
   #\r
-  # PI DXE Drivers producing Architectural Protocols (EFI Services) \r
+  # PI DXE Drivers producing Architectural Protocols (EFI Services)\r
   #\r
   INF ArmPkg/Drivers/CpuDxe/CpuDxe.inf\r
   INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf\r
@@ -137,17 +138,26 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf\r
   INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf\r
   INF EmbeddedPkg/SerialDxe/SerialDxe.inf\r
-  \r
-  INF ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf\r
+\r
+  INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf\r
   INF ArmPlatformPkg/Drivers/SP804TimerDxe/SP804TimerDxe.inf\r
-  \r
+\r
   INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf\r
 \r
   #\r
   # Semi-hosting filesystem\r
   #\r
   INF ArmPkg/Filesystem/SemihostFs/SemihostFs.inf\r
-  \r
+\r
+  #\r
+  # Multimedia Card Interface\r
+  #\r
+  INF EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf\r
+  INF ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf\r
+\r
+  # FV Filesystem\r
+  INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf\r
+\r
   #\r
   # FAT filesystem + GPT/MBR partitioning\r
   #\r
@@ -157,9 +167,9 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf\r
 \r
   #\r
-  # UEFI application (Shell Embedded Boot Loader) \r
-  #  \r
-  INF ShellBinPkg/UefiShell/UefiShell.inf \r
+  # UEFI application (Shell Embedded Boot Loader)\r
+  #\r
+  INF ShellBinPkg/UefiShell/UefiShell.inf\r
 \r
   #\r
   # Bds\r
@@ -217,7 +227,7 @@ READ_LOCK_STATUS   = TRUE
 \r
 \r
 ############################################################################\r
-# Example of a DXE_DRIVER FFS file with a Checksum encapsulation section   # \r
+# Example of a DXE_DRIVER FFS file with a Checksum encapsulation section   #\r
 ############################################################################\r
 #\r
 #[Rule.Common.DXE_DRIVER]\r
@@ -242,14 +252,14 @@ READ_LOCK_STATUS   = TRUE
 [Rule.Common.PEI_CORE]\r
   FILE PEI_CORE = $(NAMED_GUID) {\r
     TE     TE                           $(INF_OUTPUT)/$(MODULE_NAME).efi\r
-    UI     STRING ="$(MODULE_NAME)" Optional         \r
+    UI     STRING ="$(MODULE_NAME)" Optional\r
   }\r
 \r
 [Rule.Common.PEIM]\r
   FILE PEIM = $(NAMED_GUID) {\r
      PEI_DEPEX PEI_DEPEX Optional       $(INF_OUTPUT)/$(MODULE_NAME).depex\r
      TE       TE                        $(INF_OUTPUT)/$(MODULE_NAME).efi\r
-     UI       STRING="$(MODULE_NAME)" Optional         \r
+     UI       STRING="$(MODULE_NAME)" Optional\r
   }\r
 \r
 [Rule.Common.PEIM.TIANOCOMPRESSED]\r
@@ -290,7 +300,7 @@ READ_LOCK_STATUS   = TRUE
 \r
 [Rule.Common.UEFI_APPLICATION]\r
   FILE APPLICATION = $(NAMED_GUID) {\r
-    UI     STRING ="$(MODULE_NAME)" Optional         \r
+    UI     STRING ="$(MODULE_NAME)" Optional\r
     PE32   PE32                         $(INF_OUTPUT)/$(MODULE_NAME).efi\r
   }\r
 \r