Produce LoadPeImage protocol only in framework compatibility mode.

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

diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf b/MdeModulePkg/Core/Dxe/DxeMain.inf
index a7191b87e192aa3bb1d2f42440fc2c502b57928a..3c711400e3d050e9bd0ff8cb5e5165fe77219bff 100644 (file)
--- a/MdeModulePkg/Core/Dxe/DxeMain.inf
+++ b/MdeModulePkg/Core/Dxe/DxeMain.inf
@@ -107,7 +107,7 @@
   gEfiStatusCodeRuntimeProtocolGuid             ## SOMETIMES_CONSUMES\r
   gEfiCapsuleArchProtocolGuid                   ## CONSUMES\r
   gEfiDecompressProtocolGuid                    ## CONSUMES\r
-  gEfiLoadPeImageProtocolGuid                   ## PRODUCES\r
+  gEfiLoadPeImageProtocolGuid                   ## SOMETIMES_PRODUCES (Produces when PcdFrameworkCompatibilitySupport is set)\r
   gEfiSimpleFileSystemProtocolGuid              ## CONSUMES\r
   gEfiLoadFileProtocolGuid                      ## CONSUMES\r
   gEfiLoadFile2ProtocolGuid                     ## CONSUMES\r
@@ -140,3 +140,6 @@
   gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueBootServiceExit\r
   gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueDxeDriverBegin\r
   gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueDxeDriverEnd\r
+\r
+[FeaturePcd.common]\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport         ## CONSUMES\r

diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c b/MdeModulePkg/Core/Dxe/Image/Image.c
index d0539b98e4757a6d8b060cd0e6cbe01ccfdac537..7e5cea7b76ad2d27a861e59f52d51c8f72febb4f 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Image/Image.c
+++ b/MdeModulePkg/Core/Dxe/Image/Image.c
@@ -144,15 +144,19 @@ CoreInitializeImageServices (
   gDxeCoreImageHandle = Image->Handle;\r
   gDxeCoreLoadedImage = &Image->Info;\r
 \r
-  //\r
-  // Export DXE Core PE Loader functionality\r
-  //\r
-  return CoreInstallProtocolInterface (\r
-           &mLoadPe32PrivateData.Handle,\r
-           &gEfiLoadPeImageProtocolGuid,\r
-           EFI_NATIVE_INTERFACE,\r
-           &mLoadPe32PrivateData.Pe32Image\r
-           );\r
+  if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) {\r
+    //\r
+    // Export DXE Core PE Loader functionality for backward compatibility.\r
+    //\r
+    Status = CoreInstallProtocolInterface (\r
+      &mLoadPe32PrivateData.Handle,\r
+      &gEfiLoadPeImageProtocolGuid,\r
+      EFI_NATIVE_INTERFACE,\r
+      &mLoadPe32PrivateData.Pe32Image\r
+      );\r
+  }\r
+\r
+  return Status;\r
 }\r
 \r
 /**\r