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 B9BF1C433EF for ; Wed, 9 Mar 2022 16:10:04 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DB53383986; Wed, 9 Mar 2022 17:10:00 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1646842201; bh=Bwig/f0UAV3NxHeNNxd7ldg6tDQmZrG00Bk44iT9vwE=; h=From:To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=s9LCzEn+oi1ZvQpupg/jdhCWqxEVRw6qoqu0mPkh1dkI/AUHZ/enui38RwLyGdXk7 SyvvLvzmyWXq5q1vX5PuOlyuwuedxni6zewwuobC5pYeFshfeEcopd4vCeH70Wsi2I +sNywnX0raSvUlwBtc82/gLRvJK8DSmcl78tjdSwXAHkeG48dXtBy0E1Y1ppBz7KYR AWP+JJ3AsnwND1IDK9baYCMNvtXIBO++ffiKBfbLXuEVT48iML7IPhLINRxIFsMKES er0s72+VBqgayGEbaNwhkmk5dt5pqDu21UrXNGBsjHOW8jlRcgxOouZ7PrwfNH+kiA cQA/Xm4G3K76Q== Received: from tr.lan (ip-89-176-112-137.net.upcbroadband.cz [89.176.112.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 8726683982; Wed, 9 Mar 2022 17:09:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1646842198; bh=Bwig/f0UAV3NxHeNNxd7ldg6tDQmZrG00Bk44iT9vwE=; h=From:To:Cc:Subject:Date:From; b=gZVYOhJI8SF3y8FxNJPITPnQwkOfMdnzO+oQNnEZzwkPdFt2NxVtXNeWW5rAZ/m9p +dOcC7gwOswq6Z/Q0eECe1aPvnXHu3YKP+T7pHlt48pYeDl9m+GDXy1i+dba3cw5tH 4a4wLn4JRZoGyBIWLcif0d9GHKn+I64wM0iAyQUelKrWSRnSaSj4kDb1AjfvjTItQE 6WohJUfb62+S9j00ejhT4VCGHFDAsTRXRBNQTpAaqpyA1qmiewl5ldLKZqtjbh20Sl jhiTc7YFzR///OEhkZl2DdMhVnleL7YR5gfg+bfGDhJ70VjyZaxPHE1UXOZkf5X9+2 OQgnsVtU0PnKg== From: Marek Vasut To: u-boot@lists.denx.de Cc: Marek Vasut , Fabio Estevam , Peng Fan , Stefano Babic Subject: [PATCH] ARM: imx: romapi: Repair FlexSPI NOR boot offset Date: Wed, 9 Mar 2022 17:09:45 +0100 Message-Id: <20220309160945.214591-1-marex@denx.de> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 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.5 at phobos.denx.de X-Virus-Status: Clean The FlexSPI NOR boot offset does not require any special handling, the image_offset is correct in either case (0x1000 for FlexSPI NOR and 0x8000 for SD/eMMC) and the offset of u-boot.itb from the start of flash.bin is always 0x58000 on MX8MN/MX8MP, which matches the CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512 - 0x8000 in case CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300, which is always the case on MX8MN/MX8MP. The CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR is really overloaded in case of the MX8MN/MX8MP, but fixing that needs additional plumbing. Signed-off-by: Marek Vasut Cc: Fabio Estevam Cc: Peng Fan Cc: Stefano Babic --- arch/arm/mach-imx/spl_imx_romapi.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-imx/spl_imx_romapi.c b/arch/arm/mach-imx/spl_imx_romapi.c index d827de375a6..c47f5a6bdb4 100644 --- a/arch/arm/mach-imx/spl_imx_romapi.c +++ b/arch/arm/mach-imx/spl_imx_romapi.c @@ -38,14 +38,8 @@ ulong spl_romapi_raw_seekable_read(u32 offset, u32 size, void *buf) ulong __weak spl_romapi_get_uboot_base(u32 image_offset, u32 rom_bt_dev) { - u32 offset; - - if (((rom_bt_dev >> 16) & 0xff) == BT_DEV_TYPE_FLEXSPINOR) - offset = CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512; - else - offset = image_offset + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512 - 0x8000; - - return offset; + return image_offset + + (CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512 - 0x8000); } static int is_boot_from_stream_device(u32 boot) -- 2.34.1