diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2019-05-11 16:57:15 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-09-04 22:35:22 +0200 |
commit | 169152c8d118408ba62788a1e6b9eae368dc8b79 (patch) | |
tree | 9e4187f7891564f63be7dcbccf0b47ddf6fc63ed /tools/mkimage/patches/060-remove_kernel_includes.patch | |
parent | 662394fb30fdbcc89ec387918714aebee6868a9f (diff) | |
download | upstream-169152c8d118408ba62788a1e6b9eae368dc8b79.tar.gz upstream-169152c8d118408ba62788a1e6b9eae368dc8b79.tar.bz2 upstream-169152c8d118408ba62788a1e6b9eae368dc8b79.zip |
tools/mkimage: Update U-Boot to version 2019.07
This updates the U-Boot which provides the host tools like mkimage to
version 2019.07.
The patches were cleaned up and it was checked if this still compiles
on Linux and FreeBSD.
CONFIG_FIT_SIGNATURE_MAX_SIZE is set to the default value.
The patch for libressl was merged upstream.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'tools/mkimage/patches/060-remove_kernel_includes.patch')
-rw-r--r-- | tools/mkimage/patches/060-remove_kernel_includes.patch | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/tools/mkimage/patches/060-remove_kernel_includes.patch b/tools/mkimage/patches/060-remove_kernel_includes.patch index e61d8cc496..8917ec0863 100644 --- a/tools/mkimage/patches/060-remove_kernel_includes.patch +++ b/tools/mkimage/patches/060-remove_kernel_includes.patch @@ -1,17 +1,6 @@ ---- a/include/compiler.h -+++ b/include/compiler.h -@@ -66,6 +66,11 @@ typedef uint8_t __u8; - typedef uint16_t __u16; - typedef uint32_t __u32; - typedef unsigned int uint; -+typedef uint64_t __u64; -+#ifndef linux -+typedef int __kernel_daddr_t; -+typedef unsigned int __kernel_ino_t; -+#endif - - #define uswap_16(x) \ - ((((x) & 0xff00) >> 8) | \ +The Kernel includes are only available on Linux hosts, remove then on +non Linux hosts. + --- a/include/linux/posix_types.h +++ b/include/linux/posix_types.h @@ -43,6 +43,8 @@ typedef void (*__kernel_sighandler_t)(in @@ -23,13 +12,18 @@ +#endif #endif /* _LINUX_POSIX_TYPES_H */ ---- a/include/linux/types.h -+++ b/include/linux/types.h -@@ -2,7 +2,6 @@ - #define _LINUX_TYPES_H +--- a/include/imx8image.h ++++ b/include/imx8image.h +@@ -11,7 +11,12 @@ + #include <image.h> + #include <inttypes.h> + #include "imagetool.h" ++#ifdef linux + #include "linux/kernel.h" ++#else ++#define ALIGN(x,a) __ALIGN_MASK((x),(typeof(x))(a)-1) ++#define __ALIGN_MASK(x,mask) (((x)+(mask))&~(mask)) ++#endif - #include <linux/posix_types.h> --#include <asm/types.h> - #include <stdbool.h> + #define __packed __attribute__((packed)) - #ifndef __KERNEL_STRICT_NAMES |