6 files changed, 6 insertions, 12 deletions
diff --git a/src/cpu/amd/model_10xxx/Kconfig b/src/cpu/amd/model_10xxx/Kconfig
index 3882861f59..6dcdd87aff 100644
--- a/src/cpu/amd/model_10xxx/Kconfig
+++ b/src/cpu/amd/model_10xxx/Kconfig
@@ -4,7 +4,6 @@ config CPU_AMD_MODEL_10XXX
 	select USE_DCACHE_RAM
 	select SSE
 	select SSE2
-	select HAVE_INIT_TIMER
 
 config CPU_ADDR_BITS
 	int
diff --git a/src/cpu/amd/model_fxx/Kconfig b/src/cpu/amd/model_fxx/Kconfig
index e175637587..539171c6b1 100644
--- a/src/cpu/amd/model_fxx/Kconfig
+++ b/src/cpu/amd/model_fxx/Kconfig
@@ -5,7 +5,6 @@ config CPU_AMD_MODEL_FXX
 	select MMX
 	select SSE
 	select SSE2
-	select HAVE_INIT_TIMER
 
 config CPU_ADDR_BITS
 	int
diff --git a/src/cpu/amd/sc520/Kconfig b/src/cpu/amd/sc520/Kconfig
index 82d892573b..6d9494e32f 100644
--- a/src/cpu/amd/sc520/Kconfig
+++ b/src/cpu/amd/sc520/Kconfig
@@ -1,12 +1,2 @@
 config CPU_AMD_SC520
 	bool
-
-config UDELAY_IO
-	bool
-	default n
-	depends on CPU_AMD_SC520
-
-config HAVE_INIT_TIMER
-	bool
-	default n
-	depends on CPU_AMD_SC520
diff --git a/src/cpu/intel/model_106cx/Kconfig b/src/cpu/intel/model_106cx/Kconfig
index 03428169c4..34092ce20c 100644
--- a/src/cpu/intel/model_106cx/Kconfig
+++ b/src/cpu/intel/model_106cx/Kconfig
@@ -2,3 +2,5 @@ config CPU_INTEL_ATOM_230
 	bool
 	select SMP
 	select SSE2
+	select UDELAY_LAPIC
+	select AP_IN_SIPI_WAIT
diff --git a/src/cpu/intel/model_6ex/Kconfig b/src/cpu/intel/model_6ex/Kconfig
index eda7473138..89005b818d 100644
--- a/src/cpu/intel/model_6ex/Kconfig
+++ b/src/cpu/intel/model_6ex/Kconfig
@@ -2,3 +2,5 @@ config CPU_INTEL_CORE
 	bool
 	select SMP
 	select SSE2
+	select UDELAY_LAPIC
+	select AP_IN_SIPI_WAIT
diff --git a/src/cpu/intel/model_6fx/Kconfig b/src/cpu/intel/model_6fx/Kconfig
index 4ddba39c80..2551057e7b 100644
--- a/src/cpu/intel/model_6fx/Kconfig
+++ b/src/cpu/intel/model_6fx/Kconfig
@@ -2,3 +2,5 @@ config CPU_INTEL_CORE2
 	bool
 	select SMP
 	select SSE2
+	select UDELAY_LAPIC
+	select AP_IN_SIPI_WAIT