git: 80661e2153d2 - main - loader/efi: fix non-x86 build
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 10 Sep 2025 08:00:03 UTC
The branch main has been updated by vexeduxr:
URL: https://cgit.FreeBSD.org/src/commit/?id=80661e2153d2bc916444cb3be8aa50d0d110ad57
commit 80661e2153d2bc916444cb3be8aa50d0d110ad57
Author: Ahmad Khalifa <vexeduxr@FreeBSD.org>
AuthorDate: 2025-09-10 07:43:27 +0000
Commit: Ahmad Khalifa <vexeduxr@FreeBSD.org>
CommitDate: 2025-09-10 07:48:20 +0000
loader/efi: fix non-x86 build
Pointy hat to: vexeduxr
Reported by: Bakul Shah
---
stand/efi/loader/bootinfo.c | 2 +-
stand/efi/loader/copy.c | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/stand/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.c
index 3230200e9be5..7931622c2df6 100644
--- a/stand/efi/loader/bootinfo.c
+++ b/stand/efi/loader/bootinfo.c
@@ -67,7 +67,7 @@
static int
bi_getboothowto(char *kargs)
{
-#ifdef EFI
+#if defined(EFI) && (defined(__i386__) || defined(__amd64__))
const char *tmp;
int speed, port;
char buf[50];
diff --git a/stand/efi/loader/copy.c b/stand/efi/loader/copy.c
index bf1a7a075400..7452726565ad 100644
--- a/stand/efi/loader/copy.c
+++ b/stand/efi/loader/copy.c
@@ -405,7 +405,9 @@ efi_check_space(vm_offset_t end)
return (true);
}
+#if defined(__amd64__) || defined(__i386__)
before_staging:
+#endif
/* Try allocating space before the previous allocation */
if (staging < nr_pages * EFI_PAGE_SIZE)
goto expand;