From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1CAA3C07E9E for ; Thu, 8 Jul 2021 17:33:22 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 951E361920 for ; Thu, 8 Jul 2021 17:33:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 951E361920 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nic.cz Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3662383211; Thu, 8 Jul 2021 19:31:22 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nic.cz Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=nic.cz header.i=@nic.cz header.b="b96NjWWl"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0452583258; Thu, 8 Jul 2021 19:31:15 +0200 (CEST) Received: from mail.nic.cz (lists.nic.cz [217.31.204.67]) (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 C68E68320D for ; Thu, 8 Jul 2021 19:30:41 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nic.cz Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.behun@nic.cz Received: from dellmb.labs.office.nic.cz (unknown [IPv6:2001:1488:fffe:6:8747:7254:5571:3010]) by mail.nic.cz (Postfix) with ESMTPSA id 6428C142BD9; Thu, 8 Jul 2021 19:30:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nic.cz; s=default; t=1625765441; bh=/Cpvb8o+Y+1hbuyzibLSootWVQ9Iq9yEY273kl7QXCo=; h=From:To:Date; b=b96NjWWlr4F1Bh9icAPZ4hCyI9+qrEo6b0KKt2oMssmRO7TTi80EzAKnWeTZBFFwD u9lm3xMSIFyrCxFJsts+Lq7vbwNtcA//HrT1YCOlWlBWDEhnmUVqrFzOZGNQqx8wom oeq39dDBTdIjlOcTQR0NrpgE44GZgBdtV0236rk4= From: =?UTF-8?q?Marek=20Beh=C3=BAn?= To: u-boot@lists.denx.de, Chris Packham , Stefan Roese , Baruch Siach , Dirk Eibach , Chris Packham Cc: Dennis Gilmore , Mario Six , Jon Nettleton , =?UTF-8?q?Pali=20Roh=C3=A1r?= , =?UTF-8?q?Marek=20Beh=C3=BAn?= Subject: [PATCH u-boot-mvebu 25/31] tools: kwbimage: Remove v1 kwbimage SPL padding to CONFIG_SYS_U_BOOT_OFFS bytes Date: Thu, 8 Jul 2021 19:30:26 +0200 Message-Id: <20210708173032.27999-26-marek.behun@nic.cz> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210708173032.27999-1-marek.behun@nic.cz> References: <20210708173032.27999-1-marek.behun@nic.cz> 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.34 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.103.2 at phobos.denx.de X-Virus-Status: Clean From: Pali Rohár This padding depends on board config file and therere it makes the mkimage binary tool board specific, which is not correct. One cannot use mkimage tool built as a result for board A to generate images for board B, even if both A and B are on the same platform. This CONFIG_SYS_U_BOOT_OFFS padding was needed when v1 kwbimage contained SPL code which loaded main U-Boot binary itself, insted of letting BootROM do it. Now that SPL code does not load main U-Boot itself and leaves this job to BootROM, there is no need for this padding anymore. BootROM correctly locates the second part (main U-Boot binary) in v1 kwbimage, loads it at correct address as specified in v1 kwbimage header and also jumps to correct execution address. Therefore this CONFIG_SYS_U_BOOT_OFFS padding is not needed anymore. By removing it we also reduce the size of SPL code and therefore also decrease the final size of v1 kwbimage. This means there is more space for main U-Boot binary. Signed-off-by: Pali Rohár Reviewed-by: Marek Behún --- tools/kwbimage.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/tools/kwbimage.c b/tools/kwbimage.c index acd57267f4..656f3f9ae9 100644 --- a/tools/kwbimage.c +++ b/tools/kwbimage.c @@ -998,19 +998,6 @@ static size_t image_headersz_v1(int *hasext) } #endif -#if defined(CONFIG_SYS_U_BOOT_OFFS) - if (headersz > CONFIG_SYS_U_BOOT_OFFS) { - fprintf(stderr, - "Error: Image header (incl. SPL image) too big!\n"); - fprintf(stderr, "header=0x%x CONFIG_SYS_U_BOOT_OFFS=0x%x!\n", - (int)headersz, CONFIG_SYS_U_BOOT_OFFS); - fprintf(stderr, "Increase CONFIG_SYS_U_BOOT_OFFS!\n"); - return 0; - } - - headersz = CONFIG_SYS_U_BOOT_OFFS; -#endif - /* * The payload should be aligned on some reasonable * boundary -- 2.31.1