ARM: imx: Decode ECSPI env location from i.MX8M ROMAPI tables

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 <marex@denx.de>
Cc: Fabio Estevam <festevam@denx.de>
Cc: Peng Fan <peng.fan@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
Reviewed-by: Fabio Estevam <festevam@denx.de>

diff --git a/arch/arm/include/asm/mach-imx/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h
index 0c0c7814fb21f4101ceb4b661be17bc2981a35e6..309f8d179594fbe3155fecb948dae16c555ee474 100644 (file)
--- 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 4baeea6527a191e366d49f4fb6c0586f4d5ff69a..805e1a6fb7e847b751bec2aca410a4c219495957 100644 (file)
--- a/arch/arm/mach-imx/imx8m/soc.c
+++ b/arch/arm/mach-imx/imx8m/soc.c
@@ -600,6 +600,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;
@@ -1346,6 +1349,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;