Fix build broken for variable's header modification.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7734 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/DuetPkg/DxeIpl/HobGeneration.c b/DuetPkg/DxeIpl/HobGeneration.c
index 93bf2891a53fbecb12b64f2767b9135d4d0650ac..0b215eba3a822c24947fb7255b0362e72574d8eb 100644 (file)
--- a/DuetPkg/DxeIpl/HobGeneration.c
+++ b/DuetPkg/DxeIpl/HobGeneration.c
@@ -738,7 +738,7 @@ PrepareHobNvStorage (
 */\r
 {\r
   STATIC VARIABLE_STORE_HEADER VarStoreHeader = {\r
-    gEfiVariableGuid,\r
+    VARIABLE_STORE_SIGNATURE,\r
     0xffffffff,                 // will be fixed in Variable driver\r
     VARIABLE_STORE_FORMATTED,\r
     VARIABLE_STORE_HEALTHY,\r

diff --git a/DuetPkg/FSVariable/FSVariable.c b/DuetPkg/FSVariable/FSVariable.c
index d20b3a78e3ed4598c9ed2500b67c792b57c2767e..eefaf0394c6b0802a7d71e3f2e3d94ed492a6ffb 100644 (file)
--- a/DuetPkg/FSVariable/FSVariable.c
+++ b/DuetPkg/FSVariable/FSVariable.c
@@ -22,7 +22,7 @@ Abstract:
 #include "FSVariable.h"\r
 \r
 VARIABLE_STORE_HEADER mStoreHeaderTemplate = {\r
-  gEfiVariableGuid,\r
+  VARIABLE_STORE_SIGNATURE,\r
   VOLATILE_VARIABLE_STORE_SIZE,\r
   VARIABLE_STORE_FORMATTED,\r
   VARIABLE_STORE_HEALTHY,\r

diff --git a/DuetPkg/FSVariable/FileStorage.c b/DuetPkg/FSVariable/FileStorage.c
index 0c25efa8c3c5b30a46a59cef52115c147a874509..ce94a12433b49fc447bbac8608c2ab84d6057e42 100644 (file)
--- a/DuetPkg/FSVariable/FileStorage.c
+++ b/DuetPkg/FSVariable/FileStorage.c
@@ -247,7 +247,8 @@ FileStorageConstructor (
   ASSERT_EFI_ERROR (Status);\r
   ZeroMem (Dev, sizeof(VS_DEV));\r
 \r
-  CopyGuid (&Dev->Signature, &gEfiVariableGuid);\r
+  Dev->Signature          = VS_DEV_SIGNATURE;\r
+  //CopyGuid (&Dev->Signature, &gEfiVariableGuid);\r
   Dev->Size               = Size;\r
   VAR_DATA_PTR (Dev)      = (UINT8 *) (UINTN) NvStorageBase;\r
   VAR_FILE_VOLUMEID (Dev) = VolumeId;\r

diff --git a/DuetPkg/FSVariable/MemStorage.c b/DuetPkg/FSVariable/MemStorage.c
index 02582d953ad908def33a4f307e8d3d03790873e2..a04d65b9ef45b00370353e21cf12294884737403 100644 (file)
--- a/DuetPkg/FSVariable/MemStorage.c
+++ b/DuetPkg/FSVariable/MemStorage.c
@@ -59,7 +59,7 @@ MemStorageConstructor (
 \r
   ZeroMem (Dev, sizeof(VS_DEV));\r
 \r
-  CopyGuid (&Dev->Signature, &gEfiVariableGuid);\r
+  Dev->Signature   = VS_DEV_SIGNATURE;\r
   Dev->Size        = Size;\r
 \r
   Dev->VarStore.Erase    = MemEraseStore;\r