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 D17E9C433EF for ; Fri, 25 Mar 2022 17:59:38 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 32C1A83970; Fri, 25 Mar 2022 18:59:36 +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=1648231176; bh=evUoTu12N9011l8+FjNZxk/+/8x8J5A8IQN6oUC7Vf4=; h=From:To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=fwcTms6C0YSv5fbqJWHqlVgVRmg55U9nj/YDE7z4N1GqQB923R/M1Wsr7MfdXg8l3 uAyhuSVZQNpiPaUkJxh+Rj17Ggd3FY9A11jlhbHOeD8mykPABFSLEJI46xop3T8//3 fM/zp/EFZaYxGTZDYetRAgfnliiugGpS8j8esHXgB5NeLnzsGftZU2AEYFpHNbPPG+ ve3OpsWE6UNuDmaTpOfNUlbMpOCziAQl3g1PPGt4qGJZDkyeYDHy4+KiZPjWyxsu3M 0b3C9/9c2AYfLb4ZULlV4/9VC60BjkztvKK2mCxIw3MY0C4ERBwNK1jlkEMlarfPUb 2lBn2k2fjCUOA== 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 0C00B83940; Fri, 25 Mar 2022 18:59:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1648231174; bh=evUoTu12N9011l8+FjNZxk/+/8x8J5A8IQN6oUC7Vf4=; h=From:To:Cc:Subject:Date:From; b=cH/EwMUGWGqnPc6CqwDCxZqAYHAoEOY85JYW0FSQAXV/mzEuVx3nC5Vg1LLOKaF8M 45M5nEbIhYPYBYl040GHxUDm9LPfcaN9EzvKvqal7/q+CRIiOqhHhtAaWT2tu6Z9a9 eMixOr+dIQ7vLAIJFxbMKkKf5+yRM0VEe5sEEKggG6Wvo+y8jjU3tdW+afrkU9Q5z1 MJ2P6Li2Pjy44fnbg70sWmJbeH5b6hf+uY2tCVr8kLeGhiMWK/0UjloKdeJCgBRuMR Kivg+6MKIOT/i8TaWJ0tbRu+fQM2fseCZcGXTvwz3pG0DgntN1nusMLmTSpPJxTycs C4GZ6Rn938DHQ== From: Marek Vasut To: u-boot@lists.denx.de Cc: Marek Vasut , Fabio Estevam , Peng Fan , Stefano Babic Subject: [PATCH] ARM: imx: Decode ECSPI env location from i.MX8M ROMAPI tables Date: Fri, 25 Mar 2022 18:59:28 +0100 Message-Id: <20220325175928.70125-1-marex@denx.de> X-Mailer: git-send-email 2.35.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 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. Signed-off-by: Marek Vasut Cc: Fabio Estevam Cc: Peng Fan Cc: Stefano Babic --- 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 1a5a391443d..ccbbe545810 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -597,6 +597,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; @@ -1335,6 +1338,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