diff --git a/src/cpu/intel/Kconfig b/src/cpu/intel/Kconfig
index 54d9c15d86..24a9b4d9c4 100644
--- a/src/cpu/intel/Kconfig
+++ b/src/cpu/intel/Kconfig
@@ -11,7 +11,7 @@ source src/cpu/intel/slot_2/Kconfig
 source src/cpu/intel/socket_mFCPGA478/Kconfig
 source src/cpu/intel/socket_mPGA478/Kconfig
 source src/cpu/intel/socket_mPGA479M/Kconfig
-#source src/cpu/intel/socket_mPGA603/Kconfig
+source src/cpu/intel/socket_mPGA603/Kconfig
 source src/cpu/intel/socket_mPGA604/Kconfig
 source src/cpu/intel/socket_PGA370/Kconfig
 source src/cpu/intel/socket_441/Kconfig
diff --git a/src/cpu/intel/model_106cx/Kconfig b/src/cpu/intel/model_106cx/Kconfig
index 01a4f2a273..187bcd067b 100644
--- a/src/cpu/intel/model_106cx/Kconfig
+++ b/src/cpu/intel/model_106cx/Kconfig
@@ -1,3 +1,4 @@
 config CPU_INTEL_ATOM_230
 	bool
 	select SMP
+	select HAVE_MOVNTI
diff --git a/src/cpu/intel/model_6ex/Kconfig b/src/cpu/intel/model_6ex/Kconfig
index c610e6344d..cbc5797e54 100644
--- a/src/cpu/intel/model_6ex/Kconfig
+++ b/src/cpu/intel/model_6ex/Kconfig
@@ -1,3 +1,4 @@
 config CPU_INTEL_CORE
 	bool
 	select SMP
+	select HAVE_MOVNTI
diff --git a/src/cpu/x86/lapic/Makefile.inc b/src/cpu/x86/lapic/Makefile.inc
index 128deb2834..bed314024c 100644
--- a/src/cpu/x86/lapic/Makefile.inc
+++ b/src/cpu/x86/lapic/Makefile.inc
@@ -1,4 +1,4 @@
 obj-y += lapic.o
 obj-y += lapic_cpu_init.o
 obj-y += secondary.o
-
+obj-$(CONFIG_UDELAY_LAPIC) += apic_timer.o
diff --git a/src/cpu/x86/tsc/Makefile.inc b/src/cpu/x86/tsc/Makefile.inc
index ba2732c795..d56c3e76d6 100644
--- a/src/cpu/x86/tsc/Makefile.inc
+++ b/src/cpu/x86/tsc/Makefile.inc
@@ -1,2 +1,2 @@
-obj-y += delay_tsc.o
+obj-$(CONFIG_UDELAY_TSC) += delay_tsc.o