Date: Fri, 3 Apr 2015 12:54:39 +0000 (UTC) From: Andrew Turner <andrew@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r281022 - head/sys/boot/efi/loader Message-ID: <201504031254.t33CsdGd045549@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: andrew Date: Fri Apr 3 12:54:38 2015 New Revision: 281022 URL: https://svnweb.freebsd.org/changeset/base/281022 Log: Only enable the efi framebuffer on x86 for now Modified: head/sys/boot/efi/loader/bootinfo.c Modified: head/sys/boot/efi/loader/bootinfo.c ============================================================================== --- head/sys/boot/efi/loader/bootinfo.c Fri Apr 3 12:30:18 2015 (r281021) +++ head/sys/boot/efi/loader/bootinfo.c Fri Apr 3 12:54:38 2015 (r281022) @@ -40,17 +40,17 @@ __FBSDID("$FreeBSD$"); #include <machine/metadata.h> #include <machine/psl.h> -#if defined(__amd64__) || defined(__i386__) -#include <machine/specialreg.h> -#endif - #include <efi.h> #include <efilib.h> #include "bootstrap.h" -#include "framebuffer.h" #include "loader_efi.h" +#if defined(__amd64__) || defined(__i386__) +#include <machine/specialreg.h> +#include "framebuffer.h" +#endif + UINTN efi_mapkey; static const char howto_switches[] = "aCdrgDmphsv"; @@ -236,6 +236,8 @@ bi_load_efi_data(struct preloaded_file * 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 * file_addmetadata(kfp, MODINFOMD_EFI_FB, sizeof(efifb), &efifb); } +#endif efisz = (sizeof(struct efi_map_header) + 0xf) & ~0xf;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504031254.t33CsdGd045549>