diff --git a/config-x86-generic b/config-x86-generic
index 71f68c759..4889e216c 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -40,7 +40,6 @@ CONFIG_X86_PM_TIMER=y
 
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y
-# CONFIG_EFI_MIXED is not set
 CONFIG_EFI_VARS=y
 CONFIG_EFIVAR_FS=y
 CONFIG_EFI_VARS_PSTORE=y
diff --git a/config-x86_64-generic b/config-x86_64-generic
index 779c333c6..0289dcf2a 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -24,6 +24,9 @@ CONFIG_PHYSICAL_ALIGN=0x1000000
 # https://lists.fedoraproject.org/pipermail/kernel/2013-December/004753.html
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 
+# enable the 32-bit entry point for Baytrail
+CONFIG_EFI_MIXED=y
+
 CONFIG_IA32_EMULATION=y
 # CONFIG_IA32_AOUT is not set