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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 73027C61DA3 for ; Tue, 21 Feb 2023 20:25:37 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 86C5C85A81; Tue, 21 Feb 2023 21:23:13 +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="DgCr0orz"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8FC2885B26; Tue, 21 Feb 2023 21:22:45 +0100 (CET) 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 1BD4885A6B for ; Tue, 21 Feb 2023 21:22:32 +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 944BBB810C2; Tue, 21 Feb 2023 20:22:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1B56DC4339C; Tue, 21 Feb 2023 20:22:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677010950; bh=XhdMb9fJ2HKZzt54mxFXPrhUlCXCMYcTFOhQP5zYh5g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DgCr0orzPDALE5XUQv+CCSOlBbXnJRIhzlrEPdaYsKyWWs7F05Q0RsdWRziTnMrx7 16HbG1i+YkFswYTev4davFu9jJtkW0fXCdrErDfOQC9XOLySK1yga9aBeawLMeFns3 I+uwdcuGH45iqJxxJbRRm0GTszyi8CJbLQ9Wb9ivvdZDwul6fcdTeNVIFduO/1ghTn Xdd1V8xACZfdlE9zZ65MLrDmv2lFNhfSLYtOhuRptjjuTLTcDllbH1iLwXwahYA7dS z/XdPqFkFBEdX2IhLXuDxQOxWO+AyoUhHuZtEEi1K20DuMYkAhVf8V2K7HGxFvKDkW pRWAsh7K6nYPA== Received: by pali.im (Postfix) id CE6F79FC; Tue, 21 Feb 2023 21:22:27 +0100 (CET) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: u-boot@lists.denx.de Cc: Stefan Roese , Tony Dinh , Josua Mayer Subject: [PATCH RFC u-boot-mvebu 02/59] tools: kwboot: Fix parsing SDIO kwbimage Date: Tue, 21 Feb 2023 21:18:28 +0100 Message-Id: <20230221201925.9644-3-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 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.6 at phobos.denx.de X-Virus-Status: Clean Despite the official specification, Marvell BootROM does not interpret srcaddr from SDIO image as offset in number of sectors (like for SATA image), but as offset in bytes (like for all other images except SATA). To parse SDIO kwbimage in the same way as Marvell BootROM, it is needed to interpret srcaddr in bytes. This change fixes loading of SDIO images via kwboot over UART. Fixes: 792e42355083 ("tools: kwboot: Patch source address in image header") Signed-off-by: Pali Rohár --- tools/kwboot.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/kwboot.c b/tools/kwboot.c index da4fe32da226..188f944263fa 100644 --- a/tools/kwboot.c +++ b/tools/kwboot.c @@ -1894,10 +1894,6 @@ kwboot_img_patch(void *img, size_t *size, int baudrate) hdr->srcaddr = cpu_to_le32((srcaddr - 1) * 512); break; - case IBR_HDR_SDIO_ID: - hdr->srcaddr = cpu_to_le32(srcaddr * 512); - break; - case IBR_HDR_PEX_ID: if (srcaddr == 0xFFFFFFFF) hdr->srcaddr = cpu_to_le32(hdrsz); -- 2.20.1