diff options
| author | Ronald G. Minnich <rminnich@gmail.com> | 2003-07-30 03:05:20 +0000 |
|---|---|---|
| committer | Ronald G. Minnich <rminnich@gmail.com> | 2003-07-30 03:05:20 +0000 |
| commit | 57ffeb0578db71b1c57d9e4137def42aac34fe18 (patch) | |
| tree | c130080b5a000b31b04639535d22274b256f6b65 /src/arch/i386/lib | |
| parent | b265254e1c50af2e3b84c0628016dda4ccf253d7 (diff) | |
updates from YhLu, plus fixes for PPC/K8 issues.
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1059 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/arch/i386/lib')
| -rw-r--r-- | src/arch/i386/lib/c_start.S | 4 | ||||
| -rw-r--r-- | src/arch/i386/lib/cpu.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/arch/i386/lib/c_start.S b/src/arch/i386/lib/c_start.S index dfe57dd7f0..4c4146ec83 100644 --- a/src/arch/i386/lib/c_start.S +++ b/src/arch/i386/lib/c_start.S @@ -1,6 +1,6 @@ #include <arch/asm.h> #include <arch/intel.h> -#ifdef CONFIG_SMP +#if CONFIG_SMP==1 #include <cpu/p6/apic.h> #endif .section ".text" @@ -39,7 +39,7 @@ _start: /* set new stack */ movl $_estack, %esp -#ifdef CONFIG_SMP +#if CONFIG_SMP==1 /* Get the cpu id */ movl $APIC_DEFAULT_BASE, %edi movl APIC_ID(%edi), %eax diff --git a/src/arch/i386/lib/cpu.c b/src/arch/i386/lib/cpu.c index 95dba5f8e5..baa029c02c 100644 --- a/src/arch/i386/lib/cpu.c +++ b/src/arch/i386/lib/cpu.c @@ -35,7 +35,7 @@ static void cache_on(struct mem_range *mem) * so absolute minimum needed to get it going. */ /* OK, linux it turns out does nothing. We have to do it ... */ -#if defined(i686) +#if i686==1 // totalram here is in linux sizing, i.e. units of KB. // set_mtrr is responsible for getting it into the right units! setup_mtrrs(mem); @@ -101,7 +101,7 @@ static void interrupts_on() apic_read(APIC_ID)); #else /* APIC */ -#ifdef i686 +#if i686==1 /* Only Pentium Pro and later have those MSR stuff */ msr_t msr; |