sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

armv8: Use __aarch64__ rather than CONFIG_ARM64 in some cases 

The toolchain sets __aarch64__ for both LE and BE.  In the case of
posix_types.h we cannot reliably use config.h as that will lead to
problems.  In the case of byteorder.h it's clearer to check the EB flag
being set in either case instead.

Cc: David Feng <fenghua@phytium.com.cn>
Signed-off-by: Tom Rini <trini@ti.com>

Amended by Albert ARIBAUD <albert.u.boot@aribaud.net> to
actually remove the config.h include from the posix_types.h
files, with permission from Tom Rini.
This commit is contained in:
Tom Rini 2014-01-09 15:11:27 -05:00 committed by Albert ARIBAUD
parent 2475e63475
commit 795611e6ff
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/arm/include/asm/byteorder.h
View File

@ -23,22 +23,10 @@
# define __SWAB_64_THRU_32__
#endif
#ifdef CONFIG_ARM64
#ifdef __AARCH64EB__
#if defined(__ARMEB__) || defined(__AARCH64EB__)
#include <linux/byteorder/big_endian.h>
#else
#include <linux/byteorder/little_endian.h>
#endif
#else /* CONFIG_ARM64 */
#ifdef __ARMEB__
#include <linux/byteorder/big_endian.h>
#else
#include <linux/byteorder/little_endian.h>
#endif
#endif /* CONFIG_ARM64 */
#endif

8
arch/arm/include/asm/posix_types.h
View File

@ -13,8 +13,6 @@
#ifndef __ARCH_ARM_POSIX_TYPES_H
#define __ARCH_ARM_POSIX_TYPES_H
#include <config.h>
/*
* This file is generally used by user-level software, so you need to
* be a little careful about namespace pollution etc. Also, we cannot
@ -31,15 +29,15 @@ typedef unsigned short __kernel_ipc_pid_t;
typedef unsigned short __kernel_uid_t;
typedef unsigned short __kernel_gid_t;
#ifdef CONFIG_ARM64
#ifdef __aarch64__
typedef unsigned long __kernel_size_t;
typedef long __kernel_ssize_t;
typedef long __kernel_ptrdiff_t;
#else /* CONFIG_ARM64 */
#else
typedef unsigned int __kernel_size_t;
typedef int __kernel_ssize_t;
typedef int __kernel_ptrdiff_t;
#endif /* CONFIG_ARM64 */
#endif
typedef long __kernel_time_t;
typedef long __kernel_suseconds_t;