summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-01-09 15:11:27 -0500
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-01-10 10:10:23 +0100
commit795611e6ffb7d95c2a4529f365953bead0ccd13f (patch)
tree1b1dba64ec4babf8e602ca754e9869fa884b2e4f /arch
parent2475e634758577baad4a54f4585c7fa9a638ae73 (diff)
downloadu-boot-imx-795611e6ffb7d95c2a4529f365953bead0ccd13f.zip
u-boot-imx-795611e6ffb7d95c2a4529f365953bead0ccd13f.tar.gz
u-boot-imx-795611e6ffb7d95c2a4529f365953bead0ccd13f.tar.bz2
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.
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/include/asm/byteorder.h14
-rw-r--r--arch/arm/include/asm/posix_types.h8
2 files changed, 4 insertions, 18 deletions
diff --git a/arch/arm/include/asm/byteorder.h b/arch/arm/include/asm/byteorder.h
index 71a9966..20cce76 100644
--- a/arch/arm/include/asm/byteorder.h
+++ b/arch/arm/include/asm/byteorder.h
@@ -23,22 +23,10 @@
# define __SWAB_64_THRU_32__
#endif
-#ifdef CONFIG_ARM64
-
-#ifdef __AARCH64EB__
-#include <linux/byteorder/big_endian.h>
-#else
-#include <linux/byteorder/little_endian.h>
-#endif
-
-#else /* CONFIG_ARM64 */
-
-#ifdef __ARMEB__
+#if defined(__ARMEB__) || defined(__AARCH64EB__)
#include <linux/byteorder/big_endian.h>
#else
#include <linux/byteorder/little_endian.h>
#endif
-#endif /* CONFIG_ARM64 */
-
#endif
diff --git a/arch/arm/include/asm/posix_types.h b/arch/arm/include/asm/posix_types.h
index 9ba9add..d254b95 100644
--- a/arch/arm/include/asm/posix_types.h
+++ b/arch/arm/include/asm/posix_types.h
@@ -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;