From 042917f1c4e8e68ed6c6948dcaf57d35d0b3c366 Mon Sep 17 00:00:00 2001 From: Lucian Cristian Date: Sun, 19 Apr 2020 16:07:10 +0300 Subject: tools/mkimage: update to 2020.04 also change the download source to https and add a mirror drop merged patches Signed-off-by: Lucian Cristian [Add extra changes to compile on FreeBSD, merge two patches] Signed-off-by: Hauke Mehrtens --- .../patches/060-remove_kernel_includes.patch | 29 ---------------------- 1 file changed, 29 deletions(-) delete mode 100644 tools/mkimage/patches/060-remove_kernel_includes.patch (limited to 'tools/mkimage/patches/060-remove_kernel_includes.patch') diff --git a/tools/mkimage/patches/060-remove_kernel_includes.patch b/tools/mkimage/patches/060-remove_kernel_includes.patch deleted file mode 100644 index 8917ec0863..0000000000 --- a/tools/mkimage/patches/060-remove_kernel_includes.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 - /* Type of a SYSV IPC key. */ - typedef int __kernel_key_t; - -+#ifdef linux - #include -+#endif - - #endif /* _LINUX_POSIX_TYPES_H */ ---- a/include/imx8image.h -+++ b/include/imx8image.h -@@ -11,7 +11,12 @@ - #include - #include - #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 - - #define __packed __attribute__((packed)) - -- cgit v1.2.3