From aa85c2918a6c63887f492fe7a8a88ed8fbb933f2 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Wed, 1 Feb 2023 10:49:02 +0000 Subject: [efi] Update to current EDK2 headers Update to pick up the upstream commit bda715b ("MdePkg: Fix UINT64 and INT64 word length for LoongArch64"). Signed-off-by: Michael Brown --- src/include/ipxe/efi/LoongArch64/ProcessorBind.h | 22 +++++++++++----------- src/include/ipxe/efi/Pi/PiDxeCis.h | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/include/ipxe/efi/LoongArch64/ProcessorBind.h b/src/include/ipxe/efi/LoongArch64/ProcessorBind.h index 1f787a85..42d8b794 100644 --- a/src/include/ipxe/efi/LoongArch64/ProcessorBind.h +++ b/src/include/ipxe/efi/LoongArch64/ProcessorBind.h @@ -30,17 +30,17 @@ FILE_LICENCE ( BSD2_PATENT ); // Assume standard LoongArch 64-bit alignment. // Need to check portability of long long // -typedef unsigned long UINT64; -typedef long INT64; -typedef unsigned int UINT32; -typedef int INT32; -typedef unsigned short UINT16; -typedef unsigned short CHAR16; -typedef short INT16; -typedef unsigned char BOOLEAN; -typedef unsigned char UINT8; -typedef char CHAR8; -typedef char INT8; +typedef unsigned long long UINT64; +typedef long long INT64; +typedef unsigned int UINT32; +typedef int INT32; +typedef unsigned short UINT16; +typedef unsigned short CHAR16; +typedef short INT16; +typedef unsigned char BOOLEAN; +typedef unsigned char UINT8; +typedef char CHAR8; +typedef char INT8; // // Unsigned value of native width. (4 bytes on supported 32-bit processor instructions, diff --git a/src/include/ipxe/efi/Pi/PiDxeCis.h b/src/include/ipxe/efi/Pi/PiDxeCis.h index 506abfdc..9b925493 100644 --- a/src/include/ipxe/efi/Pi/PiDxeCis.h +++ b/src/include/ipxe/efi/Pi/PiDxeCis.h @@ -66,7 +66,7 @@ typedef enum { // /// EfiGcdMemoryTypeUnaccepted is defined in PrePiDxeCis.h because it has not been // /// defined in PI spec. // EfiGcdMemoryTypeUnaccepted, - EfiGcdMemoryTypeMaximum = 8 + EfiGcdMemoryTypeMaximum = 7 } EFI_GCD_MEMORY_TYPE; /// -- cgit v1.2.1