From owner-svn-src-head@FreeBSD.ORG  Fri Apr 10 18:49:45 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 662F8712;
 Fri, 10 Apr 2015 18:49:45 +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 50D5229B;
 Fri, 10 Apr 2015 18:49:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3AInjdl053500;
 Fri, 10 Apr 2015 18:49:45 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3AInipT053498;
 Fri, 10 Apr 2015 18:49:44 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201504101849.t3AInipT053498@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:49:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r281377 - head/sys/boot/efi/loader/arch/i386
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Apr 2015 18:49:45 -0000

Author: emaste
Date: Fri Apr 10 18:49:43 2015
New Revision: 281377
URL: https://svnweb.freebsd.org/changeset/base/281377

Log:
  Add build support for i386 loader.efi
  
  Kernel changes are required for this to be useful but this will allow
  others to experiment.
  
  Differential Revision:	https://reviews.freebsd.org/D2276

Added:
  head/sys/boot/efi/loader/arch/i386/Makefile.inc   (contents, props changed)
Modified:
  head/sys/boot/efi/loader/arch/i386/elf32_freebsd.c

Added: head/sys/boot/efi/loader/arch/i386/Makefile.inc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/boot/efi/loader/arch/i386/Makefile.inc	Fri Apr 10 18:49:43 2015	(r281377)
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+SRCS+=	start.S \
+	efimd.c \
+	elf32_freebsd.c \
+	exec.c \
+	reloc.c
+
+.PATH:	${.CURDIR}/../../i386/libi386
+SRCS+=	nullconsole.c \
+	comconsole.c

Modified: head/sys/boot/efi/loader/arch/i386/elf32_freebsd.c
==============================================================================
--- head/sys/boot/efi/loader/arch/i386/elf32_freebsd.c	Fri Apr 10 18:08:09 2015	(r281376)
+++ head/sys/boot/efi/loader/arch/i386/elf32_freebsd.c	Fri Apr 10 18:49:43 2015	(r281377)
@@ -48,6 +48,12 @@ static int	elf32_obj_exec(struct preload
 struct file_format i386_elf = { elf32_loadfile, elf32_exec };
 struct file_format i386_elf_obj = { elf32_obj_loadfile, elf32_obj_exec };
 
+struct file_format *file_formats[] = {
+	&i386_elf,
+	&i386_elf_obj,
+	NULL
+};
+
 /*
  * There is an ELF kernel and one or more ELF modules loaded.
  * We wish to start executing the kernel image, so make such