Merge tag 'fpga-for-v2018.11' of git://git.denx.de/u-boot-microblaze

[oweals/u-boot.git] / include / compiler.h

diff --git a/include/compiler.h b/include/compiler.h
index 65b826e4d187df332eecc124da5848e5e643f63d..29507f9840e0dcbc72ea4c6961b65971f1149bb5 100644 (file)
--- a/include/compiler.h
+++ b/include/compiler.h
@@ -50,8 +50,14 @@ typedef unsigned long ulong;
 #endif
 #ifdef __FreeBSD__
 # include <sys/endian.h> /* htole32 and friends */
+# define __BYTE_ORDER BYTE_ORDER
+# define __LITTLE_ENDIAN LITTLE_ENDIAN
+# define __BIG_ENDIAN BIG_ENDIAN
 #elif defined(__OpenBSD__)
 # include <endian.h>
+# define __BYTE_ORDER BYTE_ORDER
+# define __LITTLE_ENDIAN LITTLE_ENDIAN
+# define __BIG_ENDIAN BIG_ENDIAN
 #endif
 
 #include <time.h>
@@ -84,20 +90,7 @@ typedef unsigned int uint;
 # define uswap_64(x) _uswap_64(x, )
 #endif
 
-#if defined(__OpenBSD__)
-#define cpu_to_le16(x)         htole16(x)
-#define cpu_to_le32(x)         htole32(x)
-#define cpu_to_le64(x)         htole64(x)
-#define le16_to_cpu(x)         letoh16(x)
-#define le32_to_cpu(x)         letoh32(x)
-#define le64_to_cpu(x)         letoh64(x)
-#define cpu_to_be16(x)         htobe16(x)
-#define cpu_to_be32(x)         htobe32(x)
-#define cpu_to_be64(x)         htobe64(x)
-#define be16_to_cpu(x)         betoh16(x)
-#define be32_to_cpu(x)         betoh32(x)
-#define be64_to_cpu(x)         betoh64(x)
-#elif __BYTE_ORDER == __LITTLE_ENDIAN
+#if __BYTE_ORDER == __LITTLE_ENDIAN
 # define cpu_to_le16(x)                (x)
 # define cpu_to_le32(x)                (x)
 # define cpu_to_le64(x)                (x)
@@ -127,13 +120,8 @@ typedef unsigned int uint;
 
 #else /* !USE_HOSTCC */
 
-#ifdef CONFIG_USE_STDINT
-/* Provided by gcc. */
-#include <stdint.h>
-#else
 /* Type for `void *' pointers. */
 typedef unsigned long int uintptr_t;
-#endif
 
 #include <linux/string.h>
 #include <linux/types.h>