diff options
| author | Tom Rini <trini@konsulko.com> | 2020-01-03 09:47:22 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-01-03 09:47:22 -0500 |
| commit | 70bd39d72a11544a28adfa4af2e1a8fdce6775ba (patch) | |
| tree | 239ac52926655007b8932829c4c1ae54efed628c /include | |
| parent | 4b75aa5aa78768fc81b782ee51d960dfed76f6e1 (diff) | |
| parent | 40109f4d7ed114cd473e5528b7b0a9a04be9207e (diff) | |
Merge branch '2020-01-03-master-imports'
- Fixes for host tools with musl C library
- Two fixes for TI K3 platforms
Diffstat (limited to 'include')
| -rw-r--r-- | include/compiler.h | 2 | ||||
| -rw-r--r-- | include/u-boot/crc.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/compiler.h b/include/compiler.h index 29507f9840..90372f239c 100644 --- a/include/compiler.h +++ b/include/compiler.h @@ -46,7 +46,6 @@ # include <byteswap.h> #elif defined(__MACH__) || defined(__FreeBSD__) # include <machine/endian.h> -typedef unsigned long ulong; #endif #ifdef __FreeBSD__ # include <sys/endian.h> /* htole32 and friends */ @@ -66,6 +65,7 @@ typedef uint8_t __u8; typedef uint16_t __u16; typedef uint32_t __u32; typedef unsigned int uint; +typedef unsigned long ulong; #define uswap_16(x) \ ((((x) & 0xff00) >> 8) | \ diff --git a/include/u-boot/crc.h b/include/u-boot/crc.h index 1086d2168c..bfd477f31d 100644 --- a/include/u-boot/crc.h +++ b/include/u-boot/crc.h @@ -8,6 +8,8 @@ #ifndef _UBOOT_CRC_H #define _UBOOT_CRC_H +#include <compiler.h> /* 'uint*' definitions */ + /** * crc8() - Calculate and return CRC-8 of the data * |