[PATCH] ARM: imx: Reinstate decode ECSPI env location from i.MX8M ROMAPI tables

[PATCH] ARM: imx: Reinstate decode ECSPI env location from i.MX8M ROMAPI tables

[Marek Vasut]

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.

This reinstates change from commit:
e26d0152d61 ("ARM: imx: Decode ECSPI env location from i.MX8M ROMAPI tables")
which has been dropped in commit:
b0a284a7c94 ("imx: move get_boot_device to common file")

Fixes: b0a284a7c94 ("imx: move get_boot_device to common file")
Signed-off-by: Marek Vasut <marex@denx.de>
---
Cc: Fabio Estevam <festevam@denx.de>
Cc: Peng Fan <peng.fan@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
---
 arch/arm/mach-imx/romapi.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm/mach-imx/romapi.c b/arch/arm/mach-imx/romapi.c
index c8accdb04db..b49e7f80a28 100644
--- a/arch/arm/mach-imx/romapi.c
+++ b/arch/arm/mach-imx/romapi.c
@@ -66,6 +66,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 = boot_instance + USB_BOOT;
 		break;
-- 
2.35.1

Re: [PATCH] ARM: imx: Reinstate decode ECSPI env location from i.MX8M ROMAPI tables

[Fabio Estevam]

On 09/12/2022 22:29, Marek Vasut wrote:
> 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.
> 
> This reinstates change from commit:
> e26d0152d61 ("ARM: imx: Decode ECSPI env location from i.MX8M ROMAPI 
> tables")
> which has been dropped in commit:
> b0a284a7c94 ("imx: move get_boot_device to common file")
> 
> Fixes: b0a284a7c94 ("imx: move get_boot_device to common file")
> Signed-off-by: Marek Vasut <marex@denx.de>

Reviewed-by: Fabio Estevam <festevam@denx.de>

[PATCH] ARM: imx: Reinstate decode ECSPI env location from i.MX8M ROMAPI tables

[sbabic]

> 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.
> This reinstates change from commit:
> e26d0152d61 ("ARM: imx: Decode ECSPI env location from i.MX8M ROMAPI tables")
> which has been dropped in commit:
> b0a284a7c94 ("imx: move get_boot_device to common file")
> Fixes: b0a284a7c94 ("imx: move get_boot_device to common file")
> Signed-off-by: Marek Vasut <marex@denx.de>
> Reviewed-by: Fabio Estevam <festevam@denx.de>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,        Managing Director: Erika Unter  
HRB 165235 Munich,   Office: Kirchenstr.5, 82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de
=====================================================================