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 <[EMAIL PROTECTED]>
---

Hi,

yes, I already posted this last week, together with 1 other patch, but
got no response. Now I'll try splitting it up to 2 seperate mails,
hopefully that works better.

Regards,
Jens Rottmann

Index: src/boot/filo.c
===================================================================
--- src/boot/filo.c     (revision 3724)
+++ src/boot/filo.c     (working copy)
@@ -18,7 +18,7 @@
 #define autoboot(mem)
 #endif
 
-#ifndef AUTOBOOT_DELAY
+#if !AUTOBOOT_DELAY
 #define autoboot_delay() 0 /* success */
 #endif
 
Index: src/stream/fs/ext2fs.c
===================================================================
--- src/stream/fs/ext2fs.c      (revision 3724)
+++ src/stream/fs/ext2fs.c      (working copy)
@@ -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)
 {
Index: src/stream/fs/fat.c
===================================================================
--- src/stream/fs/fat.c (revision 3724)
+++ src/stream/fs/fat.c (working copy)
@@ -54,7 +54,7 @@
 
 #define FAT_CACHE_SIZE 2048
 
-#if ARCH == 'i386'
+#ifdef __i386
 static __inline__ unsigned long
 log2 (unsigned long word)
 {
--
coreboot mailing list: [email protected]
http://www.coreboot.org/mailman/listinfo/coreboot

Reply via email to