MdePkg/Uefi ARM: only support native ARM/Thumb images
authorArd Biesheuvel <ard.biesheuvel@linaro.org>
Fri, 8 Dec 2017 15:48:14 +0000 (15:48 +0000)
committerArd Biesheuvel <ard.biesheuvel@linaro.org>
Mon, 11 Dec 2017 18:00:47 +0000 (18:00 +0000)
The ARM calling convention is fundamentally incompatible with EBC,
and having a cross compatible machine type identical to the native
type does not make a lot of sense either. So restrict the compatible
machine type for ARM to EFI_IMAGE_MACHINE_ARMTHUMB_MIXED, and remove
the cross compatible.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Liming Gao <liming.gao@intel.com>
MdePkg/Include/Uefi/UefiBaseType.h

index 728a047..d9556cd 100644 (file)
@@ -270,10 +270,9 @@ typedef union {
 \r
 #elif defined (MDE_CPU_ARM)\r
 \r
-#define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) \\r
-  (((Machine) == EFI_IMAGE_MACHINE_ARMTHUMB_MIXED) || ((Machine) == EFI_IMAGE_MACHINE_EBC))\r
+#define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) ((Machine) == EFI_IMAGE_MACHINE_ARMTHUMB_MIXED)\r
 \r
-#define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) ((Machine) == EFI_IMAGE_MACHINE_ARMTHUMB_MIXED) \r
+#define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) (FALSE)\r
 \r
 #elif defined (MDE_CPU_AARCH64)\r
 \r