Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bcede2f6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

* 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, efi: Break up large initrd reads
  x86, efi: EFI boot stub support
  efi: Add EFI file I/O data types
  efi.h: Add boottime->locate_handle search types
  efi.h: Add graphics protocol guids
  efi.h: Add allocation types for boottime->allocate_pages()
  efi.h: Add efi_image_loaded_t
  efi.h: Add struct definition for boot time services
  x86: Don't use magic strings for EFI loader signature
  x86: Add missing bzImage fields to struct setup_header
parents d0b9706c 2d2da60f

arch/x86/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -1489,6 +1489,13 @@ config EFI 
	  resultant kernel should continue to boot on existing non-EFI

	  platforms.



config EFI_STUB

       bool "EFI stub support"

       depends on EFI

       ---help---

          This kernel feature allows a bzImage to be loaded directly

	  by EFI firmware without the use of a bootloader.



config SECCOMP

	def_bool y

	prompt "Enable seccomp to safely compute untrusted bytecode"

arch/x86/boot/compressed/Makefile

+9 −1
Original line number Diff line number Diff line
@@ -23,7 +23,15 @@ LDFLAGS_vmlinux := -T 


hostprogs-y	:= mkpiggy



$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/head_$(BITS).o $(obj)/misc.o $(obj)/string.o $(obj)/cmdline.o $(obj)/early_serial_console.o $(obj)/piggy.o FORCE

VMLINUX_OBJS = $(obj)/vmlinux.lds $(obj)/head_$(BITS).o $(obj)/misc.o \

	$(obj)/string.o $(obj)/cmdline.o $(obj)/early_serial_console.o \

	$(obj)/piggy.o



ifeq ($(CONFIG_EFI_STUB), y)

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

endif



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

	$(call if_changed,ld)

	@: