imx: spl: Fix typo BMODE_EMI -> BMODE_EIM

The interface for NOR/OneNAND is called "EIM" not "EMI".  Fix this.

Signed-off-by: Harald Seiler <hws@denx.de>
Reviewed-by: Fabio Estevam <festevam@gmail.com>

diff --git a/arch/arm/include/asm/mach-imx/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h
index 3f66d22..0c0c781 100644 (file)
--- a/arch/arm/include/asm/mach-imx/sys_proto.h
+++ b/arch/arm/include/asm/mach-imx/sys_proto.h
@@ -88,9 +88,9 @@ struct bd_info;
 #define IMX6_SRC_GPR10_PERSIST_SECONDARY_BOOT  BIT(30)
 
 #define IMX6_BMODE_MASK                        GENMASK(7, 0)
-#define        IMX6_BMODE_SHIFT                4
-#define IMX6_BMODE_EMI_MASK            BIT(3)
-#define IMX6_BMODE_EMI_SHIFT           3
+#define IMX6_BMODE_SHIFT               4
+#define IMX6_BMODE_EIM_MASK            BIT(3)
+#define IMX6_BMODE_EIM_SHIFT           3
 #define IMX6_BMODE_SERIAL_ROM_MASK     GENMASK(26, 24)
 #define IMX6_BMODE_SERIAL_ROM_SHIFT    24
 
@@ -105,13 +105,13 @@ enum imx6_bmode_serial_rom {
        IMX6_BMODE_I2C3,
 };
 
-enum imx6_bmode_emi {
+enum imx6_bmode_eim {
        IMX6_BMODE_NOR,
        IMX6_BMODE_ONENAND,
 };
 
 enum imx6_bmode {
-       IMX6_BMODE_EMI,
+       IMX6_BMODE_EIM,
 #if defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL)
        IMX6_BMODE_QSPI,
        IMX6_BMODE_RESERVED,

diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c
index 427b7f7..2832b73 100644 (file)
--- a/arch/arm/mach-imx/spl.c
+++ b/arch/arm/mach-imx/spl.c
@@ -57,9 +57,9 @@ u32 spl_boot_device(void)
        /* BOOT_CFG1[7:4] - see IMX6DQRM Table 8-8 */
        switch ((reg & IMX6_BMODE_MASK) >> IMX6_BMODE_SHIFT) {
         /* EIM: See 8.5.1, Table 8-9 */
-       case IMX6_BMODE_EMI:
+       case IMX6_BMODE_EIM:
                /* BOOT_CFG1[3]: NOR/OneNAND Selection */
-               switch ((reg & IMX6_BMODE_EMI_MASK) >> IMX6_BMODE_EMI_SHIFT) {
+               switch ((reg & IMX6_BMODE_EIM_MASK) >> IMX6_BMODE_EIM_SHIFT) {
                case IMX6_BMODE_ONENAND:
                        return BOOT_DEVICE_ONENAND;
                case IMX6_BMODE_NOR: