From 5bf8b115271fe7cfb45d0e83ef9f29fcf609068a Mon Sep 17 00:00:00 2001
From: Michael Brown <mcb30@ipxe.org>
Date: Sat, 28 Jan 2023 16:24:05 +0000
Subject: [PATCH] [efi] Build util/efirom as a host-only binary

As with util/elf2efi32 and util/elf2efi64 in commit a99e435 ("[efi] Do
not rely on ProcessorBind.h when building host binaries"), build
util/efirom without using any architecture-specific EDK2 headers since
the build host's CPU architecture may not be supported by EDK2.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
---
 src/include/ipxe/efi/ProcessorBind.h | 3 +++
 src/util/efirom.c                    | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/src/include/ipxe/efi/ProcessorBind.h b/src/include/ipxe/efi/ProcessorBind.h
index eda609b94..8cc04e15b 100644
--- a/src/include/ipxe/efi/ProcessorBind.h
+++ b/src/include/ipxe/efi/ProcessorBind.h
@@ -40,6 +40,9 @@ typedef uint8_t BOOLEAN;
 /* Define an architecture-neutral MDE_CPU macro to prevent build errors */
 #define MDE_CPU_EBC
 
+/* Define MAX_BIT in terms of UINTN */
+#define MAX_BIT ( ( ( UINTN ) 1U ) << ( ( 8 * sizeof ( UINTN ) ) - 1 ) )
+
 #else /* EFI_HOSTONLY */
 
 #ifdef __i386__
diff --git a/src/util/efirom.c b/src/util/efirom.c
index 95feaf239..8ac7966ef 100644
--- a/src/util/efirom.c
+++ b/src/util/efirom.c
@@ -28,6 +28,8 @@
 #include <errno.h>
 #include <assert.h>
 #include <getopt.h>
+
+#define EFI_HOSTONLY
 #include <ipxe/efi/Uefi.h>
 #include <ipxe/efi/IndustryStandard/PeImage.h>
 #include <ipxe/efi/IndustryStandard/Pci22.h>