d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Split out the loader efifb setup to a new function"

Browse Source 
It was broken by a rebase. Revert until it can be fixed.

This reverts commit c8db60c067.
This commit is contained in:
Andrew Turner 2021-03-03 16:09:00 +00:00
parent 622d17da46
commit 773fc43fb0
1 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
stand/efi/loader/bootinfo.c
View File

@ -299,9 +299,6 @@ bi_load_efi_data(struct preloaded_file *kfp, bool exit_bs)
bool do_vmap; bool do_vmap;
#if defined(__amd64__) || defined(__aarch64__) #if defined(__amd64__) || defined(__aarch64__)
static void
bi_load_efifb(struct preloaded_file *kfp)
{
struct efi_fb efifb; struct efi_fb efifb;
efifb.fb_addr = gfx_state.tg_fb.fb_addr; 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) if (efifb.fb_addr != 0)
file_addmetadata(kfp, MODINFOMD_EFI_FB, sizeof(efifb), &efifb); 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 #endif
do_vmap = true; do_vmap = true;