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

Link in libefi for boot1

Browse Source 
Add libefi to the list of libraries we'll link in. Move EFI table
definitions back to libefi so we don't have drift between the two
efi_main routines.

Sponsored by: Netflix
This commit is contained in:
imp 2017-08-26 18:30:14 +00:00
parent cb0beb9e23
commit 0aa8ca55dd
4 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/boot/efi/boot1/Makefile
View File

@ -76,13 +76,15 @@ CFLAGS+= -fPIC
LDFLAGS+= -Wl,-znocombreloc
.endif
LIBEFI= ${.OBJDIR}/../libefi/libefi.a
#
# Add libstand for the runtime functions used by the compiler - for example
# __aeabi_* (arm) or __divdi3 (i386).
# as well as required string and memory functions for all platforms.
#
DPADD+= ${LIBSTAND}
LDADD+= -lstand
DPADD+= ${LIBEFI} ${LIBSTAND}
LDADD+= ${LIBEFI} -lstand
DPADD+= ${LDSCRIPT}

5
sys/boot/efi/boot1/boot1.c
View File

@ -47,11 +47,6 @@ static const boot_module_t *boot_modules[] =
/* The initial number of handles used to query EFI for partitions. */
#define NUM_HANDLES_INIT 24
EFI_HANDLE IH;
EFI_SYSTEM_TABLE *ST;
EFI_BOOT_SERVICES *BS;
EFI_RUNTIME_SERVICES *RS;
static EFI_GUID BlockIoProtocolGUID = BLOCK_IO_PROTOCOL;
static EFI_GUID DevicePathGUID = DEVICE_PATH_PROTOCOL;
static EFI_GUID LoadedImageGUID = LOADED_IMAGE_PROTOCOL;

5
sys/boot/efi/libefi/libefi.c
View File

@ -32,7 +32,10 @@ __FBSDID("$FreeBSD$");
#include <efilib.h>
#include <stand.h>
extern EFI_SYSTEM_TABLE *ST;
EFI_HANDLE IH;
EFI_SYSTEM_TABLE *ST;
EFI_BOOT_SERVICES *BS;
EFI_RUNTIME_SERVICES *RS;
void *
efi_get_table(EFI_GUID *tbl)

5
sys/boot/efi/loader/efi_main.c
View File

@ -32,11 +32,6 @@ __FBSDID("$FreeBSD$");
#include <efilib.h>
#include <stand.h>
EFI_HANDLE IH;
EFI_SYSTEM_TABLE *ST;
EFI_BOOT_SERVICES *BS;
EFI_RUNTIME_SERVICES *RS;
static EFI_PHYSICAL_ADDRESS heap;
static UINTN heapsize;