projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'u-boot-imx-20211020' of https://source.denx.de/u-boot/custodians/u-boot-imx
[platform/kernel/u-boot.git]
/
tools
/
imx8image.c
diff --git
a/tools/imx8image.c
b/tools/imx8image.c
index
6e8ac46
..
fa8f227
100644
(file)
--- a/
tools/imx8image.c
+++ b/
tools/imx8image.c
@@
-6,6
+6,7
@@
*/
#include "imx8image.h"
*/
#include "imx8image.h"
+#include <image.h>
static int p_idx;
static int sector_size;
static int p_idx;
static int sector_size;
@@
-364,7
+365,7
@@
static void copy_file (int ifd, const char *datafile, int pad, int offset)
struct stat sbuf;
unsigned char *ptr;
int tail;
struct stat sbuf;
unsigned char *ptr;
int tail;
-
in
t zero = 0;
+
uint64_
t zero = 0;
uint8_t zeros[4096];
int size, ret;
uint8_t zeros[4096];
int size, ret;
@@
-555,7
+556,8
@@
static void set_image_array_entry(flash_header_v3_t *container,
} else if (soc == QM && core == CORE_CA72) {
meta = IMAGE_A72_DEFAULT_META(custom_partition);
} else {
} else if (soc == QM && core == CORE_CA72) {
meta = IMAGE_A72_DEFAULT_META(custom_partition);
} else {
- fprintf(stderr, "Error: invalid AP core id: %lu\n",
+ fprintf(stderr,
+ "Error: invalid AP core id: %" PRIu64 "\n",
core);
exit(EXIT_FAILURE);
}
core);
exit(EXIT_FAILURE);
}
@@
-577,7
+579,9
@@
static void set_image_array_entry(flash_header_v3_t *container,
core = CORE_CM4_1;
meta = IMAGE_M4_1_DEFAULT_META(custom_partition);
} else {
core = CORE_CM4_1;
meta = IMAGE_M4_1_DEFAULT_META(custom_partition);
} else {
- fprintf(stderr, "Error: invalid m4 core id: %lu\n", core);
+ fprintf(stderr,
+ "Error: invalid m4 core id: %" PRIu64 "\n",
+ core);
exit(EXIT_FAILURE);
}
img->hab_flags |= IMG_TYPE_EXEC;
exit(EXIT_FAILURE);
}
img->hab_flags |= IMG_TYPE_EXEC;
@@
-674,7
+678,7
@@
static int get_container_image_start_pos(image_t *image_stack, uint32_t align)
fclose(fd);
if (header.tag != IVT_HEADER_TAG_B0) {
fclose(fd);
if (header.tag != IVT_HEADER_TAG_B0) {
- fprintf(stderr, "header tag mis
s
matched \n");
+ fprintf(stderr, "header tag mismatched \n");
exit(EXIT_FAILURE);
} else {
file_off +=
exit(EXIT_FAILURE);
} else {
file_off +=