diff options
| author | Andrew Turner <andrew@FreeBSD.org> | 2021-03-03 16:09:00 +0000 |
|---|---|---|
| committer | Andrew Turner <andrew@FreeBSD.org> | 2021-03-03 16:10:12 +0000 |
| commit | 773fc43fb060149f8e59c183e5da79feaf118c8c (patch) | |
| tree | c6f2b60620e9d7969fb0ddba56c35b8bcf6424cf /stand/efi/loader | |
| parent | 622d17da46eb360c3d6847e4da8dbb166b775d14 (diff) | |
| download | src-773fc43fb060149f8e59c183e5da79feaf118c8c.tar.gz src-773fc43fb060149f8e59c183e5da79feaf118c8c.zip | |
Revert "Split out the loader efifb setup to a new function"
It was broken by a rebase. Revert until it can be fixed.
This reverts commit c8db60c0673d4bb7a3a3e2c043804e1ed1108c2f.
Diffstat (limited to 'stand/efi/loader')
| -rw-r--r-- | stand/efi/loader/bootinfo.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/stand/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.c index 327751e32f0b..9924901d29e6 100644 --- a/stand/efi/loader/bootinfo.c +++ b/stand/efi/loader/bootinfo.c @@ -299,9 +299,6 @@ bi_load_efi_data(struct preloaded_file *kfp, bool exit_bs) bool do_vmap; #if defined(__amd64__) || defined(__aarch64__) -static void -bi_load_efifb(struct preloaded_file *kfp) -{ struct efi_fb efifb; efifb.fb_addr = gfx_state.tg_fb.fb_addr; @@ -324,25 +321,6 @@ bi_load_efifb(struct preloaded_file *kfp) if (efifb.fb_addr != 0) file_addmetadata(kfp, MODINFOMD_EFI_FB, sizeof(efifb), &efifb); -} -#endif - -static int -bi_load_efi_data(struct preloaded_file *kfp, bool exit_bs) -{ - EFI_MEMORY_DESCRIPTOR *mm; - EFI_PHYSICAL_ADDRESS addr = 0; - EFI_STATUS status; - const char *efi_novmap; - size_t efisz; - UINTN efi_mapkey; - UINTN dsz, pages, retry, sz; - UINT32 mmver; - struct efi_map_header *efihdr; - bool do_vmap; - -#if defined(__amd64__) || defined(__aarch64__) - bi_load_efifb(kfp); #endif do_vmap = true; |