diff --git a/target/linux/x86/64/config-default b/target/linux/x86/64/config-default
index d5e10e235..1fa5b6519 100644
--- a/target/linux/x86/64/config-default
+++ b/target/linux/x86/64/config-default
@@ -107,9 +107,11 @@ CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_IMAGEBLIT=y
 CONFIG_FB_CMDLINE=y
 CONFIG_FB_DEFERRED_IO=y
-# CONFIG_FB_EFI is not set
+CONFIG_FB_EFI=y
 CONFIG_FB_HYPERV=y
 CONFIG_FB_MODE_HELPERS=y
+# CONFIG_FB_PROVIDE_GET_FB_UNMAPPED_AREA is not set
+CONFIG_FB_SIMPLE=y
 CONFIG_FB_SYS_COPYAREA=y
 CONFIG_FB_SYS_FILLRECT=y
 CONFIG_FB_SYS_FOPS=y
@@ -388,9 +390,10 @@ CONFIG_PCI_HYPERV=y
 CONFIG_VMD=n
 CONFIG_VIRTIO_VSOCKETS=n
 CONFIG_SATA_ZPODD=n
-CONFIG_EFI_BOOTLOADER_CONTROL=y
-CONFIG_EFI_CAPSULE_LOADER=y
-CONFIG_EFI_TEST=n
+# CONFIG_EFI_BOOTLOADER_CONTROL is not set
+# CONFIG_EFI_CAPSULE_LOADER is not set
+# CONFIG_EFI_DEV_PATH_PARSER is not set
+# CONFIG_EFI_TEST is not set
 CONFIG_CPU_HOTPLUG_STATE_CONTROL=n
 CONFIG_PAGE_TABLE_ISOLATION=y
 CONFIG_CRYPTO_SHA256_MB=n
diff --git a/target/linux/x86/config-4.9 b/target/linux/x86/config-4.9
index 8d0102c8c..f6715d7fe 100644
--- a/target/linux/x86/config-4.9
+++ b/target/linux/x86/config-4.9
@@ -157,11 +157,6 @@ CONFIG_EDAC_SUPPORT=y
 # CONFIG_EDD is not set
 # CONFIG_EUROTECH_WDT is not set
 CONFIG_EXT4_FS=y
-# CONFIG_F2FS_CHECK_FS is not set
-CONFIG_F2FS_FS=y
-# CONFIG_F2FS_FS_SECURITY is not set
-CONFIG_F2FS_FS_XATTR=y
-CONFIG_F2FS_STAT_FS=y
 # CONFIG_F71808E_WDT is not set
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_FIRMWARE_MEMMAP=y
@@ -587,19 +582,3 @@ CONFIG_XPS=y
 CONFIG_XZ_DEC_BCJ=y
 CONFIG_XZ_DEC_X86=y
 CONFIG_ZLIB_INFLATE=y
-CONFIG_ARCH_MMAP_RND_BITS=28
-CONFIG_ARCH_MMAP_RND_BITS_MAX=32
-CONFIG_ARCH_MMAP_RND_BITS_MIN=28
-CONFIG_VMAP_STACK=y
-CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
-CONFIG_PCI_HYPERV=y
-CONFIG_VMD=n
-CONFIG_VIRTIO_VSOCKETS=n
-CONFIG_SATA_ZPODD=n
-CONFIG_EFI_BOOTLOADER_CONTROL=y
-CONFIG_EFI_CAPSULE_LOADER=y
-CONFIG_EFI_TEST=n
-CONFIG_CPU_HOTPLUG_STATE_CONTROL=n
-CONFIG_PAGE_TABLE_ISOLATION=y
-CONFIG_CRYPTO_SHA256_MB=n
-CONFIG_CRYPTO_SHA512_MB=n