From: klu2 <klu2@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Fri, 6 Jul 2007 04:29:38 +0000 (+0000)
Subject: Should use gEfiFirmwareFileSystem2Guid but not gEfiFirmwareFileSystemGuid in DxeCore.
X-Git-Tag: edk2-stable201903~22859
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=9767823fc9239c342e2ab314f41aa259921d9867;hp=7d421cff2b114a16e1b0bdc7daad38c7c101c680

Should use gEfiFirmwareFileSystem2Guid but not gEfiFirmwareFileSystemGuid in DxeCore.

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

diff --git a/MdeModulePkg/Core/Dxe/DxeMain.h b/MdeModulePkg/Core/Dxe/DxeMain.h
index f17f9ab400..fb7c82ff45 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain.h
+++ b/MdeModulePkg/Core/Dxe/DxeMain.h
@@ -43,7 +43,7 @@ Revision History
 #include <Protocol/PlatformDriverOverride.h>
 #include <Protocol/Variable.h>
 #include <Guid/MemoryTypeInformation.h>
-#include <Guid/FirmwareFileSystem.h>
+#include <Guid/FirmwareFileSystem2.h>
 #include <Guid/HobList.h>
 #include <Protocol/Timer.h>
 #include <Protocol/SimpleFileSystem.h>
diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf b/MdeModulePkg/Core/Dxe/DxeMain.inf
index 79dccde59e..c88ff0317d 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain.inf
+++ b/MdeModulePkg/Core/Dxe/DxeMain.inf
@@ -127,7 +127,7 @@
   gEfiEventExitBootServicesGuid                 # ALWAYS_CONSUMED
   gEfiHobMemoryAllocModuleGuid                  # ALWAYS_CONSUMED
   gEfiFileInfoGuid                              # ALWAYS_CONSUMED
-  gEfiFirmwareFileSystemGuid                    # ALWAYS_CONSUMED
+  gEfiFirmwareFileSystem2Guid                   # ALWAYS_CONSUMED
   gAprioriGuid                                  # ALWAYS_CONSUMED
   gEfiDebugImageInfoTableGuid                   # ALWAYS_CONSUMED
   gEfiHobListGuid                               # ALWAYS_CONSUMED
diff --git a/MdeModulePkg/Core/Dxe/FwVol/FwVol.c b/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
index 7fa346cf07..98550c96eb 100644
--- a/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
+++ b/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
@@ -461,7 +461,7 @@ Returns:
     // Check to see that the file system is indeed formatted in a way we can
     // understand it...
     //
-    if (!CompareGuid (&FwVolHeader->FileSystemGuid, &gEfiFirmwareFileSystemGuid)) {
+    if (!CompareGuid (&FwVolHeader->FileSystemGuid, &gEfiFirmwareFileSystem2Guid)) {
       continue;
     }