From ce56835a5cc2cb762ecba0d672a9d33fbfc2f7fd Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Mon, 4 Jan 2010 14:36:55 +0000 Subject: - 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 git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4996 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/cpu/x86/lapic/Makefile.inc | 2 +- src/cpu/x86/tsc/Makefile.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/cpu/x86') 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 -- cgit v1.2.3