- 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

diff --git a/src/cpu/intel/Kconfig b/src/cpu/intel/Kconfig
index 54d9c15d86d006a5817f38528b288ae6953b68e5..24a9b4d9c4a73790368d943babaf9d9f35a27f59 100644 (file)
--- 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 01a4f2a273400280ae31a9a6dfe4cd14c5082476..187bcd067b7b4398c91b17436e3f9afcd2fc1521 100644 (file)
--- 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 c610e6344d222db2f9e3424183cbab6d6c9ae158..cbc5797e54ab3f3adf054e16a8c793a350c2e641 100644 (file)
--- 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 128deb28341d7cfbf1713523660ee90e060d0c3b..bed314024c4e61cd4452aeb879a1bf516e94a746 100644 (file)
--- 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 ba2732c795dd0fac004bf82f579ead8d6b643bfd..d56c3e76d63ce4b70cd0557008f0972a2dc50ace 100644 (file)
--- 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