MdePkg/Include: Allow CPU specific defines to be predefined

[mirror_edk2.git] / MdePkg / Include / Uefi / UefiBaseType.h

diff --git a/MdePkg/Include/Uefi/UefiBaseType.h b/MdePkg/Include/Uefi/UefiBaseType.h
index 934fc07285d99e59588513502356363e6b4e2c35..45e2aa63bb3412addc622a47e3691db5dde2e89e 100644 (file)
--- a/MdePkg/Include/Uefi/UefiBaseType.h
+++ b/MdePkg/Include/Uefi/UefiBaseType.h
@@ -1,7 +1,7 @@
 /** @file\r
   Defines data types and constants introduced in UEFI.\r
 \r
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2021, Intel Corporation. All rights reserved.<BR>\r
 Portions copyright (c) 2011 - 2016, ARM Ltd. All rights reserved.<BR>\r
 Copyright (c) 2020, Hewlett Packard Enterprise Development LP. All rights reserved.<BR>\r
 \r
@@ -248,6 +248,7 @@ typedef union {
 #define EFI_IMAGE_MACHINE_RISCV64   0x5064\r
 #define EFI_IMAGE_MACHINE_RISCV128  0x5128\r
 \r
+#if !defined(EFI_IMAGE_MACHINE_TYPE_VALUE) && !defined(EFI_IMAGE_MACHINE_CROSS_TYPE_VALUE)\r
 #if   defined (MDE_CPU_IA32)\r
 \r
 #define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) \\r
@@ -294,5 +295,17 @@ typedef union {
 #else\r
 #error Unknown Processor Type\r
 #endif\r
+#else\r
+#if defined (EFI_IMAGE_MACHINE_TYPE_VALUE)\r
+#define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) ((Machine) == EFI_IMAGE_MACHINE_TYPE_VALUE)\r
+#else\r
+#define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) (FALSE)\r
+#endif\r
+#if defined (EFI_IMAGE_MACHINE_CROSS_TYPE_VALUE)\r
+#define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) ((Machine) == EFI_IMAGE_MACHINE_CROSS_TYPE_VALUE)\r
+#else\r
+#define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) (FALSE)\r
+#endif\r
+#endif\r
 \r
 #endif\r