mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-20 03:38:43 +00:00
eef1cf2d5c
u-boot's byteorder headers did not contain endianness attributions
for use with sparse, causing a lot of false positives. Import the
kernel's latest definitions, and enable them by including compiler.h
and types.h. They come with 'const' added for some swab functions, so
fix those up, too:
include/linux/byteorder/big_endian.h:46:2: warning: passing argument 1 of '__swab64p' discards 'const' qualifier from pointer target type [enabled by default]
Also, note: u-boot's historic __BYTE_ORDER definition has been
preserved (for the time being at least).
We also remove ad-hoc barrier() definitions, since we're including
compiler.h in files that hadn't in the past:
macb.c:54:0: warning: "barrier" redefined [enabled by default]
In addition, including compiler.h in byteorder changes the 'noinline'
definition to expand to __attribute__((noinline)). This fixes
arch/powerpc/lib/bootm.c:
bootm.c:329:16: error: attribute '__attribute__': unknown attribute
bootm.c:329:16: error: expected ')' before '__attribute__'
bootm.c:329:25: error: expected identifier or '(' before ')' token
powerpc sparse builds yield:
include/common.h:356:22: error: marked inline, but without a definition
the unknown-reason inlining without a definition is considered obsolete
given it was part of the 2002 initial commit, and no arm version was
'fixed.'
also fixed:
ydirectenv.h:60:0: warning: "inline" redefined [enabled by default]
and:
Configuring for devconcenter - Board: intip, Options: DEVCONCENTER
make[1]: *** [4xx_ibm_ddr2_autocalib.o] Error 1
make: *** [arch/powerpc/cpu/ppc4xx/libppc4xx.o] Error 2
powerpc-fsl-linux-size: './u-boot': No such file
4xx_ibm_ddr2_autocalib.c: In function 'DQS_autocalibration':
include/asm/ppc4xx-sdram.h:1407:13: sorry, unimplemented: inlining failed in call to 'ppc4xx_ibm_ddr2_register_dump': function body not available
4xx_ibm_ddr2_autocalib.c:1243:32: sorry, unimplemented: called from here
and:
In file included from crc32.c:50:0:
crc32table.h:4:1: warning: implicit declaration of function '___constant_swab32' [-Wimplicit-function-declaration]
crc32table.h:4:1: error: initializer element is not constant
crc32table.h:4:1: error: (near initialization for 'crc32table_le[0]')
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
[trini: Remove '#endif' in include/common.h around setenv portion]
Signed-off-by: Tom Rini <trini@ti.com>
158 lines
4.1 KiB
C
158 lines
4.1 KiB
C
#ifndef _LINUX_BYTEORDER_SWAB_H
|
|
#define _LINUX_BYTEORDER_SWAB_H
|
|
|
|
/*
|
|
* linux/byteorder/swab.h
|
|
* Byte-swapping, independently from CPU endianness
|
|
* swabXX[ps]?(foo)
|
|
*
|
|
* Francois-Rene Rideau <fare@tunes.org> 19971205
|
|
* separated swab functions from cpu_to_XX,
|
|
* to clean up support for bizarre-endian architectures.
|
|
*
|
|
* See asm-i386/byteorder.h and suches for examples of how to provide
|
|
* architecture-dependent optimized versions
|
|
*
|
|
*/
|
|
|
|
/* casts are necessary for constants, because we never know how for sure
|
|
* how U/UL/ULL map to __u16, __u32, __u64. At least not in a portable way.
|
|
*/
|
|
#define ___swab16(x) \
|
|
((__u16)( \
|
|
(((__u16)(x) & (__u16)0x00ffU) << 8) | \
|
|
(((__u16)(x) & (__u16)0xff00U) >> 8) ))
|
|
#define ___swab32(x) \
|
|
((__u32)( \
|
|
(((__u32)(x) & (__u32)0x000000ffUL) << 24) | \
|
|
(((__u32)(x) & (__u32)0x0000ff00UL) << 8) | \
|
|
(((__u32)(x) & (__u32)0x00ff0000UL) >> 8) | \
|
|
(((__u32)(x) & (__u32)0xff000000UL) >> 24) ))
|
|
#define ___swab64(x) \
|
|
((__u64)( \
|
|
(__u64)(((__u64)(x) & (__u64)0x00000000000000ffULL) << 56) | \
|
|
(__u64)(((__u64)(x) & (__u64)0x000000000000ff00ULL) << 40) | \
|
|
(__u64)(((__u64)(x) & (__u64)0x0000000000ff0000ULL) << 24) | \
|
|
(__u64)(((__u64)(x) & (__u64)0x00000000ff000000ULL) << 8) | \
|
|
(__u64)(((__u64)(x) & (__u64)0x000000ff00000000ULL) >> 8) | \
|
|
(__u64)(((__u64)(x) & (__u64)0x0000ff0000000000ULL) >> 24) | \
|
|
(__u64)(((__u64)(x) & (__u64)0x00ff000000000000ULL) >> 40) | \
|
|
(__u64)(((__u64)(x) & (__u64)0xff00000000000000ULL) >> 56) ))
|
|
|
|
/*
|
|
* provide defaults when no architecture-specific optimization is detected
|
|
*/
|
|
#ifndef __arch__swab16
|
|
# define __arch__swab16(x) ___swab16(x)
|
|
#endif
|
|
#ifndef __arch__swab32
|
|
# define __arch__swab32(x) ___swab32(x)
|
|
#endif
|
|
#ifndef __arch__swab64
|
|
# define __arch__swab64(x) ___swab64(x)
|
|
#endif
|
|
|
|
#ifndef __arch__swab16p
|
|
# define __arch__swab16p(x) __swab16(*(x))
|
|
#endif
|
|
#ifndef __arch__swab32p
|
|
# define __arch__swab32p(x) __swab32(*(x))
|
|
#endif
|
|
#ifndef __arch__swab64p
|
|
# define __arch__swab64p(x) __swab64(*(x))
|
|
#endif
|
|
|
|
#ifndef __arch__swab16s
|
|
# define __arch__swab16s(x) do { *(x) = __swab16p((x)); } while (0)
|
|
#endif
|
|
#ifndef __arch__swab32s
|
|
# define __arch__swab32s(x) do { *(x) = __swab32p((x)); } while (0)
|
|
#endif
|
|
#ifndef __arch__swab64s
|
|
# define __arch__swab64s(x) do { *(x) = __swab64p((x)); } while (0)
|
|
#endif
|
|
|
|
|
|
/*
|
|
* Allow constant folding
|
|
*/
|
|
#if defined(__GNUC__) && (__GNUC__ >= 2) && defined(__OPTIMIZE__)
|
|
# define __swab16(x) \
|
|
(__builtin_constant_p((__u16)(x)) ? \
|
|
___swab16((x)) : \
|
|
__fswab16((x)))
|
|
# define __swab32(x) \
|
|
(__builtin_constant_p((__u32)(x)) ? \
|
|
___swab32((x)) : \
|
|
__fswab32((x)))
|
|
# define __swab64(x) \
|
|
(__builtin_constant_p((__u64)(x)) ? \
|
|
___swab64((x)) : \
|
|
__fswab64((x)))
|
|
#else
|
|
# define __swab16(x) __fswab16(x)
|
|
# define __swab32(x) __fswab32(x)
|
|
# define __swab64(x) __fswab64(x)
|
|
#endif /* OPTIMIZE */
|
|
|
|
|
|
static __inline__ __attribute__((const)) __u16 __fswab16(__u16 x)
|
|
{
|
|
return __arch__swab16(x);
|
|
}
|
|
static __inline__ __u16 __swab16p(const __u16 *x)
|
|
{
|
|
return __arch__swab16p(x);
|
|
}
|
|
static __inline__ void __swab16s(__u16 *addr)
|
|
{
|
|
__arch__swab16s(addr);
|
|
}
|
|
|
|
static __inline__ __attribute__((const)) __u32 __fswab32(__u32 x)
|
|
{
|
|
return __arch__swab32(x);
|
|
}
|
|
static __inline__ __u32 __swab32p(const __u32 *x)
|
|
{
|
|
return __arch__swab32p(x);
|
|
}
|
|
static __inline__ void __swab32s(__u32 *addr)
|
|
{
|
|
__arch__swab32s(addr);
|
|
}
|
|
|
|
#ifdef __BYTEORDER_HAS_U64__
|
|
static __inline__ __attribute__((const)) __u64 __fswab64(__u64 x)
|
|
{
|
|
# ifdef __SWAB_64_THRU_32__
|
|
__u32 h = x >> 32;
|
|
__u32 l = x & ((1ULL<<32)-1);
|
|
return (((__u64)__swab32(l)) << 32) | ((__u64)(__swab32(h)));
|
|
# else
|
|
return __arch__swab64(x);
|
|
# endif
|
|
}
|
|
static __inline__ __u64 __swab64p(const __u64 *x)
|
|
{
|
|
return __arch__swab64p(x);
|
|
}
|
|
static __inline__ void __swab64s(__u64 *addr)
|
|
{
|
|
__arch__swab64s(addr);
|
|
}
|
|
#endif /* __BYTEORDER_HAS_U64__ */
|
|
|
|
#if defined(__KERNEL__)
|
|
#define swab16 __swab16
|
|
#define swab32 __swab32
|
|
#define swab64 __swab64
|
|
#define swab16p __swab16p
|
|
#define swab32p __swab32p
|
|
#define swab64p __swab64p
|
|
#define swab16s __swab16s
|
|
#define swab32s __swab32s
|
|
#define swab64s __swab64s
|
|
#endif
|
|
|
|
#endif /* _LINUX_BYTEORDER_SWAB_H */
|