From 784f925e507f441206279a1e8776629fa7cdd14c Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Thu, 1 Feb 2024 18:37:12 -0700 Subject: [PATCH] loader: Font module is EFI dependent The font module is part of the gfx_fb support. Since we share this file between EFI and kboot, we only want to pass the font data to the kernel when we're booting from EFI, not kboot. Sponsored by: Netflix --- stand/efi/loader/bootinfo.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stand/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.c index f47d81e2359..13b6df9c5b0 100644 --- a/stand/efi/loader/bootinfo.c +++ b/stand/efi/loader/bootinfo.c @@ -386,10 +386,12 @@ bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp, bool exit_bs) /* Pad to a page boundary. */ addr = roundup(addr, PAGE_SIZE); +#ifdef EFI addr = build_font_module(addr); /* Pad to a page boundary. */ addr = roundup(addr, PAGE_SIZE); +#endif /* Copy our environment. */ envp = addr;