MLK-21852 imx: Update runtime SD/MMC boot env device and env variables

Since we enabled MMC alias, the USDHC index in u-boot is the usdhc port.
So we don't need to convert them for kernel and u-boot env device.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 8fd6e14f5c1598684bc08a7917f89cd94e988d8f)
(cherry picked from commit 96bc8f724159a3a9e2ba9f605b84f53534bc3e1f)
(cherry picked from commit 83a2f62405d0aa3b1fe7140e320a1b297d6b4883)
(cherry picked from commit 733b8ad42e057bd025cd97a570ecbcb2ebc4191c)

diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c
index 02db322..2a6e827 100644 (file)
--- a/arch/arm/mach-imx/imx8/cpu.c
+++ b/arch/arm/mach-imx/imx8/cpu.c
@@ -206,7 +206,7 @@ void get_board_serial(struct tag_serialnr *serialnr)
 #ifdef CONFIG_ENV_IS_IN_MMC
 __weak int board_mmc_get_env_dev(int devno)
 {
-       return CONFIG_SYS_MMC_ENV_DEV;
+       return devno;
 }
 
 int mmc_get_env_dev(void)

diff --git a/arch/arm/mach-imx/mmc_env.c b/arch/arm/mach-imx/mmc_env.c
index 9c822f7..9c1d3cd 100644 (file)
--- a/arch/arm/mach-imx/mmc_env.c
+++ b/arch/arm/mach-imx/mmc_env.c
@@ -11,7 +11,7 @@
 
 __weak int board_mmc_get_env_dev(int devno)
 {
-       return CONFIG_SYS_MMC_ENV_DEV;
+       return devno;
 }
 
 int mmc_get_env_dev(void)

diff --git a/arch/arm/mach-imx/mx6/soc.c b/arch/arm/mach-imx/mx6/soc.c
index 52692f0..7e28a55 100644 (file)
--- a/arch/arm/mach-imx/mx6/soc.c
+++ b/arch/arm/mach-imx/mx6/soc.c
@@ -661,7 +661,7 @@ int arch_cpu_init(void)
 #ifdef CONFIG_ENV_IS_IN_MMC
 __weak int board_mmc_get_env_dev(int devno)
 {
-       return CONFIG_SYS_MMC_ENV_DEV;
+       return devno;
 }
 
 static int mmc_get_boot_dev(void)

diff --git a/arch/arm/mach-imx/mx7ulp/soc.c b/arch/arm/mach-imx/mx7ulp/soc.c
index 0ca34fe..253d8f2 100644 (file)
--- a/arch/arm/mach-imx/mx7ulp/soc.c
+++ b/arch/arm/mach-imx/mx7ulp/soc.c
@@ -393,7 +393,7 @@ void arch_preboot_os(void)
 #ifdef CONFIG_ENV_IS_IN_MMC
 __weak int board_mmc_get_env_dev(int devno)
 {
-       return CONFIG_SYS_MMC_ENV_DEV;
+       return devno;
 }
 
 int mmc_get_env_dev(void)

diff --git a/board/freescale/imx8mm_evk/imx8mm_evk.c b/board/freescale/imx8mm_evk/imx8mm_evk.c
index 4148783..63051ac 100644 (file)
--- a/board/freescale/imx8mm_evk/imx8mm_evk.c
+++ b/board/freescale/imx8mm_evk/imx8mm_evk.c
@@ -307,6 +307,10 @@ int board_init(void)
 
 int board_late_init(void)
 {
+#ifdef CONFIG_ENV_IS_IN_MMC
+       board_late_mmc_env_init();
+#endif
+
 #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
        env_set("board_name", "EVK");
        env_set("board_rev", "iMX8MM");

diff --git a/board/freescale/imx8mq_evk/imx8mq_evk.c b/board/freescale/imx8mq_evk/imx8mq_evk.c
index 3ceae61..94a73a3 100644 (file)
--- a/board/freescale/imx8mq_evk/imx8mq_evk.c
+++ b/board/freescale/imx8mq_evk/imx8mq_evk.c
@@ -262,11 +262,6 @@ int board_init(void)
        return 0;
 }
 
-int board_mmc_get_env_dev(int devno)
-{
-       return devno;
-}
-
 int board_late_init(void)
 {
 #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
@@ -274,5 +269,9 @@ int board_late_init(void)
        env_set("board_rev", "iMX8MQ");
 #endif
 
+#ifdef CONFIG_ENV_IS_IN_MMC
+       board_late_mmc_env_init();
+#endif
+
        return 0;
 }

diff --git a/board/freescale/imx8qm_mek/imx8qm_mek.c b/board/freescale/imx8qm_mek/imx8qm_mek.c
index c677220..d97aeac 100644 (file)
--- a/board/freescale/imx8qm_mek/imx8qm_mek.c
+++ b/board/freescale/imx8qm_mek/imx8qm_mek.c
@@ -117,11 +117,6 @@ int ft_board_setup(void *blob, struct bd_info *bd)
 }
 #endif
 
-int board_mmc_get_env_dev(int devno)
-{
-       return devno;
-}
-
 int board_late_init(void)
 {
        char *fdt_file;
@@ -142,5 +137,8 @@ int board_late_init(void)
                        env_set("fdt_file", "imx8qm-mek.dtb");
        }
 
+#ifdef CONFIG_ENV_IS_IN_MMC
+       board_late_mmc_env_init();
+#endif
        return 0;
 }

diff --git a/board/freescale/imx8qxp_mek/imx8qxp_mek.c b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
index 7179823..d79312a 100644 (file)
--- a/board/freescale/imx8qxp_mek/imx8qxp_mek.c
+++ b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
@@ -141,11 +141,6 @@ int ft_board_setup(void *blob, struct bd_info *bd)
 }
 #endif
 
-int board_mmc_get_env_dev(int devno)
-{
-       return devno;
-}
-
 int board_late_init(void)
 {
        char *fdt_file;
@@ -166,5 +161,9 @@ int board_late_init(void)
                        env_set("fdt_file", "imx8qxp-mek.dtb");
        }
 
+#ifdef CONFIG_ENV_IS_IN_MMC
+       board_late_mmc_env_init();
+#endif
+
        return 0;
 }

diff --git a/board/freescale/mx6sabreauto/mx6sabreauto.c b/board/freescale/mx6sabreauto/mx6sabreauto.c
index a57f1ca..fe5fa8a 100644 (file)
--- a/board/freescale/mx6sabreauto/mx6sabreauto.c
+++ b/board/freescale/mx6sabreauto/mx6sabreauto.c
@@ -926,6 +926,10 @@ int board_late_init(void)
                env_set("board_rev", "MX6DL");
 #endif
 
+#ifdef CONFIG_ENV_IS_IN_MMC
+       board_late_mmc_env_init();
+#endif
+
        return 0;
 }
 

diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c
index 5715d1b..bc0266d 100644 (file)
--- a/board/freescale/mx6sabresd/mx6sabresd.c
+++ b/board/freescale/mx6sabresd/mx6sabresd.c
@@ -1252,6 +1252,10 @@ int board_late_init(void)
                env_set("board_rev", "MX6DL");
 #endif
 
+#ifdef CONFIG_ENV_IS_IN_MMC
+       board_late_mmc_env_init();
+#endif
+
        return 0;
 }
 

diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c
index 4473059..b5e704e 100644 (file)
--- a/board/freescale/mx6slevk/mx6slevk.c
+++ b/board/freescale/mx6slevk/mx6slevk.c
@@ -195,11 +195,6 @@ static void setup_iomux_uart(void)
        imx_iomux_v3_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads));
 }
 
-int board_mmc_get_env_dev(int devno)
-{
-       return devno;
-}
-
 #ifdef CONFIG_SYS_I2C
 #define PC     MUX_PAD_CTRL(I2C_PAD_CTRL)
 /* I2C1 for PMIC */

diff --git a/board/freescale/mx7ulp_evk/mx7ulp_evk.c b/board/freescale/mx7ulp_evk/mx7ulp_evk.c
index 82a4bd8..8d82c04 100644 (file)
--- a/board/freescale/mx7ulp_evk/mx7ulp_evk.c
+++ b/board/freescale/mx7ulp_evk/mx7ulp_evk.c
@@ -139,11 +139,6 @@ add:
 }
 #endif
 
-int board_mmc_get_env_dev(int devno)
-{
-       return devno;
-}
-
 int board_late_init(void)
 {
        env_set("tee", "no");