summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorKever Yang <kever.yang@rock-chips.com>2020-03-30 11:56:19 +0800
committerTom Rini <trini@konsulko.com>2020-04-24 10:10:00 -0400
commit29e7ab01866f44eec9dbe9ec7093eb1d1dda57d5 (patch)
tree30f249b0cc87528d36a80d357cdcb167c9b09e1a /tools
parentcd1cec6364cef9b38f4070ec7377757e757d50c4 (diff)
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>
Diffstat (limited to 'tools')
-rw-r--r--tools/mkimage.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/mkimage.c b/tools/mkimage.c
index 5f51d2cc89..0279f6867e 100644
--- 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