moved init_timer() to static initialization

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1099 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/boot/hardwaremain.c b/src/boot/hardwaremain.c
index 6e3aa1b27ff37cfc7b2f1f3438dd4b85ff2c9ece..de7600743d9a0ddb8e0a2f391642cd8aa65a5188 100644 (file)
--- a/src/boot/hardwaremain.c
+++ b/src/boot/hardwaremain.c
@@ -162,7 +162,6 @@ void hardwaremain(int boot_complete)
        if (boot_complete) {
                hard_reset();
        }
-       init_timer(); /* needs to be moved into static configuration */
        CONFIGURE(CONF_PASS_PRE_PCI);
 
        /* pick how to scan the bus. This is first so we can get at memory size. */

diff --git a/src/cpu/k8/cpufixup.c b/src/cpu/k8/cpufixup.c
index c9979c180b626da6f6fb82770f066c6fd6f558c1..d5ccfc299dde0c333395aa164c6d3a9ead90930d 100644 (file)
--- a/src/cpu/k8/cpufixup.c
+++ b/src/cpu/k8/cpufixup.c
@@ -77,6 +77,9 @@ void k8_enable(struct chip *chip, enum chip_pass pass)
         switch (pass) {
         case CONF_PASS_PRE_CONSOLE:
                 break;
+       case CONF_PASS_PRE_PCI:
+               init_timer();
+               break;
         default:
                 /* nothing yet */
                 break;