From: Kever Yang Date: Mon, 30 Mar 2020 03:56:22 +0000 (+0800) Subject: tool: use ALIGN() to align the size X-Git-Tag: v2020.07-rc1~17^2~19 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=02560b13689650cf0d2f5825eaf480629ce9238f;p=oweals%2Fu-boot.git tool: use ALIGN() to align the size Use the ALIGN() for size align so that the code is more readable. Signed-off-by: Kever Yang Reviewed-by: Punit Agrawal Reviewed-by: Tom Rini Reviewed-by: Heinrich Schuchardt --- diff --git a/tools/fit_image.c b/tools/fit_image.c index 4301b5decb..55efe12eeb 100644 --- a/tools/fit_image.c +++ b/tools/fit_image.c @@ -547,7 +547,7 @@ static int fit_import_data(struct image_tool_params *params, const char *fname) if (fd < 0) return -EIO; fit_size = fdt_totalsize(old_fdt); - data_base = (fit_size + 3) & ~3; + data_base = ALIGN(fit_size, 4); /* Allocate space to hold the new FIT */ size = sbuf.st_size + 16384; diff --git a/tools/socfpgaimage.c b/tools/socfpgaimage.c index 8fa098338b..6dfd64e31d 100644 --- a/tools/socfpgaimage.c +++ b/tools/socfpgaimage.c @@ -203,7 +203,7 @@ static int sfp_sign_buffer(uint8_t *buf, uint8_t ver, uint8_t flags, uint32_t calc_crc; /* Align the length up */ - len = (len + 3) & ~3; + len = ALIGN(len, 4); /* Build header, adding 4 bytes to length to hold the CRC32. */ sfp_build_header(buf + HEADER_OFFSET, ver, flags, len + 4);