Commit f4f75ad5 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Matt Fleming
Browse files

efi: efistub: Convert into static library 



This patch changes both x86 and arm64 efistub implementations
from #including shared .c files under drivers/firmware/efi to
building shared code as a static library.

The x86 code uses a stub built into the boot executable which
uncompresses the kernel at boot time. In this case, the library is
linked into the decompressor.

In the arm64 case, the stub is part of the kernel proper so the library
is linked into the kernel proper as well.

Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarMatt Fleming <matt.fleming@intel.com>
parent bd669475

arch/arm64/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -292,6 +292,9 @@ config CMDLINE_FORCE 
	  This is useful if you cannot or don't want to change the

	  command-line options your boot loader passes to the kernel.



config EFI_STUB

	bool



config EFI

	bool "UEFI runtime support"

	depends on OF && !CPU_BIG_ENDIAN
@@ -299,6 +302,8 @@ config EFI 
	select UCS2_STRING

	select EFI_PARAMS_FROM_FDT

	select EFI_RUNTIME_WRAPPERS

	select EFI_STUB

	select EFI_ARMSTUB

	default y

	help

	  This option provides support for runtime services provided

arch/arm64/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ core-$(CONFIG_XEN) += arch/arm64/xen/ 
core-$(CONFIG_CRYPTO) += arch/arm64/crypto/

libs-y		:= arch/arm64/lib/ $(libs-y)

libs-y		+= $(LIBGCC)

libs-$(CONFIG_EFI_STUB) += drivers/firmware/efi/libstub/



# Default target when executing plain make

KBUILD_IMAGE	:= Image.gz

arch/arm64/kernel/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -4,8 +4,7 @@ 


CPPFLAGS_vmlinux.lds	:= -DTEXT_OFFSET=$(TEXT_OFFSET)

AFLAGS_head.o		:= -DTEXT_OFFSET=$(TEXT_OFFSET)

CFLAGS_efi-stub.o 	:= -DTEXT_OFFSET=$(TEXT_OFFSET) \

			   -I$(src)/../../../scripts/dtc/libfdt

CFLAGS_efi-stub.o 	:= -DTEXT_OFFSET=$(TEXT_OFFSET)



CFLAGS_REMOVE_ftrace.o = -pg

CFLAGS_REMOVE_insn.o = -pg

arch/arm64/kernel/efi-stub.c

+0 −6
Original line number Diff line number Diff line
@@ -13,12 +13,6 @@ 
#include <asm/efi.h>

#include <asm/sections.h>



/* Include shared EFI stub code */

#include "../../../drivers/firmware/efi/efi-stub-helper.c"

#include "../../../drivers/firmware/efi/fdt.c"

#include "../../../drivers/firmware/efi/arm-stub.c"





efi_status_t handle_kernel_image(efi_system_table_t *sys_table,

				 unsigned long *image_addr,

				 unsigned long *image_size,

arch/x86/boot/compressed/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ VMLINUX_OBJS = $(obj)/vmlinux.lds $(obj)/head_$(BITS).o $(obj)/misc.o \ 
$(obj)/eboot.o: KBUILD_CFLAGS += -fshort-wchar -mno-red-zone



ifeq ($(CONFIG_EFI_STUB), y)

	VMLINUX_OBJS += $(obj)/eboot.o $(obj)/efi_stub_$(BITS).o

	VMLINUX_OBJS += $(obj)/eboot.o $(obj)/efi_stub_$(BITS).o \

				$(objtree)/drivers/firmware/efi/libstub/lib.a

endif



$(obj)/vmlinux: $(VMLINUX_OBJS) FORCE

CRA Git | Maintained and supported by SUSTech CRA and CCSE