Commit 514377d8 authored by Ard Biesheuvel's avatar Ard Biesheuvel
Browse files

efi/libstub: move efi_system_table global var into separate object 



To avoid pulling in the wrong object when using the libstub static
library to build the decompressor, define efi_system_table in a separate
compilation unit.

Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
parent c82ceb44

drivers/firmware/efi/libstub/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -66,7 +66,8 @@ $(obj)/lib-%.o: $(srctree)/lib/%.c FORCE 
	$(call if_changed_rule,cc_o_c)



lib-$(CONFIG_EFI_GENERIC_STUB)	+= efi-stub.o fdt.o string.o intrinsics.o \

				   $(patsubst %.c,lib-%.o,$(efi-deps-y))

				   $(patsubst %.c,lib-%.o,$(efi-deps-y)) \

				   systable.o



lib-$(CONFIG_ARM)		+= arm32-stub.o

lib-$(CONFIG_ARM64)		+= arm64-stub.o

drivers/firmware/efi/libstub/efi-stub.c

+0 −2
Original line number Diff line number Diff line
@@ -57,8 +57,6 @@ 
static u64 virtmap_base = EFI_RT_VIRTUAL_BASE;

static bool flat_va_mapping = (EFI_RT_VIRTUAL_OFFSET != 0);



const efi_system_table_t *efi_system_table;



static struct screen_info *setup_graphics(void)

{

	efi_guid_t gop_proto = EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID;

drivers/firmware/efi/libstub/systable.c

0 → 100644
+8 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0



#include <linux/efi.h>

#include <asm/efi.h>



#include "efistub.h"



const efi_system_table_t *efi_system_table;