aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Woodhouse <David.Woodhouse@intel.com>2013-02-07 10:23:46 +0000
committerKevin O'Connor <kevin@koconnor.net>2013-02-08 21:28:53 -0500
commit5d47eb484efed2ab20ce21f2211ab1f5f57b963f (patch)
treefb8b2bf244f32753a551539042ea4c4a4a6e54d4
parent3219dfa8ec9c62e409d7e740c48ecd78770072c3 (diff)
downloadseabios-5d47eb484efed2ab20ce21f2211ab1f5f57b963f.tar.gz
Enable PMTIMER for CSM build
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
-rw-r--r--src/Kconfig2
-rw-r--r--src/csm.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/Kconfig b/src/Kconfig
index 55396c6..bbcefe0 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -245,7 +245,7 @@ menu "Hardware support"
help
Initialize the Memory Type Range Registers (on emulators).
config PMTIMER
- depends on QEMU
+ depends on !COREBOOT
bool "Use ACPI timer"
default y
help
diff --git a/src/csm.c b/src/csm.c
index 169b608..64172ea 100644
--- a/src/csm.c
+++ b/src/csm.c
@@ -151,6 +151,8 @@ handle_csm_0002(struct bregs *regs)
bda->hdcount = 0;
timer_setup();
+ // This has to set cpu_khz *after* calibrate_tsc() does it
+ find_pmtimer();
device_hardware_setup();
wait_threads();
interactive_bootmenu();