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

Split out the loader efifb setup to a new function

Browse Source 
This makes bi_load_efi_data cleaner to add common acpi setup code.

Reviewed by:	imp, tsoome
Sponsored by:	Innovate UK
Differential Revision:	https://reviews.freebsd.org/D28936
This commit is contained in:
Andrew Turner 2021-02-26 11:47:34 +00:00
parent 8a272653d9
commit c8db60c067
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -299,6 +299,9 @@ 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;
@ -321,6 +324,25 @@ bi_load_efi_data(struct preloaded_file *kfp, bool exit_bs)
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;