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
This commit is contained in:
parent
632f86515a
commit
98afd9b75b
|
@ -18,7 +18,7 @@
|
||||||
#define autoboot(mem)
|
#define autoboot(mem)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef AUTOBOOT_DELAY
|
#if !AUTOBOOT_DELAY
|
||||||
#define autoboot_delay() 0 /* success */
|
#define autoboot_delay() 0 /* success */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -239,7 +239,7 @@ struct ext2_dir_entry
|
||||||
* ffz = Find First Zero in word. Undefined if no zero exists,
|
* ffz = Find First Zero in word. Undefined if no zero exists,
|
||||||
* so code should check against ~0UL first..
|
* so code should check against ~0UL first..
|
||||||
*/
|
*/
|
||||||
#if ARCH == 'i386'
|
#ifdef __i386
|
||||||
static __inline__ unsigned long
|
static __inline__ unsigned long
|
||||||
ffz (unsigned long word)
|
ffz (unsigned long word)
|
||||||
{
|
{
|
||||||
|
|
|
@ -54,7 +54,7 @@ struct fat_superblock
|
||||||
|
|
||||||
#define FAT_CACHE_SIZE 2048
|
#define FAT_CACHE_SIZE 2048
|
||||||
|
|
||||||
#if ARCH == 'i386'
|
#ifdef __i386
|
||||||
static __inline__ unsigned long
|
static __inline__ unsigned long
|
||||||
log2 (unsigned long word)
|
log2 (unsigned long word)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue