ArmPlatformPkg/NorFlashDxe: accept both non-secure and secure varstore GUIDs

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

diff --git a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashAuthenticatedDxe.inf b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashAuthenticatedDxe.inf
index ff8f048ecb21e7453b311f60fed4359fd1fad39a..0e25b8f6ed6dbb20c7d567bf4da4748ebdcc3250 100644 (file)
--- a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashAuthenticatedDxe.inf
+++ b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashAuthenticatedDxe.inf
@@ -4,6 +4,7 @@
 #\r
 #  Copyright (c) 2011 - 2014, ARM Ltd. All rights reserved.<BR>\r
 #  Copyright (c) 2015, Linaro Ltd. All rights reserved.<BR>\r
+#  Copyright (c) 2015, Intel Corporation. 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,7 +28,6 @@
   NorFlashDxe.c\r
   NorFlashFvbDxe.c\r
   NorFlashBlockIoDxe.c\r
-  NorFlashAuthenticatedVariableDep.c\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
@@ -49,6 +49,7 @@
 \r
 [Guids]\r
   gEfiSystemNvDataFvGuid\r
+  gEfiVariableGuid\r
   gEfiAuthenticatedVariableGuid\r
   gEfiEventVirtualAddressChangeGuid\r
 \r
@@ -70,7 +71,7 @@
 \r
 [Depex]\r
   #\r
-  # NorFlashAuthenticatedDxe must be loaded before VariableAuthenticatedRuntimeDxe\r
+  # NorFlashAuthenticatedDxe must be loaded before VariableRuntimeDxe\r
   # in case empty flash needs populating with default values\r
   #\r
-  BEFORE gVariableAuthenticatedRuntimeDxeFileGuid\r
+  BEFORE gVariableRuntimeDxeFileGuid\r