From owner-svn-src-all@FreeBSD.ORG  Fri Apr 10 18:08:10 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5C30C7BA;
 Fri, 10 Apr 2015 18:08:10 +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 4724ADB2;
 Fri, 10 Apr 2015 18:08:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3AI8AnB033278;
 Fri, 10 Apr 2015 18:08:10 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3AI8AYC033277;
 Fri, 10 Apr 2015 18:08:10 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201504101808.t3AI8AYC033277@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Fri, 10 Apr 2015 18:08:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r281376 - 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, 10 Apr 2015 18:08:10 -0000

Author: emaste
Date: Fri Apr 10 18:08:09 2015
New Revision: 281376
URL: https://svnweb.freebsd.org/changeset/base/281376

Log:
  Limit EFI framebuffer metadata to amd64 for now
  
  The i386 loader.efi does not yet exist. Avoid dealing with vt and
  framebuffer issues there until the initial bootstrapping is done.

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 10 17:55:45 2015	(r281375)
+++ head/sys/boot/efi/loader/bootinfo.c	Fri Apr 10 18:08:09 2015	(r281376)
@@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$");
 #include "bootstrap.h"
 #include "loader_efi.h"
 
-#if defined(__amd64__) || defined(__i386__)
+#if defined(__amd64__)
 #include <machine/specialreg.h>
 #include "framebuffer.h"
 #endif
@@ -244,7 +244,7 @@ bi_load_efi_data(struct preloaded_file *
 	UINT32 mmver;
 	struct efi_map_header *efihdr;
 
-#if defined(__amd64__) || defined(__i386__)
+#if defined(__amd64__)
 	struct efi_fb efifb;
 
 	if (efi_find_framebuffer(&efifb) == 0) {