From 6c2fe5b60692e7d0e86383c44792e5f2938bfa14 Mon Sep 17 00:00:00 2001 From: Ye Li Date: Fri, 17 Mar 2017 16:23:46 +0800 Subject: MLK-14445-8 mx7ulp_evk: Add dynamical MMC device detection Add board_late_mmc_env_init to support MMC device detection for environment variables. Signed-off-by: Ye Li --- board/freescale/mx7ulp_evk/mx7ulp_evk.c | 14 ++++++++++++++ configs/mx7ulp_evk_defconfig | 2 ++ configs/mx7ulp_evk_plugin_defconfig | 2 ++ include/configs/mx7ulp_evk.h | 2 -- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/board/freescale/mx7ulp_evk/mx7ulp_evk.c b/board/freescale/mx7ulp_evk/mx7ulp_evk.c index 4fd4e6d..eea41fb 100644 --- a/board/freescale/mx7ulp_evk/mx7ulp_evk.c +++ b/board/freescale/mx7ulp_evk/mx7ulp_evk.c @@ -190,3 +190,17 @@ int board_init(void) return 0; } + +int board_mmc_get_env_dev(int devno) +{ + return devno; +} + +int board_late_init(void) +{ +#ifdef CONFIG_ENV_IS_IN_MMC + board_late_mmc_env_init(); +#endif + + return 0; +} diff --git a/configs/mx7ulp_evk_defconfig b/configs/mx7ulp_evk_defconfig index 2f8f5ca..8e81ab8 100644 --- a/configs/mx7ulp_evk_defconfig +++ b/configs/mx7ulp_evk_defconfig @@ -3,6 +3,8 @@ CONFIG_ARCH_MX7ULP=y CONFIG_TARGET_MX7ULP_EVK=y CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-evk-qspi" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7ulp_evk/imximage.cfg" +CONFIG_BOARD_LATE_INIT=y +CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_I2C=y CONFIG_CMD_PING=y diff --git a/configs/mx7ulp_evk_plugin_defconfig b/configs/mx7ulp_evk_plugin_defconfig index 1a7bebf..34d6f93 100644 --- a/configs/mx7ulp_evk_plugin_defconfig +++ b/configs/mx7ulp_evk_plugin_defconfig @@ -4,6 +4,8 @@ CONFIG_TARGET_MX7ULP_EVK=y CONFIG_USE_IMXIMG_PLUGIN=y CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-evk-qspi" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7ulp_evk/imximage.cfg" +CONFIG_BOARD_LATE_INIT=y +CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_I2C=y CONFIG_CMD_PING=y diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h index 4f7f6fb..0bdeeed 100644 --- a/include/configs/mx7ulp_evk.h +++ b/include/configs/mx7ulp_evk.h @@ -62,8 +62,6 @@ /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (8 * SZ_1M) -#define CONFIG_BOARD_EARLY_INIT_F - /* UART */ #define LPUART_BASE LPUART4_RBASE -- cgit v1.1