[commit] r4996 - in trunk/src/cpu: intel intel/model_106cx intel/model_6ex x86/lapic x86/tsc

Author: oxygene
Date: 2010-01-04 15:36:55 +0100 (Mon, 04 Jan 2010)
New Revision: 4996

Modified:
   trunk/src/cpu/intel/Kconfig
   trunk/src/cpu/intel/model_106cx/Kconfig
   trunk/src/cpu/intel/model_6ex/Kconfig
   trunk/src/cpu/x86/lapic/Makefile.inc
   trunk/src/cpu/x86/tsc/Makefile.inc
Log:
- use LAPIC timer if selected (instead of TSC all the time) [kconfig]
- uncomment commented out intel socket [kconfig]
- HAVE_MOVNTI is a property of the cpu [kconfig]

Signed-off-by: Patrick Georgi 
Acked-by: Stefan Reinauer

Modified: trunk/src/cpu/intel/Kconfig
===================================================================
--- trunk/src/cpu/intel/Kconfig	2010-01-03 15:35:52 UTC (rev 4995)
+++ trunk/src/cpu/intel/Kconfig	2010-01-04 14:36:55 UTC (rev 4996)
@@ -11,7 +11,7 @@
 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

Modified: trunk/src/cpu/intel/model_106cx/Kconfig
===================================================================
--- trunk/src/cpu/intel/model_106cx/Kconfig	2010-01-03 15:35:52 UTC (rev 4995)
+++ trunk/src/cpu/intel/model_106cx/Kconfig	2010-01-04 14:36:55 UTC (rev 4996)
@@ -1,3 +1,4 @@
 config CPU_INTEL_ATOM_230
    bool
    select SMP
+	select HAVE_MOVNTI

Modified: trunk/src/cpu/intel/model_6ex/Kconfig
===================================================================
--- trunk/src/cpu/intel/model_6ex/Kconfig	2010-01-03 15:35:52 UTC (rev 4995)
+++ trunk/src/cpu/intel/model_6ex/Kconfig	2010-01-04 14:36:55 UTC (rev 4996)
@@ -1,3 +1,4 @@
 config CPU_INTEL_CORE
    bool
    select SMP
+	select HAVE_MOVNTI

Modified: trunk/src/cpu/x86/lapic/Makefile.inc
===================================================================
--- trunk/src/cpu/x86/lapic/Makefile.inc	2010-01-03 15:35:52 UTC (rev 4995)
+++ trunk/src/cpu/x86/lapic/Makefile.inc	2010-01-04 14:36:55 UTC (rev 4996)
@@ -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

Modified: trunk/src/cpu/x86/tsc/Makefile.inc
===================================================================
--- trunk/src/cpu/x86/tsc/Makefile.inc	2010-01-03 15:35:52 UTC (rev 4995)
+++ trunk/src/cpu/x86/tsc/Makefile.inc	2010-01-04 14:36:55 UTC (rev 4996)
@@ -1,2 +1,2 @@
-obj-y += delay_tsc.o
+obj-$(CONFIG_UDELAY_TSC) += delay_tsc.o