Cleanup for GCC-4.x
This commit is contained in:
@@ -39,7 +39,7 @@ extern __inline__ void st_le32(volatile unsigned *addr, const unsigned val)
|
||||
# define __arch_swab16(x) ld_le16(&x)
|
||||
# define __arch_swab32(x) ld_le32(&x)
|
||||
#else
|
||||
static __inline__ __const__ __u16 ___arch__swab16(__u16 value)
|
||||
static __inline__ __attribute__((const)) __u16 ___arch__swab16(__u16 value)
|
||||
{
|
||||
__u16 result;
|
||||
|
||||
@@ -49,7 +49,7 @@ static __inline__ __const__ __u16 ___arch__swab16(__u16 value)
|
||||
return result;
|
||||
}
|
||||
|
||||
static __inline__ __const__ __u32 ___arch__swab32(__u32 value)
|
||||
static __inline__ __attribute__((const)) __u32 ___arch__swab32(__u32 value)
|
||||
{
|
||||
__u32 result;
|
||||
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
/* crc, base, loop, mtest */
|
||||
#define CFG_CMD_NET 0x00000080ULL /* bootp, tftpboot, rarpboot */
|
||||
#define CFG_CMD_ENV 0x00000100ULL /* saveenv */
|
||||
#define CFG_CMD_KGDB 0x00000200ULL /* kgdb */
|
||||
#define CFG_CMD_KGDB 0x0000000000000200ULL /* kgdb */
|
||||
#define CFG_CMD_PCMCIA 0x00000400ULL /* PCMCIA support */
|
||||
#define CFG_CMD_IDE 0x00000800ULL /* IDE harddisk support */
|
||||
#define CFG_CMD_PCI 0x00001000ULL /* pciinfo */
|
||||
|
||||
@@ -208,8 +208,8 @@ extern ulong load_addr; /* Default Load Address */
|
||||
/* common/cmd_nvedit.c */
|
||||
int env_init (void);
|
||||
void env_relocate (void);
|
||||
char *getenv (uchar *);
|
||||
int getenv_r (uchar *name, uchar *buf, unsigned len);
|
||||
char *getenv (char *);
|
||||
int getenv_r (char *name, char *buf, unsigned len);
|
||||
int saveenv (void);
|
||||
#ifdef CONFIG_PPC /* ARM version to be fixed! */
|
||||
void inline setenv (char *, char *);
|
||||
|
||||
@@ -83,7 +83,7 @@ extern int flash_sect_protect (int flag, ulong addr_first, ulong addr_last);
|
||||
|
||||
/* common/flash.c */
|
||||
extern void flash_protect (int flag, ulong from, ulong to, flash_info_t *info);
|
||||
extern int flash_write (uchar *, ulong, ulong);
|
||||
extern int flash_write (char *, ulong, ulong);
|
||||
extern flash_info_t *addr2info (ulong);
|
||||
extern int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt);
|
||||
|
||||
|
||||
@@ -73,7 +73,7 @@ typedef struct { /* typedef fpga_desc */
|
||||
/* root function definitions */
|
||||
extern void fpga_init( ulong reloc_off );
|
||||
extern int fpga_add( fpga_type devtype, void *desc );
|
||||
extern const int fpga_count( void );
|
||||
extern int fpga_count( void );
|
||||
extern int fpga_load( int devnum, void *buf, size_t bsize );
|
||||
extern int fpga_dump( int devnum, void *buf, size_t bsize );
|
||||
extern int fpga_info( int devnum );
|
||||
|
||||
@@ -96,7 +96,7 @@
|
||||
#endif /* OPTIMIZE */
|
||||
|
||||
|
||||
static __inline__ __const__ __u16 __fswab16(__u16 x)
|
||||
static __inline__ __attribute__((const)) __u16 __fswab16(__u16 x)
|
||||
{
|
||||
return __arch__swab16(x);
|
||||
}
|
||||
@@ -109,7 +109,7 @@ static __inline__ void __swab16s(__u16 *addr)
|
||||
__arch__swab16s(addr);
|
||||
}
|
||||
|
||||
static __inline__ __const__ __u32 __fswab32(__u32 x)
|
||||
static __inline__ __attribute__((const)) __u32 __fswab32(__u32 x)
|
||||
{
|
||||
return __arch__swab32(x);
|
||||
}
|
||||
@@ -123,7 +123,7 @@ static __inline__ void __swab32s(__u32 *addr)
|
||||
}
|
||||
|
||||
#ifdef __BYTEORDER_HAS_U64__
|
||||
static __inline__ __const__ __u64 __fswab64(__u64 x)
|
||||
static __inline__ __attribute__((const)) __u64 __fswab64(__u64 x)
|
||||
{
|
||||
# ifdef __SWAB_64_THRU_32__
|
||||
__u32 h = x >> 32;
|
||||
|
||||
@@ -453,7 +453,7 @@ extern IPaddr_t getenv_IPaddr (char *);
|
||||
extern ushort getenv_VLAN(char *);
|
||||
|
||||
/* copy a filename (allow for "..." notation, limit length) */
|
||||
extern void copy_filename (uchar *dst, uchar *src, int size);
|
||||
extern void copy_filename (char *dst, char *src, int size);
|
||||
|
||||
/**********************************************************************/
|
||||
|
||||
|
||||
Reference in New Issue
Block a user