diff options
| author | andrew <andrew@FreeBSD.org> | 2015-04-14 14:15:14 +0000 |
|---|---|---|
| committer | andrew <andrew@FreeBSD.org> | 2015-04-14 14:15:14 +0000 |
| commit | cbac2d0bca920a7c215b3025f48d6f679fff6df6 (patch) | |
| tree | 5ef31a826c040b66644816e7497e37d28ef80315 /sys/boot | |
| parent | 9a386b11c57a3a0dff72160f694595d2483fc741 (diff) | |
| download | FreeBSD-src-cbac2d0bca920a7c215b3025f48d6f679fff6df6.zip FreeBSD-src-cbac2d0bca920a7c215b3025f48d6f679fff6df6.tar.gz | |
* Remove the wfi when the efi loader returns, it's unneeded and is not
available on older designs.
* Enable the efi loader on arm
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/Makefile.arm | 2 | ||||
| -rw-r--r-- | sys/boot/efi/loader/arch/arm/start.S | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sys/boot/Makefile.arm b/sys/boot/Makefile.arm index 46fc574..bb0e01c 100644 --- a/sys/boot/Makefile.arm +++ b/sys/boot/Makefile.arm @@ -4,4 +4,4 @@ SUBDIR+= fdt .endif -SUBDIR+= uboot +SUBDIR+= efi uboot diff --git a/sys/boot/efi/loader/arch/arm/start.S b/sys/boot/efi/loader/arch/arm/start.S index 0bb709c..4160655 100644 --- a/sys/boot/efi/loader/arch/arm/start.S +++ b/sys/boot/efi/loader/arch/arm/start.S @@ -169,8 +169,7 @@ _start: pop {r0, r1} bl _C_LABEL(efi_main) -1: WFI - b 1b +1: b 1b .Lbase: .word . |
