Seems the "generous 2MB space" is no longer enough for SPL on some K3 R5 platforms so let's increase this to 4MB. That matches what we give to ARM64 SPL, so combine these.
Signed-off-by: Andrew Davis <[email protected]> --- common/spl/Kconfig | 3 +-- configs/am64x_evm_r5_defconfig | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 3b7b6cafef8..0411a5edc9f 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -465,8 +465,7 @@ config SPL_STACK_R_ADDR config SPL_STACK_R_MALLOC_SIMPLE_LEN depends on SPL_STACK_R && SPL_SYS_MALLOC_SIMPLE hex "Size of malloc_simple heap after switching to DRAM SPL stack" - default 0x400000 if ARCH_K3 && ARM64 - default 0x200000 if ARCH_K3 && CPU_V7R + default 0x400000 if ARCH_K3 default 0x100000 help Specify the amount of the stack to use as memory pool for diff --git a/configs/am64x_evm_r5_defconfig b/configs/am64x_evm_r5_defconfig index a675ea84fca..e1a748de5a9 100644 --- a/configs/am64x_evm_r5_defconfig +++ b/configs/am64x_evm_r5_defconfig @@ -23,7 +23,6 @@ CONFIG_SPL_HAS_BSS_LINKER_SECTION=y CONFIG_SPL_BSS_START_ADDR=0x7019b800 CONFIG_SPL_BSS_MAX_SIZE=0x4000 CONFIG_SPL_STACK_R=y -CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x400000 CONFIG_SPL_SIZE_LIMIT=0x190000 CONFIG_SPL_SIZE_LIMIT_PROVIDE_STACK=0x4000 CONFIG_SPL_FS_FAT=y -- 2.39.2
