diff options
| author | Tom Rini <trini@konsulko.com> | 2019-10-30 16:05:13 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-10-30 16:05:13 +0300 |
| commit | ba742b839c524f7723799d750a540ad3fe70ca7f (patch) | |
| tree | 0194bd4da2f2723c9256558c5e0ca46d18b1278d /include | |
| parent | cc64810dc6234a3537502a05988fa7a1a6fa5d55 (diff) | |
| parent | bf275222ab80650a9dbc559ba42e52d93ff86af4 (diff) | |
| download | u-boot-ba742b839c524f7723799d750a540ad3fe70ca7f.tar.xz | |
Merge branch '2019-10-28-azure-ci-support'
- Clean up Travis-CI slightly and then add support for Microsoft Azure
pipelines, all from Bin Meng.
Diffstat (limited to 'include')
| -rw-r--r-- | include/image.h | 14 | ||||
| -rw-r--r-- | include/linux/types.h | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/include/image.h b/include/image.h index c1065c06f9..f4d2aaf53e 100644 --- a/include/image.h +++ b/include/image.h @@ -319,13 +319,13 @@ enum { * all data in network byte order (aka natural aka bigendian). */ typedef struct image_header { - __be32 ih_magic; /* Image Header Magic Number */ - __be32 ih_hcrc; /* Image Header CRC Checksum */ - __be32 ih_time; /* Image Creation Timestamp */ - __be32 ih_size; /* Image Data Size */ - __be32 ih_load; /* Data Load Address */ - __be32 ih_ep; /* Entry Point Address */ - __be32 ih_dcrc; /* Image Data CRC Checksum */ + uint32_t ih_magic; /* Image Header Magic Number */ + uint32_t ih_hcrc; /* Image Header CRC Checksum */ + uint32_t ih_time; /* Image Creation Timestamp */ + uint32_t ih_size; /* Image Data Size */ + uint32_t ih_load; /* Data Load Address */ + uint32_t ih_ep; /* Entry Point Address */ + uint32_t ih_dcrc; /* Image Data CRC Checksum */ uint8_t ih_os; /* Operating System */ uint8_t ih_arch; /* CPU architecture */ uint8_t ih_type; /* Image Type */ diff --git a/include/linux/types.h b/include/linux/types.h index cc6f7cb39e..51cb284bb8 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -151,12 +151,14 @@ typedef __u32 __bitwise __wsum; typedef unsigned __bitwise__ gfp_t; +#ifdef __linux__ struct ustat { __kernel_daddr_t f_tfree; __kernel_ino_t f_tinode; char f_fname[6]; char f_fpack[6]; }; +#endif #define DECLARE_BITMAP(name, bits) \ unsigned long name[BITS_TO_LONGS(bits)] |