diff options
| author | Kever Yang <kever.yang@rock-chips.com> | 2020-03-30 11:56:20 +0800 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-04-24 10:10:00 -0400 |
| commit | e002ee7efc4a236f239aed54f89da913105ac6d5 (patch) | |
| tree | d4427904aa00fa1295f66ec3e6a19fe5f7282488 /tools/kwbimage.c | |
| parent | 29e7ab01866f44eec9dbe9ec7093eb1d1dda57d5 (diff) | |
| download | u-boot-e002ee7efc4a236f239aed54f89da913105ac6d5.zip u-boot-e002ee7efc4a236f239aed54f89da913105ac6d5.tar.gz u-boot-e002ee7efc4a236f239aed54f89da913105ac6d5.tar.bz2 | |
tools: kwbimage: 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>
Reviewed-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'tools/kwbimage.c')
| -rw-r--r-- | tools/kwbimage.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/kwbimage.c b/tools/kwbimage.c index b8f8d38..02fd0c9 100644 --- a/tools/kwbimage.c +++ b/tools/kwbimage.c @@ -1015,7 +1015,7 @@ static size_t image_headersz_v1(int *hasext) * The payload should be aligned on some reasonable * boundary */ - return ALIGN_SUP(headersz, 4096); + return ALIGN(headersz, 4096); } int add_binary_header_v1(uint8_t *cur) @@ -1058,7 +1058,7 @@ int add_binary_header_v1(uint8_t *cur) * up to a 4-byte boundary. Plus 4 bytes for the * next-header byte and 3-byte alignment at the end. */ - binhdrsz = ALIGN_SUP(binhdrsz, 4) + 4; + binhdrsz = ALIGN(binhdrsz, 4) + 4; hdr->headersz_lsb = cpu_to_le16(binhdrsz & 0xFFFF); hdr->headersz_msb = (binhdrsz & 0xFFFF0000) >> 16; @@ -1082,7 +1082,7 @@ int add_binary_header_v1(uint8_t *cur) fclose(bin); - cur += ALIGN_SUP(s.st_size, 4); + cur += ALIGN(s.st_size, 4); /* * For now, we don't support more than one binary @@ -1548,7 +1548,7 @@ static void kwbimage_set_header(void *ptr, struct stat *sbuf, int ifd, } /* The MVEBU BootROM does not allow non word aligned payloads */ - sbuf->st_size = ALIGN_SUP(sbuf->st_size, 4); + sbuf->st_size = ALIGN(sbuf->st_size, 4); version = image_get_version(); switch (version) { |