From bd1a7a36f44db9a22e01f41e3ffdb3ea2868afe6 Mon Sep 17 00:00:00 2001 From: Stephanos Ioannidis Date: Wed, 3 May 2023 23:44:39 +0900 Subject: [PATCH] boards, samples: Fix minimal libc malloc arena settings With the minimal libc moving to using the common malloc implementation, boards and samples with minimal libc-specific settings need to switch to using the common malloc settings instead. Signed-off-by: Stephanos Ioannidis --- boards/arm/efr32_thunderboard/Kconfig.defconfig | 2 +- .../virtualization/ivshmem/doorbell/boards/qemu_cortex_a53.conf | 2 +- .../virtualization/ivshmem/doorbell/boards/qemu_kvm_arm64.conf | 2 +- .../virtualization/ivshmem/doorbell/boards/qemu_x86_64.conf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/boards/arm/efr32_thunderboard/Kconfig.defconfig b/boards/arm/efr32_thunderboard/Kconfig.defconfig index a4236de138a..1fe8373bfac 100644 --- a/boards/arm/efr32_thunderboard/Kconfig.defconfig +++ b/boards/arm/efr32_thunderboard/Kconfig.defconfig @@ -28,7 +28,7 @@ if BT config FPU default y -config MINIMAL_LIBC_MALLOC_ARENA_SIZE +config COMMON_LIBC_MALLOC_ARENA_SIZE default 8192 config MAIN_STACK_SIZE diff --git a/samples/drivers/virtualization/ivshmem/doorbell/boards/qemu_cortex_a53.conf b/samples/drivers/virtualization/ivshmem/doorbell/boards/qemu_cortex_a53.conf index f5109b857db..fb65a156647 100644 --- a/samples/drivers/virtualization/ivshmem/doorbell/boards/qemu_cortex_a53.conf +++ b/samples/drivers/virtualization/ivshmem/doorbell/boards/qemu_cortex_a53.conf @@ -17,4 +17,4 @@ CONFIG_HEAP_MEM_POOL_SIZE=1048576 # Memory for userspace test # The default ivshmem memory size is 4MB (4194304), but libc uses the arena as well -CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE=8388608 +CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=8388608 diff --git a/samples/drivers/virtualization/ivshmem/doorbell/boards/qemu_kvm_arm64.conf b/samples/drivers/virtualization/ivshmem/doorbell/boards/qemu_kvm_arm64.conf index f5109b857db..fb65a156647 100644 --- a/samples/drivers/virtualization/ivshmem/doorbell/boards/qemu_kvm_arm64.conf +++ b/samples/drivers/virtualization/ivshmem/doorbell/boards/qemu_kvm_arm64.conf @@ -17,4 +17,4 @@ CONFIG_HEAP_MEM_POOL_SIZE=1048576 # Memory for userspace test # The default ivshmem memory size is 4MB (4194304), but libc uses the arena as well -CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE=8388608 +CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=8388608 diff --git a/samples/drivers/virtualization/ivshmem/doorbell/boards/qemu_x86_64.conf b/samples/drivers/virtualization/ivshmem/doorbell/boards/qemu_x86_64.conf index 6c8464308af..e999a198925 100644 --- a/samples/drivers/virtualization/ivshmem/doorbell/boards/qemu_x86_64.conf +++ b/samples/drivers/virtualization/ivshmem/doorbell/boards/qemu_x86_64.conf @@ -1,4 +1,4 @@ # The test requires dynamic memory for kernel and userspace # This is enough memory for a 4KB ivshmem shared memory CONFIG_HEAP_MEM_POOL_SIZE=4096 -CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE=8192 +CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=8192