From owner-svn-src-all@FreeBSD.ORG  Tue Apr 14 14:15:16 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 E30694C1;
 Tue, 14 Apr 2015 14:15:16 +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 CDADE849;
 Tue, 14 Apr 2015 14:15:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3EEFFH7004617;
 Tue, 14 Apr 2015 14:15:15 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3EEFFT7004615;
 Tue, 14 Apr 2015 14:15:15 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201504141415.t3EEFFT7004615@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: Tue, 14 Apr 2015 14:15:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r281527 - in head/sys/boot: . efi/loader/arch/arm
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.20
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: Tue, 14 Apr 2015 14:15:17 -0000

Author: andrew
Date: Tue Apr 14 14:15:14 2015
New Revision: 281527
URL: https://svnweb.freebsd.org/changeset/base/281527

Log:
  * Remove the wfi when the efi loader returns, it's unneeded and is not
    available on older designs.
  * Enable the efi loader on arm

Modified:
  head/sys/boot/Makefile.arm
  head/sys/boot/efi/loader/arch/arm/start.S

Modified: head/sys/boot/Makefile.arm
==============================================================================
--- head/sys/boot/Makefile.arm	Tue Apr 14 13:55:01 2015	(r281526)
+++ head/sys/boot/Makefile.arm	Tue Apr 14 14:15:14 2015	(r281527)
@@ -4,4 +4,4 @@
 SUBDIR+=		fdt
 .endif
 
-SUBDIR+=		uboot
+SUBDIR+=		efi uboot

Modified: head/sys/boot/efi/loader/arch/arm/start.S
==============================================================================
--- head/sys/boot/efi/loader/arch/arm/start.S	Tue Apr 14 13:55:01 2015	(r281526)
+++ head/sys/boot/efi/loader/arch/arm/start.S	Tue Apr 14 14:15:14 2015	(r281527)
@@ -169,8 +169,7 @@ _start:
 	pop	{r0, r1}
 	bl	_C_LABEL(efi_main)
 
-1:	WFI
-	b	1b
+1:	b	1b
 
 .Lbase:
 	.word	.