[PATCH] configs: khadas-vim3*_android: fix AVB oom error

[Neil Armstrong]

On 09/02/2024 09:58, Mattijs Korpershoek wrote:
> When booting Android with AVB enabled, an OOM is observed:
> 
>    => avb init ${mmcdev}
>    => avb verify _a
>    ## Android Verified Boot 2.0 version 1.1.0
>    read_is_device_unlocked not supported yet
>    read_rollback_index not supported yet
>    avb_util.c:182: ERROR: Failed to allocate memory.
>    OOM error occurred during verification
> 
> A custom malloc length of 128MB is required as documented in
> commit 285a83b12bdf ("configs: meson64_android: increase SYS_MALLOC_LEN to 128M for AVB")
> 
> However, this 128M custom malloc length was not ported to Kconfig in
> commit 7cfbba36e9f8 ("Convert CONFIG_SYS_MALLOC_LEN to Kconfig")
> 
> Add it back to fix AVB verification on VIM3/VIM3L.
> 
> Fixes: 7cfbba36e9f8 ("Convert CONFIG_SYS_MALLOC_LEN to Kconfig")
> Co-developed-by: Guillaume La Roque <glaroque at baylibre.com>
> Signed-off-by: Guillaume La Roque <glaroque at baylibre.com>
> Signed-off-by: Mattijs Korpershoek <mkorpershoek at baylibre.com>
> ---
>   configs/khadas-vim3_android_ab_defconfig  | 1 +
>   configs/khadas-vim3_android_defconfig     | 1 +
>   configs/khadas-vim3l_android_ab_defconfig | 1 +
>   configs/khadas-vim3l_android_defconfig    | 1 +
>   4 files changed, 4 insertions(+)
> 
> diff --git a/configs/khadas-vim3_android_ab_defconfig b/configs/khadas-vim3_android_ab_defconfig
> index b41c2660fff0..ee62fe36d414 100644
> --- a/configs/khadas-vim3_android_ab_defconfig
> +++ b/configs/khadas-vim3_android_ab_defconfig
> @@ -3,6 +3,7 @@ CONFIG_SYS_BOARD="vim3"
>   CONFIG_SYS_CONFIG_NAME="khadas-vim3_android"
>   CONFIG_ARCH_MESON=y
>   CONFIG_TEXT_BASE=0x01000000
> +CONFIG_SYS_MALLOC_LEN=0x08000000
>   CONFIG_NR_DRAM_BANKS=1
>   CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
>   CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000
> diff --git a/configs/khadas-vim3_android_defconfig b/configs/khadas-vim3_android_defconfig
> index 88197f5f5e99..cecbe5061793 100644
> --- a/configs/khadas-vim3_android_defconfig
> +++ b/configs/khadas-vim3_android_defconfig
> @@ -3,6 +3,7 @@ CONFIG_SYS_BOARD="vim3"
>   CONFIG_SYS_CONFIG_NAME="khadas-vim3_android"
>   CONFIG_ARCH_MESON=y
>   CONFIG_TEXT_BASE=0x01000000
> +CONFIG_SYS_MALLOC_LEN=0x08000000
>   CONFIG_NR_DRAM_BANKS=1
>   CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
>   CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000
> diff --git a/configs/khadas-vim3l_android_ab_defconfig b/configs/khadas-vim3l_android_ab_defconfig
> index 3381d2e92701..ec4e0dc72e22 100644
> --- a/configs/khadas-vim3l_android_ab_defconfig
> +++ b/configs/khadas-vim3l_android_ab_defconfig
> @@ -3,6 +3,7 @@ CONFIG_SYS_BOARD="vim3"
>   CONFIG_SYS_CONFIG_NAME="khadas-vim3l_android"
>   CONFIG_ARCH_MESON=y
>   CONFIG_TEXT_BASE=0x01000000
> +CONFIG_SYS_MALLOC_LEN=0x08000000
>   CONFIG_NR_DRAM_BANKS=1
>   CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
>   CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000
> diff --git a/configs/khadas-vim3l_android_defconfig b/configs/khadas-vim3l_android_defconfig
> index 3fa587ef1db5..206f8defca6b 100644
> --- a/configs/khadas-vim3l_android_defconfig
> +++ b/configs/khadas-vim3l_android_defconfig
> @@ -3,6 +3,7 @@ CONFIG_SYS_BOARD="vim3"
>   CONFIG_SYS_CONFIG_NAME="khadas-vim3l_android"
>   CONFIG_ARCH_MESON=y
>   CONFIG_TEXT_BASE=0x01000000
> +CONFIG_SYS_MALLOC_LEN=0x08000000
>   CONFIG_NR_DRAM_BANKS=1
>   CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
>   CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000
> 
> ---
> base-commit: 076529725f16f07a5cb2d5feba25d62b5f5a5872
> change-id: 20240209-vim3-avb-malloc-aa3de534d6a0
> 
> Best regards,

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