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 f17f9ab400018a5ca39bb2f4a254c7b0696722dd..fb7c82ff45fffebb5f9b72d5fcad6711918876db 100644 (file)
--- a/MdeModulePkg/Core/Dxe/DxeMain.h
+++ b/MdeModulePkg/Core/Dxe/DxeMain.h
@@ -43,7 +43,7 @@ Revision History
 #include <Protocol/PlatformDriverOverride.h>\r
 #include <Protocol/Variable.h>\r
 #include <Guid/MemoryTypeInformation.h>\r
-#include <Guid/FirmwareFileSystem.h>\r
+#include <Guid/FirmwareFileSystem2.h>\r
 #include <Guid/HobList.h>\r
 #include <Protocol/Timer.h>\r
 #include <Protocol/SimpleFileSystem.h>\r

diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf b/MdeModulePkg/Core/Dxe/DxeMain.inf
index 79dccde59ed2d150a8f296ffd09ecc6820d0c034..c88ff0317dad9b0ef95c1d1a4d21e04bc0e05115 100644 (file)
--- a/MdeModulePkg/Core/Dxe/DxeMain.inf
+++ b/MdeModulePkg/Core/Dxe/DxeMain.inf
@@ -127,7 +127,7 @@
   gEfiEventExitBootServicesGuid                 # ALWAYS_CONSUMED\r
   gEfiHobMemoryAllocModuleGuid                  # ALWAYS_CONSUMED\r
   gEfiFileInfoGuid                              # ALWAYS_CONSUMED\r
-  gEfiFirmwareFileSystemGuid                    # ALWAYS_CONSUMED\r
+  gEfiFirmwareFileSystem2Guid                   # ALWAYS_CONSUMED\r
   gAprioriGuid                                  # ALWAYS_CONSUMED\r
   gEfiDebugImageInfoTableGuid                   # ALWAYS_CONSUMED\r
   gEfiHobListGuid                               # ALWAYS_CONSUMED\r

diff --git a/MdeModulePkg/Core/Dxe/FwVol/FwVol.c b/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
index 7fa346cf07ad6a37e3afefd8a75cb284bf653c38..98550c96eb01db332e882226e4e2edcb1438674e 100644 (file)
--- 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\r
     // understand it...\r
     //\r
-    if (!CompareGuid (&FwVolHeader->FileSystemGuid, &gEfiFirmwareFileSystemGuid)) {\r
+    if (!CompareGuid (&FwVolHeader->FileSystemGuid, &gEfiFirmwareFileSystem2Guid)) {\r
       continue;\r
     }\r
 \r