diff --git a/src/cpu/x86/Kconfig b/src/cpu/x86/Kconfig
index 1617ad6953..80b9a44c99 100644
--- a/src/cpu/x86/Kconfig
+++ b/src/cpu/x86/Kconfig
@@ -31,10 +31,16 @@ config DEFAULT_X2APIC_RUNTIME
 	help
 	  Allow SoC code to set LAPIC_ACCESS_MODE to X2APIC_RUNTIME.
 
+config DEFAULT_X2APIC_LATE_WORKAROUND
+	def_bool n
+	help
+	  Allow SoC code to set LAPIC_ACCESS_MODE to X2APIC_LATE_WORKAROUND.
+
 choice LAPIC_ACCESS_MODE
 	prompt "APIC operation mode"
 	default X2APIC_ONLY if DEFAULT_X2APIC
 	default X2APIC_RUNTIME if DEFAULT_X2APIC_RUNTIME
+	default X2APIC_LATE_WORKAROUND if DEFAULT_X2APIC_LATE_WORKAROUND
 	default XAPIC_ONLY
 
 config XAPIC_ONLY