MdePkg/UefiSpec: separate page access bitmask from SP and CRYPTO caps

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

diff --git a/MdePkg/Include/Uefi/UefiBaseType.h b/MdePkg/Include/Uefi/UefiBaseType.h
index 8c9d571eb1cea855588ebc7103ed0ad007b8005e..934fc07285d99e59588513502356363e6b4e2c35 100644 (file)
--- a/MdePkg/Include/Uefi/UefiBaseType.h
+++ b/MdePkg/Include/Uefi/UefiBaseType.h
@@ -3,14 +3,9 @@
 \r
 Copyright (c) 2006 - 2018, 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
-This program and the accompanying materials are licensed and made available under\r
-the terms and conditions of the BSD License that accompanies this distribution.\r
-The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php.\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -246,18 +241,24 @@ typedef union {
 ///\r
 #define EFI_IMAGE_MACHINE_AARCH64  0xAA64\r
 \r
+///\r
+/// PE32+ Machine type for RISC-V 32/64/128\r
+///\r
+#define EFI_IMAGE_MACHINE_RISCV32   0x5032\r
+#define EFI_IMAGE_MACHINE_RISCV64   0x5064\r
+#define EFI_IMAGE_MACHINE_RISCV128  0x5128\r
 \r
 #if   defined (MDE_CPU_IA32)\r
 \r
 #define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) \\r
-  (((Machine) == EFI_IMAGE_MACHINE_IA32) || ((Machine) == EFI_IMAGE_MACHINE_EBC))\r
+  ((Machine) == EFI_IMAGE_MACHINE_IA32)\r
 \r
 #define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) ((Machine) == EFI_IMAGE_MACHINE_X64)\r
 \r
 #elif defined (MDE_CPU_X64)\r
 \r
 #define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) \\r
-  (((Machine) == EFI_IMAGE_MACHINE_X64) || ((Machine) == EFI_IMAGE_MACHINE_EBC))\r
+  ((Machine) == EFI_IMAGE_MACHINE_X64)\r
 \r
 #define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) ((Machine) == EFI_IMAGE_MACHINE_IA32)\r
 \r
@@ -270,7 +271,13 @@ typedef union {
 #elif defined (MDE_CPU_AARCH64)\r
 \r
 #define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) \\r
-  (((Machine) == EFI_IMAGE_MACHINE_AARCH64) || ((Machine) == EFI_IMAGE_MACHINE_EBC))\r
+  ((Machine) == EFI_IMAGE_MACHINE_AARCH64)\r
+\r
+#define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) (FALSE)\r
+\r
+#elif defined (MDE_CPU_RISCV64)\r
+#define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) \\r
+  ((Machine) == EFI_IMAGE_MACHINE_RISCV64)\r
 \r
 #define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) (FALSE)\r
 \r