diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2020-10-30 19:39:01 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2020-10-30 19:39:01 +0000 |
| commit | 10809e1d301004d8f0a26b3385cb45cee191dd09 (patch) | |
| tree | 8dd13c0aa04883db00365ece587cf79f890da7a1 /sys/arch | |
| parent | 9fecc3eefdbbd5defd626d2f43ff2bb88b95546c (diff) | |
Use a 64MB block to load the kernel to deal with kernel growth.
Note that the first 16MB of the block are currently unused since
we link our kernels at physical address 0x01000000. Therefore
32MB is no longer enough to load a kernel that is now larger than
16MB.
Fixes the "entry point at 0x10010000" hang that people have reported
on some machines.
ok patrick@, naddy@, deraadt@
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 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/amd64/stand/efiboot/conf.c b/sys/arch/amd64/stand/efiboot/conf.c index cd6f7b56f74..4e28984bb81 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.31 2020/09/01 18:03:09 patrick Exp $ */ +/* $OpenBSD: conf.c,v 1.32 2020/10/30 19:39:00 kettenis Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff @@ -40,7 +40,7 @@ #include "efidev.h" #include "efipxe.h" -const char version[] = "3.54"; +const char version[] = "3.55"; #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 a6bca1d64af..4d234600a28 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.35 2020/03/22 14:59:11 kettenis Exp $ */ +/* $OpenBSD: efiboot.c,v 1.36 2020/10/30 19:39:00 kettenis Exp $ */ /* * Copyright (c) 2015 YASUOKA Masahiko <yasuoka@yasuoka.net> @@ -39,7 +39,7 @@ #include "eficall.h" #include "run_i386.h" -#define KERN_LOADSPACE_SIZE (32 * 1024 * 1024) +#define KERN_LOADSPACE_SIZE (64 * 1024 * 1024) EFI_SYSTEM_TABLE *ST; EFI_BOOT_SERVICES *BS; |