From 2e3df6e42b85ddc4041b819164ef2d15ff0eae13 Mon Sep 17 00:00:00 2001 From: Chris Irrgang Date: Sun, 12 Oct 2025 14:14:45 +0000 Subject: [PATCH] Configure EIF boot/stub Signed-off-by: Chris Irrgang --- kernel/6.12.x/config-aarch64 | 6 +++++- kernel/6.12.x/config-riscv64 | 14 +------------- kernel/6.12.x/config-x86_64 | 9 ++++++++- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/kernel/6.12.x/config-aarch64 b/kernel/6.12.x/config-aarch64 index a41a852c3..172bc1207 100644 --- a/kernel/6.12.x/config-aarch64 +++ b/kernel/6.12.x/config-aarch64 @@ -35,6 +35,10 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="-linuxkit" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_BUILD_SALT="" +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_ZSTD=y +CONFIG_KERNEL_GZIP=y +# CONFIG_KERNEL_ZSTD is not set CONFIG_DEFAULT_INIT="" CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_SYSVIPC=y @@ -1896,7 +1900,7 @@ CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI_PARAMS_FROM_FDT=y CONFIG_EFI_RUNTIME_WRAPPERS=y CONFIG_EFI_GENERIC_STUB=y -# CONFIG_EFI_ZBOOT is not set +CONFIG_EFI_ZBOOT=y CONFIG_EFI_ARMSTUB_DTB_LOADER=y # CONFIG_EFI_BOOTLOADER_CONTROL is not set # CONFIG_EFI_CAPSULE_LOADER is not set diff --git a/kernel/6.12.x/config-riscv64 b/kernel/6.12.x/config-riscv64 index 36e83fca2..b7b4a6f9e 100644 --- a/kernel/6.12.x/config-riscv64 +++ b/kernel/6.12.x/config-riscv64 @@ -35,21 +35,9 @@ CONFIG_LOCALVERSION="-linuxkit" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_BUILD_SALT="" CONFIG_HAVE_KERNEL_GZIP=y -CONFIG_HAVE_KERNEL_BZIP2=y -CONFIG_HAVE_KERNEL_LZMA=y -CONFIG_HAVE_KERNEL_XZ=y -CONFIG_HAVE_KERNEL_LZO=y -CONFIG_HAVE_KERNEL_LZ4=y CONFIG_HAVE_KERNEL_ZSTD=y -CONFIG_HAVE_KERNEL_UNCOMPRESSED=y CONFIG_KERNEL_GZIP=y -# CONFIG_KERNEL_BZIP2 is not set -# CONFIG_KERNEL_LZMA is not set -# CONFIG_KERNEL_XZ is not set -# CONFIG_KERNEL_LZO is not set -# CONFIG_KERNEL_LZ4 is not set # CONFIG_KERNEL_ZSTD is not set -# CONFIG_KERNEL_UNCOMPRESSED is not set CONFIG_DEFAULT_INIT="" CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_SYSVIPC=y @@ -1671,7 +1659,7 @@ CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI_PARAMS_FROM_FDT=y CONFIG_EFI_RUNTIME_WRAPPERS=y CONFIG_EFI_GENERIC_STUB=y -# CONFIG_EFI_ZBOOT is not set +CONFIG_EFI_ZBOOT=y # CONFIG_EFI_BOOTLOADER_CONTROL is not set # CONFIG_EFI_CAPSULE_LOADER is not set # CONFIG_EFI_TEST is not set diff --git a/kernel/6.12.x/config-x86_64 b/kernel/6.12.x/config-x86_64 index 894f878fd..63744913a 100644 --- a/kernel/6.12.x/config-x86_64 +++ b/kernel/6.12.x/config-x86_64 @@ -368,6 +368,7 @@ CONFIG_PVH=y CONFIG_PARAVIRT_CLOCK=y # CONFIG_JAILHOUSE_GUEST is not set # CONFIG_ACRN_GUEST is not set +# CONFIG_INTEL_TDX_GUEST is not set # CONFIG_MK8 is not set # CONFIG_MPSC is not set # CONFIG_MCORE2 is not set @@ -429,6 +430,7 @@ CONFIG_X86_CPUID=y # CONFIG_X86_5LEVEL is not set CONFIG_X86_DIRECT_GBPAGES=y # CONFIG_X86_CPA_STATISTICS is not set +# CONFIG_AMD_MEM_ENCRYPT is not set # CONFIG_NUMA is not set CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_DEFAULT=y @@ -454,7 +456,9 @@ CONFIG_X86_INTEL_TSX_MODE_OFF=y # CONFIG_X86_SGX is not set # CONFIG_X86_USER_SHADOW_STACK is not set CONFIG_EFI=y -# CONFIG_EFI_STUB is not set +CONFIG_EFI_STUB=y +CONFIG_EFI_HANDOVER_PROTOCOL=y +# CONFIG_EFI_MIXED is not set # CONFIG_EFI_RUNTIME_MAP is not set # CONFIG_HZ_100 is not set # CONFIG_HZ_250 is not set @@ -1931,10 +1935,13 @@ CONFIG_SYSFB=y CONFIG_EFI_ESRT=y CONFIG_EFI_VARS_PSTORE=y # CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set +CONFIG_EFI_DXE_MEM_ATTRIBUTES=y CONFIG_EFI_RUNTIME_WRAPPERS=y # CONFIG_EFI_BOOTLOADER_CONTROL is not set # CONFIG_EFI_CAPSULE_LOADER is not set # CONFIG_EFI_TEST is not set +# CONFIG_APPLE_PROPERTIES is not set +# CONFIG_RESET_ATTACK_MITIGATION is not set # CONFIG_EFI_RCI2_TABLE is not set # CONFIG_EFI_DISABLE_PCI_DMA is not set CONFIG_EFI_EARLYCON=y