ArmPlatformPkg: Use the merged Variable driver

Remove gVariableAuthenticatedRuntimeDxeFileGuid definition in
ArmPlatformPkg.dec and use gVariableRuntimeDxeFileGuid in
NorFlashAuthenticatedDxe.inf as auth Variable driver in SecurityPkg
and Variable driver in MdeModulePkg have been merged.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17768 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPlatformPkg/ArmPlatformPkg.dec b/ArmPlatformPkg/ArmPlatformPkg.dec
index 4100b15e516c8568af9cc1ccd0b8a0b7edce35ac..cd67aee0be79e3f78f5586eb3380fe9e6090d49e 100644 (file)
--- a/ArmPlatformPkg/ArmPlatformPkg.dec
+++ b/ArmPlatformPkg/ArmPlatformPkg.dec
@@ -1,6 +1,7 @@
 #/** @file\r
 #\r
 #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.\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
@@ -36,10 +37,6 @@
   # Following Guid must match FILE_GUID in MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf\r
   #\r
   gVariableRuntimeDxeFileGuid = { 0xcbd2e4d5, 0x7068, 0x4ff5, { 0xb4, 0x62, 0x98, 0x22, 0xb4, 0xad, 0x8d, 0x60 } }\r
-  #\r
-  # Following Guid must match FILE_GUID in SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf\r
-  #\r
-  gVariableAuthenticatedRuntimeDxeFileGuid = { 0x2226f30f, 0x3d5b, 0x402d,  {0x99, 0x36, 0xa9, 0x71, 0x84, 0xEB, 0x45, 0x16 } }\r
 \r
   ## Include/Guid/ArmGlobalVariableHob.h\r
   gArmGlobalVariableGuid      = { 0xc3253c90, 0xa24f, 0x4599, { 0xa6, 0x64, 0x1f, 0x88, 0x13, 0x77, 0x8f, 0xc9} }\r

diff --git a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashAuthenticatedDxe.inf b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashAuthenticatedDxe.inf
index ff8f048ecb21e7453b311f60fed4359fd1fad39a..6c5e6aef0ddf1930a98ac2563541e29b90dd49d3 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
@@ -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