ArmPlatformPkg/NorFlashDxe: prepare for devicepath format change

[mirror_edk2.git] / ArmPlatformPkg / Drivers / NorFlashDxe / NorFlashDxe.inf

diff --git a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf
index 97c66008f613cd838449cb758ff066cebd983b07..a59a21a03e0a41e87357f3ebd03ca89e1fb7851d 100644 (file)
--- a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf
+++ b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf
@@ -1,24 +1,24 @@
 #/** @file\r
-#  \r
+#\r
 #  Component description file for NorFlashDxe module\r
-#  \r
-#  Copyright (c) 2011-2012, ARM Ltd. All rights reserved.<BR>\r
-#  \r
+#\r
+#  Copyright (c) 2011 - 2014, ARM Ltd. All rights reserved.<BR>\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
-#  \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
 \r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = ArmVeNorFlashDxe\r
   FILE_GUID                      = 93E34C7E-B50E-11DF-9223-2443DFD72085\r
-  MODULE_TYPE                    = DXE_DRIVER\r
+  MODULE_TYPE                    = DXE_RUNTIME_DRIVER\r
   VERSION_STRING                 = 1.0\r
   ENTRY_POINT                    = NorFlashInitialise\r
 \r
@@ -31,6 +31,7 @@
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
   ArmPlatformPkg/ArmPlatformPkg.dec\r
+  EmbeddedPkg/EmbeddedPkg.dec\r
 \r
 [LibraryClasses]\r
   IoLib\r
@@ -41,16 +42,22 @@
   UefiLib\r
   UefiDriverEntryPoint\r
   UefiBootServicesTableLib\r
+  UefiRuntimeLib\r
+  DxeServicesTableLib\r
 \r
 [Guids]\r
   gEfiSystemNvDataFvGuid\r
   gEfiVariableGuid\r
+  gEfiAuthenticatedVariableGuid\r
+  gEfiEventVirtualAddressChangeGuid\r
+  gEdkiiNvVarStoreFormattedGuid     ## PRODUCES ## PROTOCOL\r
 \r
 [Protocols]\r
   gEfiBlockIoProtocolGuid\r
   gEfiDevicePathProtocolGuid\r
   gEfiFirmwareVolumeBlockProtocolGuid\r
-  \r
+  gEfiDiskIoProtocolGuid\r
+\r
 [Pcd.common]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize\r
@@ -58,11 +65,8 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize\r
-  \r
+\r
   gArmPlatformTokenSpaceGuid.PcdNorFlashCheckBlockLocked\r
 \r
 [Depex]\r
-  #\r
-  # NorFlashDxe must be loaded before VariableRuntimeDxe in case empty flash needs populating with default values\r
-  # \r
-  BEFORE gVariableRuntimeDxeFileGuid \r
+  gEfiCpuArchProtocolGuid\r