summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPatrick Georgi <patrick.georgi@coresystems.de>2010-01-04 14:36:55 +0000
committerPatrick Georgi <patrick.georgi@coresystems.de>2010-01-04 14:36:55 +0000
commitce56835a5cc2cb762ecba0d672a9d33fbfc2f7fd (patch)
tree3f034da9f5c1dd06d95c69e0cb688ecd71311367 /src
parenta29fb61ff43403941161a6e3c4b4288aa237512e (diff)
downloadcoreboot-ce56835a5cc2cb762ecba0d672a9d33fbfc2f7fd.tar.xz
- 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 <patrick.georgi@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4996 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src')
-rw-r--r--src/cpu/intel/Kconfig2
-rw-r--r--src/cpu/intel/model_106cx/Kconfig1
-rw-r--r--src/cpu/intel/model_6ex/Kconfig1
-rw-r--r--src/cpu/x86/lapic/Makefile.inc2
-rw-r--r--src/cpu/x86/tsc/Makefile.inc2
5 files changed, 5 insertions, 3 deletions
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