From: Kever Yang <kever.yang@rock-chips.com>
To: u-boot@lists.denx.de
Subject: [PATCH v3 2/8] tool: aisimage: use ALIGN instead of self defiend macro
Date: Thu, 26 Mar 2020 18:09:10 +0800 [thread overview]
Message-ID: <20200326100916.22532-2-kever.yang@rock-chips.com> (raw)
In-Reply-To: <20200326100916.22532-1-kever.yang@rock-chips.com>
The ALIGN() is available at imagetool.h, no need to self define one.
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
---
Changes in v3: None
Changes in v2: None
tools/aisimage.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/aisimage.c b/tools/aisimage.c
index 4cd76ab843..b8b3ee3207 100644
--- a/tools/aisimage.c
+++ b/tools/aisimage.c
@@ -10,7 +10,6 @@
#define IS_FNC_EXEC(c) (cmd_table[c].AIS_cmd == AIS_CMD_FNLOAD)
#define WORD_ALIGN0 4
-#define WORD_ALIGN(len) (((len)+WORD_ALIGN0-1) & ~(WORD_ALIGN0-1))
#define MAX_CMD_BUFFER 4096
static uint32_t ais_img_size;
@@ -202,8 +201,9 @@ static uint32_t *ais_alloc_buffer(struct image_tool_params *params)
* is not left to the main program, because after the datafile
* the header must be terminated with the Jump & Close command.
*/
- ais_img_size = WORD_ALIGN(sbuf.st_size) + MAX_CMD_BUFFER;
- ptr = (uint32_t *)malloc(WORD_ALIGN(sbuf.st_size) + MAX_CMD_BUFFER);
+ ais_img_size = ALIGN(sbuf.st_size, WORD_ALIGN0) + MAX_CMD_BUFFER;
+ ptr = (uint32_t *)malloc(ALIGN(sbuf.st_size, WORD_ALIGN0)
+ + MAX_CMD_BUFFER);
if (!ptr) {
fprintf(stderr, "%s: malloc return failure: %s\n",
params->cmdname, strerror(errno));
@@ -242,7 +242,7 @@ static uint32_t *ais_copy_image(struct image_tool_params *params,
*aisptr++ = params->ep;
*aisptr++ = sbuf.st_size;
memcpy((void *)aisptr, ptr, sbuf.st_size);
- aisptr += WORD_ALIGN(sbuf.st_size) / sizeof(uint32_t);
+ aisptr += ALIGN(sbuf.st_size, WORD_ALIGN0) / sizeof(uint32_t);
(void) munmap((void *)ptr, sbuf.st_size);
(void) close(dfd);
--
2.17.1
next prev parent reply other threads:[~2020-03-26 10:09 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-26 10:09 [PATCH v3 1/8] tool: Move ALIGN_MASK to header as common MACRO Kever Yang
2020-03-26 10:09 ` Kever Yang [this message]
2020-03-27 18:16 ` [PATCH v3 2/8] tool: aisimage: use ALIGN instead of self defiend macro Tom Rini
2020-03-26 10:09 ` [PATCH v3 3/8] tools: mkimage: use common ALIGN to do the size align Kever Yang
2020-03-27 18:16 ` Tom Rini
2020-03-26 10:09 ` [PATCH v3 4/8] tools: kwbimage: " Kever Yang
2020-03-26 10:12 ` Stefan Roese
2020-03-27 18:16 ` Tom Rini
2020-03-26 10:09 ` [PATCH v3 5/8] tools: imx8mimage: remove redundant code Kever Yang
2020-03-27 18:16 ` Tom Rini
2020-03-26 10:09 ` [PATCH v3 6/8] tool: use ALIGN() to align the size Kever Yang
2020-03-26 11:39 ` Heinrich Schuchardt
2020-03-27 18:16 ` Tom Rini
2020-03-26 10:09 ` [PATCH v3 7/8] libfdt: Make fdtdec_get_child_count() available for HOST Kever Yang
2020-03-28 20:04 ` Simon Glass
2020-03-26 10:09 ` [PATCH v3 8/8] mkimage: fit_image: Add option to make fit header align Kever Yang
2020-03-27 18:16 ` Tom Rini
2020-03-30 2:35 ` Kever Yang
2020-03-27 3:27 ` [PATCH v3 1/8] tool: Move ALIGN_MASK to header as common MACRO Punit Agrawal
2020-03-27 18:16 ` Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200326100916.22532-2-kever.yang@rock-chips.com \
--to=kever.yang@rock-chips.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox