svn commit: r281527 - in head/sys/boot: . efi/loader/arch/arm

[Andrew Turner]

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	.