[PATCH] configs: khadas-vim3*_android: fix environment saving

[Neil Armstrong]

On 26/10/2023 15:41, Mattijs Korpershoek wrote:
> The environment is used to configure some additional boot features such as:
> * extra boot arguments
> * enable AVB (Android Verified Boot) verification
> 
> Right now, we cannot store it in eMMC:
> 
>    Loading Environment from nowhere... OK
> 
> Fix it by enabling the appropriate options in the defconfig
> 
> Fixes: b749d5ecdc06 ("configs: meson64_android: define raw parts for bootloader")
> Signed-off-by: Mattijs Korpershoek <mkorpershoek at baylibre.com>
> ---
>   configs/khadas-vim3_android_ab_defconfig  | 4 ++++
>   configs/khadas-vim3_android_defconfig     | 4 ++++
>   configs/khadas-vim3l_android_ab_defconfig | 4 ++++
>   configs/khadas-vim3l_android_defconfig    | 4 ++++
>   4 files changed, 16 insertions(+)
> 
> diff --git a/configs/khadas-vim3_android_ab_defconfig b/configs/khadas-vim3_android_ab_defconfig
> index ccd6f6f8a075..0abccb64ee15 100644
> --- a/configs/khadas-vim3_android_ab_defconfig
> +++ b/configs/khadas-vim3_android_ab_defconfig
> @@ -7,6 +7,7 @@ CONFIG_NR_DRAM_BANKS=1
>   CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
>   CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000
>   CONFIG_ENV_SIZE=0x10000
> +CONFIG_ENV_OFFSET=0x0
>   CONFIG_DM_GPIO=y
>   CONFIG_DEFAULT_DEVICE_TREE="meson-g12b-a311d-khadas-vim3"
>   CONFIG_OF_LIBFDT_OVERLAY=y
> @@ -45,7 +46,10 @@ CONFIG_CMD_AB_SELECT=y
>   CONFIG_CMD_REGULATOR=y
>   CONFIG_CMD_AVB=y
>   CONFIG_OF_CONTROL=y
> +CONFIG_ENV_IS_IN_MMC=y
>   CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> +CONFIG_SYS_MMC_ENV_DEV=2
> +CONFIG_SYS_MMC_ENV_PART=2
>   CONFIG_ADC=y
>   CONFIG_SARADC_MESON=y
>   CONFIG_BUTTON=y
> diff --git a/configs/khadas-vim3_android_defconfig b/configs/khadas-vim3_android_defconfig
> index 5c3d565971d6..33ede5262295 100644
> --- a/configs/khadas-vim3_android_defconfig
> +++ b/configs/khadas-vim3_android_defconfig
> @@ -7,6 +7,7 @@ CONFIG_NR_DRAM_BANKS=1
>   CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
>   CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000
>   CONFIG_ENV_SIZE=0x10000
> +CONFIG_ENV_OFFSET=0x0
>   CONFIG_DM_GPIO=y
>   CONFIG_DEFAULT_DEVICE_TREE="meson-g12b-a311d-khadas-vim3"
>   CONFIG_OF_LIBFDT_OVERLAY=y
> @@ -43,7 +44,10 @@ CONFIG_CMD_USB_MASS_STORAGE=y
>   CONFIG_CMD_REGULATOR=y
>   CONFIG_CMD_AVB=y
>   CONFIG_OF_CONTROL=y
> +CONFIG_ENV_IS_IN_MMC=y
>   CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> +CONFIG_SYS_MMC_ENV_DEV=2
> +CONFIG_SYS_MMC_ENV_PART=2
>   CONFIG_ADC=y
>   CONFIG_SARADC_MESON=y
>   CONFIG_BUTTON=y
> diff --git a/configs/khadas-vim3l_android_ab_defconfig b/configs/khadas-vim3l_android_ab_defconfig
> index 0d6de8001382..8f32f8e8ad5b 100644
> --- a/configs/khadas-vim3l_android_ab_defconfig
> +++ b/configs/khadas-vim3l_android_ab_defconfig
> @@ -7,6 +7,7 @@ CONFIG_NR_DRAM_BANKS=1
>   CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
>   CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000
>   CONFIG_ENV_SIZE=0x10000
> +CONFIG_ENV_OFFSET=0x0
>   CONFIG_DM_GPIO=y
>   CONFIG_DEFAULT_DEVICE_TREE="meson-sm1-khadas-vim3l"
>   CONFIG_OF_LIBFDT_OVERLAY=y
> @@ -45,7 +46,10 @@ CONFIG_CMD_AB_SELECT=y
>   CONFIG_CMD_REGULATOR=y
>   CONFIG_CMD_AVB=y
>   CONFIG_OF_CONTROL=y
> +CONFIG_ENV_IS_IN_MMC=y
>   CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> +CONFIG_SYS_MMC_ENV_DEV=2
> +CONFIG_SYS_MMC_ENV_PART=2
>   CONFIG_ADC=y
>   CONFIG_SARADC_MESON=y
>   CONFIG_BUTTON=y
> diff --git a/configs/khadas-vim3l_android_defconfig b/configs/khadas-vim3l_android_defconfig
> index 827752f24373..443c10aee3d0 100644
> --- a/configs/khadas-vim3l_android_defconfig
> +++ b/configs/khadas-vim3l_android_defconfig
> @@ -7,6 +7,7 @@ CONFIG_NR_DRAM_BANKS=1
>   CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
>   CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000
>   CONFIG_ENV_SIZE=0x10000
> +CONFIG_ENV_OFFSET=0x0
>   CONFIG_DM_GPIO=y
>   CONFIG_DEFAULT_DEVICE_TREE="meson-sm1-khadas-vim3l"
>   CONFIG_OF_LIBFDT_OVERLAY=y
> @@ -43,7 +44,10 @@ CONFIG_CMD_USB_MASS_STORAGE=y
>   CONFIG_CMD_REGULATOR=y
>   CONFIG_CMD_AVB=y
>   CONFIG_OF_CONTROL=y
> +CONFIG_ENV_IS_IN_MMC=y
>   CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> +CONFIG_SYS_MMC_ENV_DEV=2
> +CONFIG_SYS_MMC_ENV_PART=2
>   CONFIG_ADC=y
>   CONFIG_SARADC_MESON=y
>   CONFIG_BUTTON=y
> 
> ---
> base-commit: 14a21f1a80afc58d52dc72e35f27d3a47d36c082
> change-id: 20231026-fix-saveenv-eb5484622282
> 
> Best regards,

Reviewed-by: Neil Armstrong <neil.armstrong at linaro.org>