UE: Made UE the only supported format in FVs.

Outside FVs both UE and PE are allowed.
acidanthera · Oct 27, 2023 · 10ada77 · 10ada77
1 parent 4964f0a
commit 10ada77
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/MdePkg/Include/Library/UefiImageLib.h b/MdePkg/Include/Library/UefiImageLib.h
@@ -6,8 +6,8 @@
 #include <Library/PeCoffLib2.h>
 
 typedef enum {
-  UefiImageFormatUe = 0,
-  UefiImageFormatPe = 1,
+  UefiImageFormatPe = 0,
+  UefiImageFormatUe = 1,
   UefiImageFormatMax
 } UEFI_IMAGE_FORMAT;
 

diff --git a/MdePkg/Library/BaseUefiImageLib/UefiImageLib.c b/MdePkg/Library/BaseUefiImageLib/UefiImageLib.c
@@ -135,7 +135,7 @@ UefiImageInitializeContextPreHash (
   Status = RETURN_UNSUPPORTED;
 
   STATIC_ASSERT (
-    UefiImageFormatPe == UefiImageFormatMax - 1,
+    UefiImageFormatUe == UefiImageFormatMax - 1,
     "Support for more formats needs to be added above."
     );
 

diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec
@@ -2306,13 +2306,15 @@
 
   ## Indicates the UEFI image file formats supported outside FVs.<BR><BR>
   #  BIT0 - PE.<BR>
+  #  BIT1 - UE.<BR>
   # @Prompt Supported UEFI image file formats outside FVs.
-  gEfiMdePkgTokenSpaceGuid.PcdUefiImageFormatSupportNonFv|0x02|UINT8|0x40002000
+  gEfiMdePkgTokenSpaceGuid.PcdUefiImageFormatSupportNonFv|0x03|UINT8|0x40002000
 
   ## Indicates the UEFI image file formats supported inside FVs.<BR><BR>
   #  BIT0 - PE.<BR>
+  #  BIT1 - UE.<BR>
   # @Prompt Supported UEFI image file formats inside FVs.
-  gEfiMdePkgTokenSpaceGuid.PcdUefiImageFormatSupportFv|0x03|UINT8|0x40002001
+  gEfiMdePkgTokenSpaceGuid.PcdUefiImageFormatSupportFv|0x02|UINT8|0x40002001
 
 [PcdsFixedAtBuild,PcdsPatchableInModule]
   ## Indicates the maximum length of unicode string used in the following