[PATCH v3 6/8] tool: use ALIGN() to align the size
Kever Yang
kever.yang at rock-chips.com
Thu Mar 26 11:09:14 CET 2020
Use the ALIGN() for size align so that the code is more readable.
Signed-off-by: Kever Yang <kever.yang at rock-chips.com>
---
Changes in v3: None
Changes in v2: None
tools/fit_image.c | 2 +-
tools/socfpgaimage.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/fit_image.c b/tools/fit_image.c
index 6aa4b1c733..a417182d4f 100644
--- a/tools/fit_image.c
+++ b/tools/fit_image.c
@@ -540,7 +540,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);
--
2.17.1
More information about the U-Boot
mailing list