From 47f7a9def781c46a956366dc40a6674ea0609c59 Mon Sep 17 00:00:00 2001 From: Peng Fan Date: Mon, 5 Nov 2018 09:53:31 +0000 Subject: [PATCH] tools: imx8image: flatten container header only when creating container If there is no CONTAINER entry, there is no need to flatten container header. Signed-off-by: Peng Fan --- tools/imx8image.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/tools/imx8image.c b/tools/imx8image.c index ac89c821c9..6e8ac464e7 100644 --- a/tools/imx8image.c +++ b/tools/imx8image.c @@ -914,17 +914,19 @@ static int build_container(soc_type_t soc, uint32_t sector_size, exit(EXIT_FAILURE); } - /* Note: Image offset are not contained in the image */ - tmp = flatten_container_header(&imx_header, container + 1, &size, - file_padding); - /* Write image header */ - if (write(ofd, tmp, size) != size) { - fprintf(stderr, "error writing image hdr\n"); - exit(EXIT_FAILURE); - } + if (container >= 0) { + /* Note: Image offset are not contained in the image */ + tmp = flatten_container_header(&imx_header, container + 1, + &size, file_padding); + /* Write image header */ + if (write(ofd, tmp, size) != size) { + fprintf(stderr, "error writing image hdr\n"); + exit(EXIT_FAILURE); + } - /* Clean-up memory used by the headers */ - free(tmp); + /* Clean-up memory used by the headers */ + free(tmp); + } /* * step through the image stack again this time copying -- 2.25.1