diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2020-04-27 20:13:52 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2020-04-27 20:13:52 +0000 |
| commit | 4d34ee7cb6eb38049cce8ceb4a112eafe74120fe (patch) | |
| tree | 67c39debf3fe7d8c9a661edd7671141a92499ccf /sys/arch | |
| parent | dd0655155159a5aef9027b45c197114cd421ac8a (diff) | |
Remove reset hack; these days the U-Boot we ship for the CuBox-i is
perfectly happy without it.
ok patrick@
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/armv7/stand/efiboot/efiboot.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/sys/arch/armv7/stand/efiboot/efiboot.c b/sys/arch/armv7/stand/efiboot/efiboot.c index 740dd35396b..7360d40d6a2 100644 --- a/sys/arch/armv7/stand/efiboot/efiboot.c +++ b/sys/arch/armv7/stand/efiboot/efiboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: efiboot.c,v 1.28 2020/03/30 11:55:47 kettenis Exp $ */ +/* $OpenBSD: efiboot.c,v 1.29 2020/04/27 20:13:51 kettenis Exp $ */ /* * Copyright (c) 2015 YASUOKA Masahiko <yasuoka@yasuoka.net> @@ -627,16 +627,7 @@ _rtt(void) printf("Hit any key to reboot\n"); efi_cons_getc(0); #endif - /* - * XXX ResetSystem doesn't seem to work on U-Boot 2017.03 on - * the CuBox-i. So trigger an unimplemented instruction trap - * instead. - */ -#if 1 - asm volatile(".word 0xa000f7f0\n"); -#else RS->ResetSystem(EfiResetCold, EFI_SUCCESS, 0, NULL); -#endif for (;;) continue; } |