OvmfPg: flash driver: fix type of EFI_SIZE_TO_PAGES argument (VS2010)

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

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf
index 12a6847aa25ca7f8723fc8009319aababb99f721..d5b4eb68e2e4136d5b076df605b2d4a3a107c7a9 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf
@@ -1,6 +1,7 @@
 # FLASH layout file for ARM RealView EB.\r
 #\r
 # Copyright (c) 2009 - 2010, Apple Inc. All rights reserved.<BR>\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
@@ -27,8 +28,8 @@
 \r
 \r
 [FD.ArmRealViewEb_EFI]\r
-BaseAddress   = 0x40000000|gArmTokenSpaceGuid.PcdNormalFdBaseAddress\r
-Size          = 0x00200000|gArmTokenSpaceGuid.PcdNormalFdSize\r
+BaseAddress   = 0x40000000|gArmTokenSpaceGuid.PcdFdBaseAddress\r
+Size          = 0x00200000|gArmTokenSpaceGuid.PcdFdSize\r
 ErasePolarity = 1\r
 BlockSize     = 0x00010000\r
 NumBlocks     = 0x20\r
@@ -50,11 +51,11 @@ NumBlocks     = 0x20
 ################################################################################\r
 \r
 0x00000000|0x00050000\r
-gArmTokenSpaceGuid.PcdSecureFvBaseAddress|gArmTokenSpaceGuid.PcdSecureFvBaseSize\r
+gArmTokenSpaceGuid.PcdSecureFvBaseAddress|gArmTokenSpaceGuid.PcdSecureFvSize\r
 FV = FVMAIN_SEC\r
 \r
-0x00050000|0x00100000\r
-gArmTokenSpaceGuid.PcdNormalFvBaseAddress|gArmTokenSpaceGuid.PcdNormalFvSize\r
+0x00050000|0x00150000\r
+gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize\r
 FV = FVMAIN_COMPACT\r
 \r
 ################################################################################\r
@@ -109,10 +110,10 @@ READ_STATUS        = TRUE
 READ_LOCK_CAP      = TRUE\r
 READ_LOCK_STATUS   = TRUE\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,30 +138,35 @@ 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
   #\r
   # FAT filesystem + GPT/MBR partitioning\r
   #\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
   #\r
-  # UEFI application (Shell Embedded Boot Loader) \r
-  #  \r
-  INF EmbeddedPkg/Ebl/Ebl.inf\r
-  \r
+  # UEFI application (Shell Embedded Boot Loader)\r
+  #\r
+  INF ShellBinPkg/UefiShell/UefiShell.inf\r
 \r
   #\r
   # Bds\r
@@ -194,6 +200,7 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Core/Pei/PeiMain.inf\r
   INF ArmPlatformPkg/PlatformPei/PlatformPeim.inf\r
   INF ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf\r
+  INF ArmPkg/Drivers/CpuPei/CpuPei.inf\r
   INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf\r
   INF IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf\r
   INF MdeModulePkg/Universal/Variable/Pei/VariablePei.inf\r
@@ -217,7 +224,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 +249,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,6 +297,21 @@ 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
+[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