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

Commit 994448f1 authored by Matt Fleming's avatar Matt Fleming
Browse files

Merge remote-tracking branch 'tip/x86/efi-mixed' into efi-for-mingo 

Conflicts:
	arch/x86/kernel/setup.c
	arch/x86/platform/efi/efi.c
	arch/x86/platform/efi/efi_64.c
parents 4fd69331 18c46461

arch/x86/Kconfig

+14 −0
Original line number Diff line number Diff line
@@ -1585,6 +1585,20 @@ config EFI_STUB 


	  See Documentation/efi-stub.txt for more information.



config EFI_MIXED

	bool "EFI mixed-mode support"

	depends on EFI_STUB && X86_64

	---help---

	   Enabling this feature allows a 64-bit kernel to be booted

	   on a 32-bit firmware, provided that your CPU supports 64-bit

	   mode.



	   Note that it is not possible to boot a mixed-mode enabled

	   kernel via the EFI boot stub - a bootloader that supports

	   the EFI handover protocol must be used.



	   If unsure, say N.



config SECCOMP

	def_bool y

	prompt "Enable seccomp to safely compute untrusted bytecode"

arch/x86/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ targets += voffset.h 
$(obj)/voffset.h: vmlinux FORCE

	$(call if_changed,voffset)



sed-zoffset := -e 's/^\([0-9a-fA-F]*\) . \(startup_32\|startup_64\|efi_pe_entry\|efi_stub_entry\|input_data\|_end\|z_.*\)$$/\#define ZO_\2 0x\1/p'

sed-zoffset := -e 's/^\([0-9a-fA-F]*\) . \(startup_32\|startup_64\|efi32_stub_entry\|efi64_stub_entry\|efi_pe_entry\|input_data\|_end\|z_.*\)$$/\#define ZO_\2 0x\1/p'



quiet_cmd_zoffset = ZOFFSET $@

      cmd_zoffset = $(NM) $< | sed -n $(sed-zoffset) > $@