diff --git a/src/cpu/x86/Kconfig b/src/cpu/x86/Kconfig
index 0eaee2ed40..07e9d9ecbf 100644
--- a/src/cpu/x86/Kconfig
+++ b/src/cpu/x86/Kconfig
@@ -2,10 +2,6 @@ config SERIAL_CPU_INIT
 	bool
 	default y
 
-config WAIT_BEFORE_CPUS_INIT
-	bool
-	default n
-
 config UDELAY_IO
 	bool
 	default y if !UDELAY_LAPIC && !UDELAY_TSC
diff --git a/src/cpu/x86/lapic/lapic_cpu_init.c b/src/cpu/x86/lapic/lapic_cpu_init.c
index d61547dad0..fc5a7861e1 100644
--- a/src/cpu/x86/lapic/lapic_cpu_init.c
+++ b/src/cpu/x86/lapic/lapic_cpu_init.c
@@ -502,8 +502,6 @@ void initialize_cpus(struct bus *cpu_bus)
 	smm_init();
 #endif
 
-	cpus_ready_for_init();
-
 #if CONFIG_SMP
 	#if !CONFIG_SERIAL_CPU_INIT
 	/* start all aps at first, so we can init ECC all together */
diff --git a/src/include/cpu/cpu.h b/src/include/cpu/cpu.h
index c2113c1aa5..34ba61ec26 100644
--- a/src/include/cpu/cpu.h
+++ b/src/include/cpu/cpu.h
@@ -9,12 +9,6 @@ struct bus;
 void initialize_cpus(struct bus *cpu_bus);
 void secondary_cpu_init(void);
 
-#if !CONFIG_WAIT_BEFORE_CPUS_INIT
-	#define cpus_ready_for_init() do {} while(0)
-#else
-	void cpus_ready_for_init(void);
-#endif
-
 #if CONFIG_HAVE_SMI_HANDLER
 void smm_init(void);
 void smm_lock(void);
diff --git a/src/mainboard/amd/pistachio/Kconfig b/src/mainboard/amd/pistachio/Kconfig
index d140878b79..a83fbcfd3c 100644
--- a/src/mainboard/amd/pistachio/Kconfig
+++ b/src/mainboard/amd/pistachio/Kconfig
@@ -15,7 +15,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
-	select WAIT_BEFORE_CPUS_INIT
 	select HAVE_ACPI_TABLES
 	select BOARD_ROMSIZE_KB_1024
 	select RAMINIT_SYSINFO
diff --git a/src/mainboard/ibm/e325/Kconfig b/src/mainboard/ibm/e325/Kconfig
index 48b93d154d..2bb9db483d 100644
--- a/src/mainboard/ibm/e325/Kconfig
+++ b/src/mainboard/ibm/e325/Kconfig
@@ -13,7 +13,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
-	select WAIT_BEFORE_CPUS_INIT
 	select BOARD_ROMSIZE_KB_512
 	select QRANK_DIMM_SUPPORT
 
diff --git a/src/mainboard/ibm/e326/Kconfig b/src/mainboard/ibm/e326/Kconfig
index 81c10bab50..e93cb7e544 100644
--- a/src/mainboard/ibm/e326/Kconfig
+++ b/src/mainboard/ibm/e326/Kconfig
@@ -13,7 +13,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
-	select WAIT_BEFORE_CPUS_INIT
 	select BOARD_ROMSIZE_KB_512
 	select QRANK_DIMM_SUPPORT
 
diff --git a/src/mainboard/iwill/dk8_htx/Kconfig b/src/mainboard/iwill/dk8_htx/Kconfig
index 3785b11475..9380ea5af2 100644
--- a/src/mainboard/iwill/dk8_htx/Kconfig
+++ b/src/mainboard/iwill/dk8_htx/Kconfig
@@ -16,7 +16,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_MP_TABLE
 	select LIFT_BSP_APIC_ID
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
-	select WAIT_BEFORE_CPUS_INIT
 	select HAVE_ACPI_TABLES
 	select BOARD_ROMSIZE_KB_512
 	select RAMINIT_SYSINFO
diff --git a/src/mainboard/iwill/dk8s2/Kconfig b/src/mainboard/iwill/dk8s2/Kconfig
index 1c35cb2bb5..6476d50b89 100644
--- a/src/mainboard/iwill/dk8s2/Kconfig
+++ b/src/mainboard/iwill/dk8s2/Kconfig
@@ -13,7 +13,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_OPTION_TABLE
 	select HAVE_MP_TABLE
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
-	select WAIT_BEFORE_CPUS_INIT
 	select DRIVERS_ATI_RAGEXL
 	select BOARD_ROMSIZE_KB_512
 	select RAMINIT_SYSINFO
diff --git a/src/mainboard/iwill/dk8x/Kconfig b/src/mainboard/iwill/dk8x/Kconfig
index 9216078bc8..e09a27bdf0 100644
--- a/src/mainboard/iwill/dk8x/Kconfig
+++ b/src/mainboard/iwill/dk8x/Kconfig
@@ -13,7 +13,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
-	select WAIT_BEFORE_CPUS_INIT
 	select BOARD_ROMSIZE_KB_512
 	select RAMINIT_SYSINFO
 	select QRANK_DIMM_SUPPORT
diff --git a/src/mainboard/msi/ms9652_fam10/Kconfig b/src/mainboard/msi/ms9652_fam10/Kconfig
index 74396465f4..886bfe19c2 100644
--- a/src/mainboard/msi/ms9652_fam10/Kconfig
+++ b/src/mainboard/msi/ms9652_fam10/Kconfig
@@ -161,10 +161,6 @@ config MEM_TRAIN_SEQ
 	int
 	default 2
 
-config WAIT_BEFORE_CPUS_INIT
-	bool
-	default n
-
 config AMD_UCODE_PATCH_FILE
 	string
 	default "mc_patch_01000096.h"
diff --git a/src/mainboard/technexion/tim8690/Kconfig b/src/mainboard/technexion/tim8690/Kconfig
index 293590c054..6bfa814495 100644
--- a/src/mainboard/technexion/tim8690/Kconfig
+++ b/src/mainboard/technexion/tim8690/Kconfig
@@ -15,7 +15,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
-	select WAIT_BEFORE_CPUS_INIT
 	select HAVE_ACPI_TABLES
 	select BOARD_ROMSIZE_KB_512
 	select RAMINIT_SYSINFO
diff --git a/src/northbridge/amd/amdk8/Kconfig b/src/northbridge/amd/amdk8/Kconfig
index 70e75e9007..9ea540470b 100644
--- a/src/northbridge/amd/amdk8/Kconfig
+++ b/src/northbridge/amd/amdk8/Kconfig
@@ -33,6 +33,10 @@ config K8_HT_FREQ_1G_SUPPORT
 	bool
 	default n
 
+config WAIT_BEFORE_CPUS_INIT
+	bool
+	default n
+
 config MEM_TRAIN_SEQ
 	int
 	default 0
diff --git a/src/northbridge/amd/amdk8/amdk8.h b/src/northbridge/amd/amdk8/amdk8.h
index 5aa3b31fbf..e001706ce9 100644
--- a/src/northbridge/amd/amdk8/amdk8.h
+++ b/src/northbridge/amd/amdk8/amdk8.h
@@ -14,4 +14,6 @@ void setup_resource_map_offset(const unsigned int *register_values, int max, uns
 void fill_mem_ctrl(int controllers, struct mem_controller *ctrl_a, const uint16_t *spd_addr);
 #endif
 
+void cpus_ready_for_init(void);
+
 #endif /* AMDK8_H */
diff --git a/src/northbridge/amd/amdk8/northbridge.c b/src/northbridge/amd/amdk8/northbridge.c
index bec02f0e9d..b6e1a7d936 100644
--- a/src/northbridge/amd/amdk8/northbridge.c
+++ b/src/northbridge/amd/amdk8/northbridge.c
@@ -1369,6 +1369,9 @@ static u32 cpu_bus_scan(device_t dev, u32 max)
 
 static void cpu_bus_init(device_t dev)
 {
+#if CONFIG_WAIT_BEFORE_CPUS_INIT
+	cpus_ready_for_init();
+#endif
 	initialize_cpus(dev->link_list);
 }