From eb7f908a163bff7295547b734e2cc716f12235c4 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Mon, 17 Dec 2018 10:22:21 +0100 Subject: tools: imx8image: use correct printf escape sequence core is of type uint64_t. So for printing we need "%"PRIu64 (not "%lu"). Without the patch a warning is issued when building on a 32bit system. Signed-off-by: Heinrich Schuchardt --- tools/imx8image.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/imx8image.c b/tools/imx8image.c index 435f308b99..2ccc0cccb4 100644 --- a/tools/imx8image.c +++ b/tools/imx8image.c @@ -555,7 +555,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 { - fprintf(stderr, "Error: invalid AP core id: %lu\n", + fprintf(stderr, + "Error: invalid AP core id: %" PRIu64 "\n", core); exit(EXIT_FAILURE); } @@ -577,7 +578,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 { - 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; -- cgit v1.2.1 From 9ec1791e6acd00e7800987a5c0888e3d99495c5a Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Fri, 18 Jan 2019 11:00:11 -0200 Subject: Revert "tools: imx8image: set dcd_skip to true" This reverts commit f7e475db4011d18b4ae974154eb022c3af6a4d16. This commit breaks the boot on imx8qxp evk and it should only be re-applied after imx8qxp evk is converted to SPL. Revert it for now, so that imx8qxp evk can be functional. Reported-by: Breno Lima Signed-off-by: Fabio Estevam Reviewed-by: Peng Fan Tested-by: Breno Lima --- tools/imx8image.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/imx8image.c b/tools/imx8image.c index 2ccc0cccb4..1b428c3b2f 100644 --- a/tools/imx8image.c +++ b/tools/imx8image.c @@ -971,7 +971,7 @@ int imx8image_copy_image(int outfd, struct image_tool_params *mparams) fprintf(stdout, "CONTAINER SW VERSION:\t0x%04x\n", sw_version); build_container(soc, sector_size, emmc_fastboot, - img_sp, true, fuse_version, sw_version, outfd); + img_sp, false, fuse_version, sw_version, outfd); return 0; } -- cgit v1.2.1