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 18733C433F5 for ; Mon, 11 Apr 2022 19:47:40 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3C0DE83E96; Mon, 11 Apr 2022 21:46:40 +0200 (CEST) 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=1649706400; bh=1r9zZjDKagbcXoklnH3sU9ch2MQuuBW5F3VKVQTbXTc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=Pj/qcNjqchUesDjMyFAD+fFu61hEqTJ5v0+5d+LbGVF0W40ItdAAbg8zxp0qzL4SP eUxzKuzrCbKPrYU0vh6BuzILDevarrZBVmnFYTiJyEBMU8m89R0cxwHAqvT0bN+H2P TqWQlHFuwI5QDhQyMxnsLyVWwGEEXAXiY9qRaZ5eQy8wxiQAAYCW8/iBYLBtx6Zrsk 68WRyRUvG/Z+2g318UOLboJf9DEq2W2ja7jkx3B/+frPBWSCN7pRHM6erXZtk7KlaF djLzNfHDcmOQ09zTkJc7G89WiX7vputMWWi+a7iVwpPHlNZjfgyW6/drPKjQ9aBY7z KPzPoqdS0hOKQ== Received: from tr.lan (ip-86-49-12-201.net.upcbroadband.cz [86.49.12.201]) (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 B32B583DEF; Mon, 11 Apr 2022 21:46:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1649706375; bh=1r9zZjDKagbcXoklnH3sU9ch2MQuuBW5F3VKVQTbXTc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XT1iNL18VjwnE2ak73Il1KkAYYXaXdghy6TiNKdnyDabEoeyuDlNXZ0+L4srvQbBl F/kwDv7UZdupv4eEopqyBxsy0SgqTbgUq3aLFUoaJkz/kjKqlsBEupmt8tLfAmtf0G A3wbitmuc/ZWY03qIHhr9q3yawX0xNpanGZNQ4iyDNBjkgsT6nfxd1ik+F4UlNnR8i K4zs0VmrNyuUziygA/x6cQNAuX1E6XvomounE645O6n2YnKZjhmrbVOJkanNtSDUdh fAu/HIhk+ly0tsBYT/yN1el4GQougeG0GSuqAIit5b/MtVVA8Pjx45Hzl9ca6LfYxJ SfmrIOyzojUZA== From: Marek Vasut To: u-boot@lists.denx.de Cc: Marek Vasut , Fabio Estevam , Peng Fan , Stefano Babic Subject: [PATCH v2 10/23] ARM: imx: Decode ECSPI env location from i.MX8M ROMAPI tables Date: Mon, 11 Apr 2022 21:45:30 +0200 Message-Id: <20220411194543.730647-10-marex@denx.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220411194543.730647-1-marex@denx.de> References: <20220411194543.730647-1-marex@denx.de> 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 Decode ECSPI boot device in env_get_location() from i.MX8M ROMAPI tables. This is necessary to correctly identify env is in SPI NOR when the system boots from SPI NOR attached to ECSPI. Reviewed-by: Fabio Estevam Signed-off-by: Marek Vasut Cc: Fabio Estevam Cc: Peng Fan Cc: Stefano Babic --- V2: Add RB by Fabio --- arch/arm/include/asm/mach-imx/sys_proto.h | 1 + arch/arm/mach-imx/imx8m/soc.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/arch/arm/include/asm/mach-imx/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h index 0c0c7814fb2..309f8d17959 100644 --- a/arch/arm/include/asm/mach-imx/sys_proto.h +++ b/arch/arm/include/asm/mach-imx/sys_proto.h @@ -159,6 +159,7 @@ enum boot_dev_type_e { BT_DEV_TYPE_MMC = 2, BT_DEV_TYPE_NAND = 3, BT_DEV_TYPE_FLEXSPINOR = 4, + BT_DEV_TYPE_SPI_NOR = 6, BT_DEV_TYPE_USB = 0xE, BT_DEV_TYPE_MEM_DEV = 0xF, diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index 7397b99a1ee..8e972d9b0cb 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -599,6 +599,9 @@ enum boot_device get_boot_device(void) case BT_DEV_TYPE_FLEXSPINOR: boot_dev = QSPI_BOOT; break; + case BT_DEV_TYPE_SPI_NOR: + boot_dev = SPI_NOR_BOOT; + break; case BT_DEV_TYPE_USB: boot_dev = USB_BOOT; break; @@ -1337,6 +1340,7 @@ enum env_location env_get_location(enum env_operation op, int prio) switch (dev) { case QSPI_BOOT: + case SPI_NOR_BOOT: if (IS_ENABLED(CONFIG_ENV_IS_IN_SPI_FLASH)) return ENVL_SPI_FLASH; return ENVL_NOWHERE; -- 2.35.1