tools: mkimage: use common ALIGN to do the size align

The ALIGN() is now available at imagetool.h, migrate to use it.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Reviewed-by: Punit Agrawal <punit1.agrawal@toshiba.co.jp>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/tools/mkimage.c b/tools/mkimage.c
index 5f51d2cc89fa00f6cacee12bf01d924a209bcd02..0279f6867e91893954315f98245e3e8e3edf4831 100644 (file)
--- a/tools/mkimage.c
+++ b/tools/mkimage.c
@@ -7,6 +7,7 @@
  * Wolfgang Denk, wd@denx.de
  */
 
+#include "imagetool.h"
 #include "mkimage.h"
 #include "imximage.h"
 #include <image.h>
@@ -557,8 +558,8 @@ int main(int argc, char **argv)
                }
                if (params.type == IH_TYPE_FIRMWARE_IVT) {
                        /* Add alignment and IVT */
-                       uint32_t aligned_filesize = (params.file_size + 0x1000
-                                       - 1) & ~(0x1000 - 1);
+                       uint32_t aligned_filesize = ALIGN(params.file_size,
+                                                         0x1000);
                        flash_header_v2_t ivt_header = { { 0xd1, 0x2000, 0x40 },
                                        params.addr, 0, 0, 0, params.addr
                                                        + aligned_filesize