Utilities: Assigned default values to PcdUefiImageFormatSupportNonFv

and PcdImageProtectionPolicy, adjusted Policy in tools.

User/Library/UserPcd.c

@@ -48,6 +48,6 @@ UINT32   _gPcd_FixedAtBuild_PcdImageLoaderAlignmentPolicy            = 0xFFFFFFF
 UINT32   _gPcd_FixedAtBuild_PcdImageLoaderRelocTypePolicy            = 0x00;
 BOOLEAN  _gPcd_FeatureFlag_PcdFatReadOnlyMode                        = _PCD_VALUE_PcdFatReadOnlyMode;
 UINT32   _gPcd_BinaryPatch_PcdSerialRegisterStride                   = 0;
-UINT8    _gPcd_FixedAtBuild_PcdUefiImageFormatSupportNonFv           = 0x00;
+UINT8    _gPcd_FixedAtBuild_PcdUefiImageFormatSupportNonFv           = 0x02;
 UINT8    _gPcd_FixedAtBuild_PcdUefiImageFormatSupportFv              = 0x03;
-UINT32   _gPcd_FixedAtBuild_PcdImageProtectionPolicy                 = 0x00;
+UINT32   _gPcd_FixedAtBuild_PcdImageProtectionPolicy                 = 0x07;

Utilities/AppleEfiSignTool/AppleEfiSignTool.c

@@ -189,6 +189,12 @@ ENTRY_POINT (
   PcdGet32 (PcdFixedDebugPrintErrorLevel) |= DEBUG_INFO;
   PcdGet32 (PcdDebugPrintErrorLevel)      |= DEBUG_INFO;
 
+  //
+  // Match PcdImageProtectionPolicy defined in OpenCore.dsc.
+  // Apple images (supplied by user) may be not 4KBi aligned.
+  //
+  PcdGet32 (PcdImageProtectionPolicy) = 0x03;
+
   //
   // Process args or print usage.
   //

Utilities/TestPeCoff/PeCoff.c

@@ -291,6 +291,11 @@ ENTRY_POINT (
   PcdGet32 (PcdFixedDebugPrintErrorLevel) |= DEBUG_INFO;
   PcdGet32 (PcdDebugPrintErrorLevel)      |= DEBUG_INFO;
 
+  //
+  // Images may be not 4KBi aligned.
+  //
+  PcdGet32 (PcdImageProtectionPolicy) = 0x00;
+
   // PcdGet32 (PcdFixedDebugPrintErrorLevel) |= DEBUG_POOL | DEBUG_PAGE;
   // PcdGet32 (PcdDebugPrintErrorLevel)      |= DEBUG_POOL | DEBUG_PAGE;