| Message ID | 20230221201925.9644-46-pali@kernel.org |
|---|---|
| State | Accepted |
| Commit | 27670acaac82f370b635f1af103594a335322bcf |
| Delegated to: | Stefan Roese |
| Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=rHv7X8R7; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PLrYj4gzwz23j7 for <incoming@patchwork.ozlabs.org>; Wed, 22 Feb 2023 07:32:09 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AFCA085B37; Tue, 21 Feb 2023 21:24:23 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="rHv7X8R7"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B133785B23; Tue, 21 Feb 2023 21:23:47 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E393485B12 for <u-boot@lists.denx.de>; Tue, 21 Feb 2023 21:22:44 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=pali@kernel.org Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id DDF2AB810C6; Tue, 21 Feb 2023 20:22:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6DF86C4339B; Tue, 21 Feb 2023 20:22:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677010955; bh=PT4l4+FoTdylxdaox+KIk/b05fz52yB/7zNpvfFJ7yI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rHv7X8R7TtVUaqxSJQYkqnrnVG8tmisc5KE8mlhcjNRiLoQxKv23YLQpV6QjLJ2jJ GXrLk8spj80txe+IFbQbNgoJFU2R4JzwWm82VbXZdA5cAfCa0F3HFa/zJR402IM7A4 5r4pGAHQ9uiwH9S+XfJU9LmVKkN3jf0FQY0kKneietbNGpBZFWERl4CLzZYLlhZKWj aEzgGfFhBE5PnwSYg/SC/b7/tokZXX3NAztzCO1MzAtXbrmz9OAZksl0lgClJ25MT4 WhXGBMgzl5zHcDzqlATzEHyYRvTdNyijedSHPo0RCnNzyTdFmo4l94Z7OSntawn6QN +WYUSvIWwNhdA== Received: by pali.im (Postfix) id 29EB1A8C; Tue, 21 Feb 2023 21:22:35 +0100 (CET) From: =?utf-8?q?Pali_Roh=C3=A1r?= <pali@kernel.org> To: u-boot@lists.denx.de Cc: Stefan Roese <sr@denx.de>, Tony Dinh <mibodhi@gmail.com>, Josua Mayer <josua@solid-run.com> Subject: [PATCH RFC u-boot-mvebu 45/59] tools: mkimage: Do not fill legacy_img_hdr for non-legacy XIP images Date: Tue, 21 Feb 2023 21:19:11 +0100 Message-Id: <20230221201925.9644-46-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230221201925.9644-1-pali@kernel.org> References: <20230221201925.9644-1-pali@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean |
| Series |
arm: mvebu: Various fixes
|
expand
|
diff --git a/tools/mkimage.c b/tools/mkimage.c index 30c6df77081f..955a1f39a419 100644 --- a/tools/mkimage.c +++ b/tools/mkimage.c @@ -842,7 +842,9 @@ copy_file (int ifd, const char *datafile, int pad) exit (EXIT_FAILURE); } - if (params.xflag) { + if (params.xflag && + (((params.type > IH_TYPE_INVALID) && (params.type < IH_TYPE_FLATDT)) || + (params.type == IH_TYPE_KERNEL_NOLOAD) || (params.type == IH_TYPE_FIRMWARE_IVT))) { unsigned char *p = NULL; /* * XIP: do not append the struct legacy_img_hdr at the
Skip filling legacy_img_hdr structure for XIP images which do not use legacy_img_hdr structure header. Adding unwanted header to other image formats, like kwbimage cause generation of broken image. Signed-off-by: Pali Rohár <pali@kernel.org> --- tools/mkimage.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)