updates from YhLu, plus fixes for PPC/K8 issues.

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

5 files changed, 7 insertions, 7 deletions

diff --git a/src/arch/i386/Config.lb b/src/arch/i386/Config.lb
index 14862b5a40..b43258b9d4 100644
--- a/src/arch/i386/Config.lb
+++ b/src/arch/i386/Config.lb
@@ -7,7 +7,7 @@ end
 
 makerule floppy 
 	depends	"all" 
-	action	"mcopy -o romimage a:"
+	action	"mcopy -o linuxbios.rom a:"
 end
 
 makerule nrv2b 
diff --git a/src/arch/i386/boot/pirq_routing.c b/src/arch/i386/boot/pirq_routing.c
index 56d05c5d7f..40f64f2c45 100644
--- a/src/arch/i386/boot/pirq_routing.c
+++ b/src/arch/i386/boot/pirq_routing.c
@@ -2,7 +2,7 @@
 #include <arch/pirq_routing.h>
 #include <string.h>
 
-#ifdef DEBUG
+#if DEBUG==1
 void check_pirq_routing_table(void)
 {
 	const uint8_t *addr;
diff --git a/src/arch/i386/include/arch/smp/mpspec.h b/src/arch/i386/include/arch/smp/mpspec.h
index 305276e482..96b2ab3e6b 100644
--- a/src/arch/i386/include/arch/smp/mpspec.h
+++ b/src/arch/i386/include/arch/smp/mpspec.h
@@ -1,7 +1,7 @@
 #ifndef __ASM_MPSPEC_H
 #define __ASM_MPSPEC_H
 
-#ifdef HAVE_MP_TABLE
+#if HAVE_MP_TABLE==1
 
 /*
  * Structure definitions for SMP machines following the
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;