From 36725fc471bebbd0646af0cffafdae6debca36cc Mon Sep 17 00:00:00 2001 From: Andrew Turner Date: Fri, 3 Apr 2015 12:54:38 +0000 Subject: [PATCH] Only enable the efi framebuffer on x86 for now --- sys/boot/efi/loader/bootinfo.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/sys/boot/efi/loader/bootinfo.c b/sys/boot/efi/loader/bootinfo.c index bdad0beae320..28ec620780b2 100644 --- a/sys/boot/efi/loader/bootinfo.c +++ b/sys/boot/efi/loader/bootinfo.c @@ -40,17 +40,17 @@ __FBSDID("$FreeBSD$"); #include #include -#if defined(__amd64__) || defined(__i386__) -#include -#endif - #include #include #include "bootstrap.h" -#include "framebuffer.h" #include "loader_efi.h" +#if defined(__amd64__) || defined(__i386__) +#include +#include "framebuffer.h" +#endif + UINTN efi_mapkey; static const char howto_switches[] = "aCdrgDmphsv"; @@ -236,6 +236,8 @@ bi_load_efi_data(struct preloaded_file *kfp) UINTN mmsz, pages, sz; UINT32 mmver; struct efi_map_header *efihdr; + +#if defined(__amd64__) || defined(__i386__) struct efi_fb efifb; if (efi_find_framebuffer(&efifb) == 0) { @@ -251,6 +253,7 @@ bi_load_efi_data(struct preloaded_file *kfp) file_addmetadata(kfp, MODINFOMD_EFI_FB, sizeof(efifb), &efifb); } +#endif efisz = (sizeof(struct efi_map_header) + 0xf) & ~0xf;