MLK-19250 imx: uuu: Decouple mmc_get_env_dev with CONFIG_ENV_IS_IN_MMC

For flash devices, like spi nor, weim nor and qspi/flexspi,
we don't define the ENV in MMC, but UUU fastboot always use the
mmc_get_env_dev. So we have to decouple the function with
CONFIG_ENV_IS_IN_MMC

Signed-off-by: Ye Li <[email protected]>
(cherry picked from commit ef48064)
(cherry picked from commit 368e256)
(cherry picked from commit 34ddce8)
(cherry picked from commit 80913e7f20b4761875c3108609d510879bc710ef)

Author: Ye Li

arch/arm/mach-imx/Makefile

@@ -13,7 +13,7 @@ ifeq ($(SOC),$(filter $(SOC),imx8m))
 ifneq ($(CONFIG_SPL_BUILD),y)
 obj-$(CONFIG_IMX_BOOTAUX) += imx_bootaux.o
 endif
-obj-$(CONFIG_ENV_IS_IN_MMC) += mmc_env.o
+obj-y += mmc_env.o
 obj-$(CONFIG_FEC_MXC) += mac.o
 obj-$(CONFIG_DWC_ETH_QOS) += mac.o
 obj-$(CONFIG_SYS_I2C_MXC) += i2c-mxv7.o
@@ -37,7 +37,7 @@ endif
 ifeq ($(SOC),$(filter $(SOC),mx7))
 obj-y	+= cpu.o
 obj-$(CONFIG_SYS_I2C_MXC) += i2c-mxv7.o
-obj-$(CONFIG_ENV_IS_IN_MMC) += mmc_env.o
+obj-y += mmc_env.o
 endif
 ifeq ($(SOC),$(filter $(SOC),mx7 imx8m))
 ifneq ($(CONFIG_SPL_BUILD),y)

arch/arm/mach-imx/imx8/cpu.c

@@ -437,7 +437,6 @@ void get_board_serial(struct tag_serialnr *serialnr)
 }
 #endif /*CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG*/
 
-#ifdef CONFIG_ENV_IS_IN_MMC
 __weak int board_mmc_get_env_dev(int devno)
 {
 	return devno;
@@ -467,7 +466,6 @@ int mmc_get_env_dev(void)
 
 	return board_mmc_get_env_dev(devno);
 }
-#endif
 
 #define MEMSTART_ALIGNMENT  SZ_2M /* Align the memory start with 2MB */
 

arch/arm/mach-imx/mx6/soc.c

@@ -632,7 +632,10 @@ int arch_cpu_init(void)
 	return 0;
 }
 
-#ifdef CONFIG_ENV_IS_IN_MMC
+#ifndef CONFIG_SYS_MMC_ENV_DEV
+#define CONFIG_SYS_MMC_ENV_DEV -1
+#endif
+
 __weak int board_mmc_get_env_dev(int devno)
 {
 	return devno;
@@ -690,7 +693,6 @@ uint mmc_get_env_part(struct mmc *mmc)
 	return board_mmc_get_env_part(devno);
 }
 #endif
-#endif
 
 int board_postclk_init(void)
 {

env/Kconfig

@@ -656,7 +656,7 @@ config SYS_RELOC_GD_ENV_ADDR
 config SYS_MMC_ENV_DEV
 	int "mmc device number"
 	depends on ENV_IS_IN_MMC || ENV_IS_IN_FAT || \
-		CMD_MVEBU_BUBT || FMAN_ENET || QE || PHY_CORTINA
+		CMD_MVEBU_BUBT || FMAN_ENET || QE || PHY_CORTINA || FSL_FASTBOOT
 	default 0
 	help
 	  MMC device number on the platform where the environment is stored.