[PATCH v3 4/8] tools: kwbimage: use common ALIGN to do the size align

[Stefan Roese]

On 26.03.20 11:09, Kever Yang wrote:
> The ALIGN() is now available at imagetool.h, migrate to use it.
> 
> Signed-off-by: Kever Yang <kever.yang at rock-chips.com>

Reviewed-by: Stefan Roese <sr at denx.de>

Thanks,
Stefan

> ---
> 
> Changes in v3: None
> Changes in v2: None
> 
>   tools/kwbimage.c | 8 ++++----
>   tools/kwbimage.h | 2 --
>   2 files changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/tools/kwbimage.c b/tools/kwbimage.c
> index b8f8d38212..02fd0c949f 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) {
> diff --git a/tools/kwbimage.h b/tools/kwbimage.h
> index 25bc08c5ce..0b6d05bef1 100644
> --- a/tools/kwbimage.h
> +++ b/tools/kwbimage.h
> @@ -29,8 +29,6 @@
>   #define IBR_HDR_UART_ID			0x69
>   #define IBR_DEF_ATTRIB	 		0x00
>   
> -#define ALIGN_SUP(x, a) (((x) + (a - 1)) & ~(a - 1))
> -
>   /* Structure of the main header, version 0 (Kirkwood, Dove) */
>   struct main_hdr_v0 {
>   	uint8_t  blockid;		/* 0x0       */
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de