MdePkg/Uefi ARM: only support native ARM/Thumb images

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

diff --git a/MdePkg/Include/Uefi/UefiBaseType.h b/MdePkg/Include/Uefi/UefiBaseType.h
index 84e4dc65bf7d1e3c051ba9bde3657835ca84f2be..d9556cd2ec4e44e02a5819c9562341e4624f0c77 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 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
 Portions copyright (c) 2011 - 2016, ARM Ltd. All rights reserved.<BR>\r
 \r
 This program and the accompanying materials are licensed and made available under \r
@@ -87,16 +87,12 @@ typedef struct {
 ///\r
 /// 4-byte buffer. An IPv4 internet protocol address.\r
 ///\r
-typedef struct {\r
-  UINT8 Addr[4];\r
-} EFI_IPv4_ADDRESS;\r
+typedef IPv4_ADDRESS EFI_IPv4_ADDRESS;\r
 \r
 ///\r
 /// 16-byte buffer. An IPv6 internet protocol address.\r
 ///\r
-typedef struct {\r
-  UINT8 Addr[16];\r
-} EFI_IPv6_ADDRESS;\r
+typedef IPv6_ADDRESS EFI_IPv6_ADDRESS;\r
 \r
 ///\r
 /// 32-byte buffer containing a network Media Access Control address.\r
@@ -274,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