[Uboot-stm32] [PATCH 1/3] stm32mp1: board: add support of CONFIG_ENV_IS_IN_MMC

[Patrice CHOTARD]

Hi

On 3/19/20 11:21 AM, Patrick Delaunay wrote:
> Add support of CONFIG_ENV_IS_IN_MMC in env_get_location, used for
> all mmc device (SD card and eMMC).
> The 2 configs CONFIG_ENV_IS_IN_MMC and CONFIG_ENV_IS_IN_EXT4 are
> incompatible.
>
> Add the weak function mmc_get_env_dev to select the mmc boot instance.
>
> Signed-off-by: Patrick Delaunay <patrick.delaunay at st.com>
> ---
>
>  board/st/stm32mp1/stm32mp1.c | 14 ++++++++++++++
>  1 file changed, 14 insertions(+)
>
> diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
> index c36e7655c0..effba41ad1 100644
> --- a/board/st/stm32mp1/stm32mp1.c
> +++ b/board/st/stm32mp1/stm32mp1.c
> @@ -785,6 +785,11 @@ enum env_location env_get_location(enum env_operation op, int prio)
>  		return ENVL_UNKNOWN;
>  
>  	switch (bootmode & TAMP_BOOT_DEVICE_MASK) {
> +#ifdef CONFIG_ENV_IS_IN_MMC
> +	case BOOT_FLASH_SD:
> +	case BOOT_FLASH_EMMC:
> +		return ENVL_MMC;
> +#endif
>  #ifdef CONFIG_ENV_IS_IN_EXT4
>  	case BOOT_FLASH_SD:
>  	case BOOT_FLASH_EMMC:
> @@ -826,6 +831,15 @@ const char *env_ext4_get_dev_part(void)
>  }
>  #endif
>  
> +#if defined(CONFIG_ENV_IS_IN_MMC)
> +int mmc_get_env_dev(void)
> +{
> +	u32 bootmode = get_bootmode();
> +
> +	return (bootmode & TAMP_BOOT_INSTANCE_MASK) - 1;
> +}
> +#endif
> +
>  #ifdef CONFIG_SYS_MTDPARTS_RUNTIME
>  
>  #define MTDPARTS_LEN		256

Reviewed-by: Patrice Chotard <patrice.chotard at st.com>

Thanks

Patrice