diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index df95676de4a7..3b4b2546092f 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -44,7 +44,6 @@ CONFIG_NAMESPACES=y
 CONFIG_RT_SOFTIRQ_AWARE_SCHED=y
 # CONFIG_RD_BZIP2 is not set
 # CONFIG_RD_LZMA is not set
-# CONFIG_RD_XZ is not set
 # CONFIG_RD_LZO is not set
 CONFIG_BOOT_CONFIG=y
 CONFIG_EXPERT=y
@@ -75,7 +74,7 @@ CONFIG_ARM64_PMEM=y
 CONFIG_RANDOMIZE_BASE=y
 # CONFIG_RANDOMIZE_MODULE_REGION_FULL is not set
 CONFIG_UNWIND_PATCH_PAC_INTO_SCS=y
-CONFIG_CMDLINE="console=ttynull stack_depot_disable=on cgroup_disable=pressure kasan.stacktrace=off kvm-arm.mode=protected bootconfig"
+CONFIG_CMDLINE="console=ttynull stack_depot_disable=on cgroup_disable=pressure kasan.stacktrace=off bootconfig"
 CONFIG_CMDLINE_EXTEND=y
 # CONFIG_DMI is not set
 CONFIG_HIBERNATION=y
@@ -105,7 +104,6 @@ CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
 CONFIG_SHADOW_CALL_STACK=y
 CONFIG_AUTOFDO_CLANG=y
-CONFIG_CFI_CLANG=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODVERSIONS=y
@@ -334,6 +332,7 @@ CONFIG_ARM_SCMI_TRANSPORT_VIRTIO=y
 CONFIG_ARM_SCPI_PROTOCOL=y
 CONFIG_ARM_SDE_INTERFACE=y
 # CONFIG_EFI_ARMSTUB_DTB_LOADER is not set
+CONFIG_EFI_CAPSULE_LOADER=y
 CONFIG_GNSS=m
 CONFIG_ZRAM=m
 CONFIG_ZRAM_BACKEND_LZ4=y
@@ -786,7 +785,6 @@ CONFIG_CRYPTO_POLYVAL_ARM64_CE=y
 CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
 CONFIG_TRACE_MMIO_ACCESS=y
 CONFIG_CRC_CCITT=y
-CONFIG_XZ_DEC=y
 CONFIG_SWIOTLB_DYNAMIC=y
 CONFIG_DMA_RESTRICTED_POOL=y
 CONFIG_DMA_CMA=y