From patchwork Mon Mar 30 03:56:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 1263712 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=rock-chips.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=jLPKfXG8; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48rJYc4PH6z9sPF for ; Mon, 30 Mar 2020 14:56:52 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 24E75818E7; Mon, 30 Mar 2020 05:56:45 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=rock-chips.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="jLPKfXG8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5DC22818C2; Mon, 30 Mar 2020 05:56:41 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pj1-x1044.google.com (mail-pj1-x1044.google.com [IPv6:2607:f8b0:4864:20::1044]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 87A998120B for ; Mon, 30 Mar 2020 05:56:35 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=rock-chips.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=kever.yang@gmail.com Received: by mail-pj1-x1044.google.com with SMTP id jz1so5972110pjb.0 for ; Sun, 29 Mar 2020 20:56:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=OSKXgJM0pUuX9cPVDw4ezidlFU6NJpjlspMMLMCu8Ao=; b=jLPKfXG82r2OFCUc6Rn3T9V0izN4D2C6w+Udp8RkR2yYByZUiX9PSxq/0pkfPTPTfP A3gnF1HkwnPF3a/YNO8g7bOAzyA58SPmOFYs6rFne5scxfrE2ewOkjZkjBNVkZ6XZDso mYA61VB6fJBz171d2s9IfSuIIwHVOyJXknuQcE6vtcvD+5JpvM7HCixBuXdQYkJ7QPI/ YAmZMhgmpSaf2dkmA2TDpGtnoJr9LQoXn2qR8RkjKUX46Rr80T2AzXMnxMJaOcigm0qY 3pkIlTiDVJi63ciayvhR2M8ls4H+ksV9fPoa4EdsdfQl4N292DHoHc+Kmc2d0mWBKV1f aRTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=OSKXgJM0pUuX9cPVDw4ezidlFU6NJpjlspMMLMCu8Ao=; b=IKFf9VpBiQfBEcmNkSb2J4fgGazSDy0MqVDV3PRPvjQiPXz7HWRKn+r9QMG3uQz0Xs UhAxMTv2PbD36s9tvcAf9+qV68fl9EbotyaSv138r/16CTDS1RzCkuZKd2/O4ZOO68SH hZvj+ZzahtF9aIx+2BXIvCdUbqraEf8TRXZ6g++XHtlcFXW/wtPaSi0P1j74IjR4yjJ8 WeJwHQkcY5/qYZlpA5p6B2s6d/XzeRRIL2d/ZWLgUgXENob+4WiykIXxjD2L2O2243GI qor7VPj1oJWI1UoJQWGddWzThX16yxv/jajAVf6Q/5TLq87L1JgTifDiYEU9UQpqRCVK Jm2Q== X-Gm-Message-State: ANhLgQ1S2K/9szEku3pWqUixdqmb0249SxDpeNrhvFG/dzHbEffh2ewq ws92ADcQKnCD2uOhWVhpN6ZExRag X-Google-Smtp-Source: ADFU+vtgpgZ6YYy2duIc3VU0CBcLlzn1LRQ6iOauJCOQQxPiVY+pHlPgxXMniBiHjVC2Blng3USURg== X-Received: by 2002:a17:90a:5805:: with SMTP id h5mr13692445pji.175.1585540593983; Sun, 29 Mar 2020 20:56:33 -0700 (PDT) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id n100sm8902514pjc.38.2020.03.29.20.56.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Mar 2020 20:56:33 -0700 (PDT) From: Kever Yang To: u-boot@lists.denx.de Cc: chenjh@rock-chips.com, rasmus.villemoes@prevas.dk, trini@konsulko.com, xypron.glpk@gmx.de, punit1.agrawal@toshiba.co.jp, Kever Yang Subject: [PATCH v4 2/8] tool: aisimage: use ALIGN instead of self defiend macro Date: Mon, 30 Mar 2020 11:56:18 +0800 Message-Id: <20200330035625.25164-2-kever.yang@rock-chips.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200330035625.25164-1-kever.yang@rock-chips.com> References: <20200330035625.25164-1-kever.yang@rock-chips.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean The ALIGN() is available at imagetool.h, no need to self define one. Signed-off-by: Kever Yang Reviewed-by: Punit Agrawal Reviewed-by: Tom Rini --- Changes in v4: None 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);