Commit 19e4f2f2 authored by Colin Percival's avatar Colin Percival
Browse files

efi loader: Call tslog_init from efi_main

We were calling tslog_init from main; no reason to wait that long.

Fixes:		f49381cc efi/loader: Call tslog_init
Sponsored by:	https://www.patreon.com/cperciva
parent 9d324b5f
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
#include <bootstrap.h>
#include <efi.h> #include <efi.h>
#include <eficonsctl.h> #include <eficonsctl.h>
#include <efilib.h> #include <efilib.h>
...@@ -101,6 +102,9 @@ efi_main(EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *system_table) ...@@ -101,6 +102,9 @@ efi_main(EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *system_table)
setheap((void *)(uintptr_t)heap, (void *)(uintptr_t)(heap + heapsize)); setheap((void *)(uintptr_t)heap, (void *)(uintptr_t)(heap + heapsize));
/* Start tslog now that we have a heap.*/
tslog_init();
/* Use efi_exit() from here on... */ /* Use efi_exit() from here on... */
status = OpenProtocolByHandle(IH, &image_protocol, (void**)&img); status = OpenProtocolByHandle(IH, &image_protocol, (void**)&img);
......
...@@ -924,8 +924,6 @@ main(int argc, CHAR16 *argv[]) ...@@ -924,8 +924,6 @@ main(int argc, CHAR16 *argv[])
char buf[32]; char buf[32];
bool uefi_boot_mgr; bool uefi_boot_mgr;
tslog_init();
archsw.arch_autoload = efi_autoload; archsw.arch_autoload = efi_autoload;
archsw.arch_getdev = efi_getdev; archsw.arch_getdev = efi_getdev;
archsw.arch_copyin = efi_copyin; archsw.arch_copyin = efi_copyin;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment