summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Rottmann <JRottmann@LiPPERTEmbedded.de>2008-11-03 23:16:00 +0000
committerStefan Reinauer <stepan@openbios.org>2008-11-03 23:16:00 +0000
commit98afd9b75b92c96c67bb02a0ec104c42c28aaade (patch)
tree49a447375f7cb0da271189464017fae5fdfc41fc
parent632f86515a132b51b035794e0ba21b8a21eacd15 (diff)
downloadcoreboot-98afd9b75b92c96c67bb02a0ec104c42c28aaade.tar.xz
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 <JRottmann@LiPPERTEmbedded.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3729 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-rw-r--r--src/boot/filo.c2
-rw-r--r--src/stream/fs/ext2fs.c2
-rw-r--r--src/stream/fs/fat.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/boot/filo.c b/src/boot/filo.c
index 157bec2057..cd14fa13b3 100644
--- a/src/boot/filo.c
+++ b/src/boot/filo.c
@@ -18,7 +18,7 @@
#define autoboot(mem)
#endif
-#ifndef AUTOBOOT_DELAY
+#if !AUTOBOOT_DELAY
#define autoboot_delay() 0 /* success */
#endif
diff --git a/src/stream/fs/ext2fs.c b/src/stream/fs/ext2fs.c
index f29fd8aeb1..9cf0bc6500 100644
--- a/src/stream/fs/ext2fs.c
+++ b/src/stream/fs/ext2fs.c
@@ -239,7 +239,7 @@ struct ext2_dir_entry
* 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)
{
diff --git a/src/stream/fs/fat.c b/src/stream/fs/fat.c
index 540cac370e..01e4e03cc2 100644
--- a/src/stream/fs/fat.c
+++ b/src/stream/fs/fat.c
@@ -54,7 +54,7 @@ struct fat_superblock
#define FAT_CACHE_SIZE 2048
-#if ARCH == 'i386'
+#ifdef __i386
static __inline__ unsigned long
log2 (unsigned long word)
{