tools: mkimage: Update U-Boot to version 2021.01
* The fit image is now created with 0666 permission in upstream U-Boot remove our patch switch creates it with 0744 * The generated/autoconf.h file is created now as an empty file, it is not needed to remove this include any more. * Upstream lib/rsa/rsa-sign.c now includes stdlib.h instead of malloc.h * ALIGN_MASK was moved to imagetool.h, own patch should not be needed any more. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
@@ -12,8 +12,6 @@ parts for these header files manually or remove the usage too.
|
||||
|
||||
__u64 is not available on FreeBSD, remove its usage.
|
||||
|
||||
<malloc.h> has been replaced by <stdlib.h>
|
||||
|
||||
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
---
|
||||
include/image.h | 2 ++
|
||||
@@ -35,21 +33,6 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
#include <stdbool.h>
|
||||
|
||||
/* Define this to avoid #ifdefs later on */
|
||||
--- 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
|
||||
|
||||
#define __packed __attribute__((packed))
|
||||
|
||||
--- a/include/linux/posix_types.h
|
||||
+++ b/include/linux/posix_types.h
|
||||
@@ -43,6 +43,8 @@ typedef void (*__kernel_sighandler_t)(in
|
||||
@@ -82,14 +65,3 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
typedef __u64 __bitwise __le64;
|
||||
typedef __u64 __bitwise __be64;
|
||||
#endif
|
||||
--- a/lib/rsa/rsa-sign.c
|
||||
+++ b/lib/rsa/rsa-sign.c
|
||||
@@ -4,7 +4,7 @@
|
||||
*/
|
||||
|
||||
#include "mkimage.h"
|
||||
-#include <malloc.h>
|
||||
+#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <image.h>
|
||||
|
||||
Reference in New Issue
Block a user