From fc0a7431e1729f456690468f2e9570fcc2c18175 Mon Sep 17 00:00:00 2001 From: Mattijs Korpershoek Date: Fri, 9 Feb 2024 09:58:35 +0100 Subject: configs: khadas-vim3*_android: fix AVB oom error 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 Signed-off-by: Guillaume La Roque Signed-off-by: Mattijs Korpershoek Reviewed-by: Neil Armstrong Reviewed-by: Igor Opaniuk Link: https://lore.kernel.org/r/20240209-vim3-avb-malloc-v1-1-91427d8c19ab@baylibre.com Signed-off-by: Neil Armstrong --- 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 b41c266..ee62fe3 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 88197f5..cecbe50 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 3381d2e..ec4e0dc 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 3fa587e..206f8de 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 -- cgit v1.1