diff --git a/src/cpu/x86/Kconfig b/src/cpu/x86/Kconfig
index 44c9cb6f17..693b8020be 100644
--- a/src/cpu/x86/Kconfig
+++ b/src/cpu/x86/Kconfig
@@ -164,15 +164,15 @@ config X86_AMD_FIXED_MTRRS
 	  This option informs the MTRR code to use the RdMem and WrMem fields
 	  in the fixed MTRR MSRs.
 
-config X86_AMD_INIT_SIPI
+config X86_INIT_NEED_1_SIPI
 	bool
 	default n
 	help
 	  This option limits the number of SIPI signals sent during during the
 	  common AP setup.  Intel documentation specifies an INIT SIPI SIPI
-	  sequence, however this doesn't work on some AMD platforms. These
-	  newer AMD platforms don't need the 10ms wait between INIT and SIPI,
-	  so skip that too to save some time.
+	  sequence, however this doesn't work on some AMD and Intel platforms.
+	  These newer AMD and Intel platforms don't need the 10ms wait between
+	  INIT and SIPI, so skip that too to save some time.
 
 config SOC_SETS_MSRS
 	bool
diff --git a/src/cpu/x86/mp_init.c b/src/cpu/x86/mp_init.c
index c99732fb39..9b5c23036f 100644
--- a/src/cpu/x86/mp_init.c
+++ b/src/cpu/x86/mp_init.c
@@ -469,7 +469,7 @@ static enum cb_err start_aps(struct bus *cpu_bus, int ap_count, atomic_t *num_ap
 	/* Send INIT IPI to all but self. */
 	lapic_send_ipi(LAPIC_DEST_ALLBUT | LAPIC_INT_ASSERT | LAPIC_DM_INIT, 0);
 
-	if (!CONFIG(X86_AMD_INIT_SIPI)) {
+	if (!CONFIG(X86_INIT_NEED_1_SIPI)) {
 		printk(BIOS_DEBUG, "Waiting for 10ms after sending INIT.\n");
 		mdelay(10);
 
diff --git a/src/soc/amd/cezanne/Kconfig b/src/soc/amd/cezanne/Kconfig
index 6c8c3e5dab..b4e808dc47 100644
--- a/src/soc/amd/cezanne/Kconfig
+++ b/src/soc/amd/cezanne/Kconfig
@@ -73,7 +73,7 @@ config SOC_SPECIFIC_OPTIONS
 	select SSE2
 	select UDK_2017_BINDING
 	select X86_AMD_FIXED_MTRRS
-	select X86_AMD_INIT_SIPI
+	select X86_INIT_NEED_1_SIPI
 
 config ARCH_ALL_STAGES_X86
 	default n
diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig
index 92607a3530..a52ce9a428 100644
--- a/src/soc/amd/picasso/Kconfig
+++ b/src/soc/amd/picasso/Kconfig
@@ -16,7 +16,7 @@ config CPU_SPECIFIC_OPTIONS
 	select ARCH_X86
 	select RESET_VECTOR_IN_RAM
 	select X86_AMD_FIXED_MTRRS
-	select X86_AMD_INIT_SIPI
+	select X86_INIT_NEED_1_SIPI
 	select ACPI_SOC_NVS
 	select ADD_FSP_BINARIES if USE_AMD_BLOBS
 	select DRIVERS_I2C_DESIGNWARE