r3729 - in trunk/coreboot-v2/src: boot stream/fs

Author: stepan
Date: 2008-11-04 00:16:00 +0100 (Tue, 04 Nov 2008)
New Revision: 3729

Modified:
   trunk/coreboot-v2/src/boot/filo.c
   trunk/coreboot-v2/src/stream/fs/ext2fs.c
   trunk/coreboot-v2/src/stream/fs/fat.c
Log:
Fix compile errors if CONFIG_FS_PAYLOAD=1:

Compile error in filo.c if AUTOBOOT_DELAY=0. Replace
#ifndef AUTOBOOT_DELAY
with
#if !AUTOBOOT_DELAY
which should work for both the #undef and the =0 case.

In ext2fs.c, fat.c
#if ARCH == 'i386'
results in a compile warning: "multi-character character constant" and
the condition ARCH == 'i386' is mis-evaluated as FALSE, eventually
choking the assembler on a PPC instruction. Change it to
#ifdef __i386

Signed-off-by: Jens Rottmann 
Acked-by: Stefan Reinauer

Modified: trunk/coreboot-v2/src/boot/filo.c
===================================================================
--- trunk/coreboot-v2/src/boot/filo.c	2008-11-03 22:58:56 UTC (rev 3728)
+++ trunk/coreboot-v2/src/boot/filo.c	2008-11-03 23:16:00 UTC (rev 3729)
@@ -18,7 +18,7 @@
 #define autoboot(mem)
 #endif

-#ifndef AUTOBOOT_DELAY
+#if !AUTOBOOT_DELAY
 #define autoboot_delay() 0 /* success */
 #endif

Modified: trunk/coreboot-v2/src/stream/fs/ext2fs.c
===================================================================
--- trunk/coreboot-v2/src/stream/fs/ext2fs.c	2008-11-03 22:58:56 UTC (rev 3728)
+++ trunk/coreboot-v2/src/stream/fs/ext2fs.c	2008-11-03 23:16:00 UTC (rev 3729)
@@ -239,7 +239,7 @@
  * ffz = Find First Zero in word. Undefined if no zero exists,
  * so code should check against ~0UL first..
  */
-#if ARCH == 'i386'
+#ifdef __i386
 static __inline__ unsigned long
 ffz (unsigned long word)
 {

Modified: trunk/coreboot-v2/src/stream/fs/fat.c
===================================================================
--- trunk/coreboot-v2/src/stream/fs/fat.c	2008-11-03 22:58:56 UTC (rev 3728)
+++ trunk/coreboot-v2/src/stream/fs/fat.c	2008-11-03 23:16:00 UTC (rev 3729)
@@ -54,7 +54,7 @@

#define FAT_CACHE_SIZE 2048

-#if ARCH == 'i386'
+#ifdef __i386
 static __inline__ unsigned long
 log2 (unsigned long word)
 {