From owner-svn-src-all@FreeBSD.ORG  Fri Apr  3 12:54:39 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id EA159582;
 Fri,  3 Apr 2015 12:54:39 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D4D7163F;
 Fri,  3 Apr 2015 12:54:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t33CsdUC045550;
 Fri, 3 Apr 2015 12:54:39 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t33CsdGd045549;
 Fri, 3 Apr 2015 12:54:39 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201504031254.t33CsdGd045549@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: andrew set sender to
 andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Fri, 3 Apr 2015 12:54:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r281022 - head/sys/boot/efi/loader
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Apr 2015 12:54:40 -0000

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;