diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2020-03-22 14:59:12 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2020-03-22 14:59:12 +0000 |
| commit | 6239687c03b606750cd5114319cf620d14546a7f (patch) | |
| tree | d8ff2f97c5bcc486e59458f262762877f33c74c4 /sys/arch | |
| parent | 4a44f03a66c2eeaa8bce4eaf3b4b97fe5de6d5e9 (diff) | |
Make efi_device_path_depth() return the full device path depth if we don't
find a media device path node. Fixes booting OpenBSD on some older U-Boot
versions that are in wide circulation such as 2017.09 and 2017.11.
ok patrick@
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/amd64/stand/efiboot/conf.c | 4 | ||||
| -rw-r--r-- | sys/arch/amd64/stand/efiboot/efiboot.c | 4 | ||||
| -rw-r--r-- | sys/arch/arm64/stand/efiboot/conf.c | 4 | ||||
| -rw-r--r-- | sys/arch/arm64/stand/efiboot/efiboot.c | 4 | ||||
| -rw-r--r-- | sys/arch/armv7/stand/efiboot/conf.c | 4 | ||||
| -rw-r--r-- | sys/arch/armv7/stand/efiboot/efiboot.c | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/sys/arch/amd64/stand/efiboot/conf.c b/sys/arch/amd64/stand/efiboot/conf.c index cbd5b964549..3eb745d808d 100644 --- a/sys/arch/amd64/stand/efiboot/conf.c +++ b/sys/arch/amd64/stand/efiboot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.26 2020/03/05 16:36:30 otto Exp $ */ +/* $OpenBSD: conf.c,v 1.27 2020/03/22 14:59:11 kettenis Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff @@ -40,7 +40,7 @@ #include "efidev.h" #include "efipxe.h" -const char version[] = "3.49"; +const char version[] = "3.50"; #ifdef EFI_DEBUG int debug = 0; diff --git a/sys/arch/amd64/stand/efiboot/efiboot.c b/sys/arch/amd64/stand/efiboot/efiboot.c index 73ce1606c61..a6bca1d64af 100644 --- a/sys/arch/amd64/stand/efiboot/efiboot.c +++ b/sys/arch/amd64/stand/efiboot/efiboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: efiboot.c,v 1.34 2019/11/29 16:16:19 kettenis Exp $ */ +/* $OpenBSD: efiboot.c,v 1.35 2020/03/22 14:59:11 kettenis Exp $ */ /* * Copyright (c) 2015 YASUOKA Masahiko <yasuoka@yasuoka.net> @@ -253,7 +253,7 @@ efi_device_path_depth(EFI_DEVICE_PATH *dp, int dptype) return (i); } - return (-1); + return (i); } int diff --git a/sys/arch/arm64/stand/efiboot/conf.c b/sys/arch/arm64/stand/efiboot/conf.c index 43ed4534934..daaae25fb4c 100644 --- a/sys/arch/arm64/stand/efiboot/conf.c +++ b/sys/arch/arm64/stand/efiboot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.25 2020/02/29 11:58:57 otto Exp $ */ +/* $OpenBSD: conf.c,v 1.26 2020/03/22 14:59:11 kettenis Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff @@ -46,7 +46,7 @@ #include "efipxe.h" #include "softraid_arm64.h" -const char version[] = "0.20"; +const char version[] = "0.21"; int debug = 0; struct fs_ops file_system[] = { diff --git a/sys/arch/arm64/stand/efiboot/efiboot.c b/sys/arch/arm64/stand/efiboot/efiboot.c index 583eff0e444..9932eefc5ba 100644 --- a/sys/arch/arm64/stand/efiboot/efiboot.c +++ b/sys/arch/arm64/stand/efiboot/efiboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: efiboot.c,v 1.26 2019/08/12 20:04:31 kettenis Exp $ */ +/* $OpenBSD: efiboot.c,v 1.27 2020/03/22 14:59:11 kettenis Exp $ */ /* * Copyright (c) 2015 YASUOKA Masahiko <yasuoka@yasuoka.net> @@ -308,7 +308,7 @@ efi_device_path_depth(EFI_DEVICE_PATH *dp, int dptype) return (i); } - return (-1); + return (i); } int diff --git a/sys/arch/armv7/stand/efiboot/conf.c b/sys/arch/armv7/stand/efiboot/conf.c index 40bfe5a1419..aae1ae245bb 100644 --- a/sys/arch/armv7/stand/efiboot/conf.c +++ b/sys/arch/armv7/stand/efiboot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.23 2020/03/01 15:04:48 otto Exp $ */ +/* $OpenBSD: conf.c,v 1.24 2020/03/22 14:59:11 kettenis Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff @@ -42,7 +42,7 @@ #include "efidev.h" #include "efipxe.h" -const char version[] = "1.10"; +const char version[] = "1.11"; int debug = 0; struct fs_ops file_system[] = { diff --git a/sys/arch/armv7/stand/efiboot/efiboot.c b/sys/arch/armv7/stand/efiboot/efiboot.c index 0b55ec254ae..904fe4979f8 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.26 2020/01/13 10:17:09 kettenis Exp $ */ +/* $OpenBSD: efiboot.c,v 1.27 2020/03/22 14:59:11 kettenis Exp $ */ /* * Copyright (c) 2015 YASUOKA Masahiko <yasuoka@yasuoka.net> @@ -301,7 +301,7 @@ efi_device_path_depth(EFI_DEVICE_PATH *dp, int dptype) return (i); } - return (-1); + return (i); } int |