Library: Fixed UEFI_IMAGE_SOURCE semantics. (#508)

MikhailKrichanov · web-flow · commit 0a62573beaf0 · 2023-12-04T07:49:48.000+03:00
diff --git a/Legacy/BootPlatform/EfiLdr/EfiLdr.inf b/Legacy/BootPlatform/EfiLdr/EfiLdr.inf
@@ -35,7 +35,7 @@
   PrintLib
   LzmaDecompressLib
   SerialPortLib
-  UefiImageOnlyNonFvLib
+  UefiImageOnlyFvLib
 
 [Sources]
   Support.h
diff --git a/Legacy/BootPlatform/EfiLdr/PeLoader.c b/Legacy/BootPlatform/EfiLdr/PeLoader.c
@@ -40,7 +40,7 @@ EfiLdrLoadImage (
              &ImageContext,
              FHand,
              BufferSize,
-             UEFI_IMAGE_SOURCE_NON_FV,
+             UEFI_IMAGE_SOURCE_FV,
              UefiImageOriginFv
              );
   if (EFI_ERROR (Status)) {
diff --git a/Library/OcBootManagementLib/ImageLoader.c b/Library/OcBootManagementLib/ImageLoader.c
@@ -296,7 +296,7 @@ OcImageLoaderLoad (
                   &ImageContext,
                   SourceBuffer,
                   (UINT32)SourceSize,
-                  UEFI_IMAGE_SOURCE_FV,
+                  UEFI_IMAGE_SOURCE_NON_FV,
                   UefiImageOriginUserImage
                   );
   if (EFI_ERROR (ImageStatus)) {
diff --git a/Library/OcBootManagementLib/OcBootManagementLib.inf b/Library/OcBootManagementLib/OcBootManagementLib.inf
@@ -94,7 +94,7 @@
   MemoryAllocationLib
   PrintLib
   UefiBootServicesTableLib
-  UefiImageLib
+  UefiImageOnlyNonFvLib
   OcApfsLib
   OcAppleBootPolicyLib
   OcAppleChunklistLib
diff --git a/Library/OcPeCoffExtLib/OcPeCoffExtLib.inf b/Library/OcPeCoffExtLib/OcPeCoffExtLib.inf
@@ -38,7 +38,7 @@
   OpenCorePkg/OpenCorePkg.dec
 
 [LibraryClasses]
-  UefiImageLib
+  PeCoffLib2
   UefiRuntimeServicesTableLib
   UefiBootServicesTableLib
   MemoryAllocationLib
diff --git a/OpenCorePkg.dsc b/OpenCorePkg.dsc
@@ -405,7 +405,8 @@
   gEfiMdePkgTokenSpaceGuid.PcdImageLoaderAlignmentPolicy|0xFFFFFFFF
   gEfiMdePkgTokenSpaceGuid.PcdImageLoaderRelocTypePolicy|0xFFFFFFFF
   gEfiMdePkgTokenSpaceGuid.PcdImageProtectionPolicy|0x00000003
-  
+  gEfiMdePkgTokenSpaceGuid.PcdUefiImageFormatSupportNonFv|0x01
+
 [PcdsPatchableInModule]
   gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterAccessWidth|8
   gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseMmio|FALSE
diff --git a/OpenDuetPkg.dsc b/OpenDuetPkg.dsc
@@ -139,6 +139,8 @@
       DxeServicesTableLib|MdeModulePkg/Library/DxeCoreDxeServicesTableLib/DxeCoreDxeServicesTableLib.inf
       UefiBootServicesTableLib|MdeModulePkg/Library/DxeCoreUefiBootServicesTableLib/DxeCoreUefiBootServicesTableLib.inf
       UefiRuntimeServicesTableLib|MdeModulePkg/Library/DxeCoreUefiRuntimeServicesTableLib/DxeCoreUefiRuntimeServicesTableLib.inf
+    <PcdsFixedAtBuild>
+      gEfiMdePkgTokenSpaceGuid.PcdUefiImageFormatSupportFv|0x03
   }
 
   MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
@@ -259,6 +261,7 @@
   gEfiMdePkgTokenSpaceGuid.PcdFixedDebugPrintErrorLevel|0x0
   gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x0
   gOpenCorePkgTokenSpaceGuid.PcdCanaryAllowRdtscFallback|TRUE
+  gEfiMdePkgTokenSpaceGuid.PcdUefiImageFormatSupportFv|0x02
 
 [BuildOptions]
   MSFT:NOOPT_*_*_CC_FLAGS    = -D OC_TARGET_RELEASE=1 /FAcs -Dinline=__inline  /GS /kernel
