tests/samples: Replace minimal libc malloc configs with common ones

keith-packard · stephanosio · commit 4134858868f1 · 2023-04-27T20:17:24.000+09:00
With the minimal C library malloc implementation moving to libc/common, all
of the related Kconfig variables have also changed. Update uses within the
tree.

Signed-off-by: Keith Packard &lt;keithp@keithp.com&gt;
diff --git a/samples/basic/hash_map/Kconfig b/samples/basic/hash_map/Kconfig
@@ -16,7 +16,7 @@ config TEST_LIB_HASH_MAP_MAX_ENTRIES
 	  heap memory. For test scenarios using the Minimal C library, the heap
 	  size is controlled via
 
-	  CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE
+	  CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE
 
 	  For native_posix_64, the number of entries can be configured
 	  independently of the arena size since the native libc is used.
diff --git a/samples/basic/hash_map/prj.conf b/samples/basic/hash_map/prj.conf
@@ -6,7 +6,7 @@ CONFIG_BOOT_BANNER=n
 CONFIG_LOG=y
 
 CONFIG_TEST_RANDOM_GENERATOR=y
-CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE=8192
+CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=8192
 CONFIG_NEWLIB_LIBC_MIN_REQUIRED_HEAP_SIZE=8192
 CONFIG_PICOLIBC_HEAP_SIZE=8192
 
diff --git a/samples/bluetooth/peripheral_hr/prj_minimal.conf b/samples/bluetooth/peripheral_hr/prj_minimal.conf
@@ -80,7 +80,7 @@ CONFIG_ISR_STACK_SIZE=1024
 
 # Disable features not needed
 CONFIG_TIMESLICING=n
-CONFIG_MINIMAL_LIBC_MALLOC=n
+CONFIG_COMMON_LIBC_MALLOC=n
 CONFIG_LOG=n
 CONFIG_ASSERT=n
 
diff --git a/samples/cpp/cpp_synchronization/prj.conf b/samples/cpp/cpp_synchronization/prj.conf
@@ -1,3 +1,3 @@
 CONFIG_CPP=y
 CONFIG_CPP_MAIN=y
-CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE=128
+CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=128
diff --git a/samples/net/cloud/tagoio_http_post/prj.conf b/samples/net/cloud/tagoio_http_post/prj.conf
@@ -2,9 +2,9 @@
 CONFIG_MAIN_STACK_SIZE=4096
 
 # C Library
-# Default use minimal libc and with MINIMAL_LIBC_MALLOC_ARENA_SIZE defining
+# Default use minimal libc and with COMMON_LIBC_MALLOC_ARENA_SIZE defining
 # HEAP size (512 bytes) are enough to run DNS.
-CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE=4096
+CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=4096
 
 # Networking config
 CONFIG_NETWORKING=y
diff --git a/samples/subsys/fs/littlefs/boards/nucleo_h743zi.conf b/samples/subsys/fs/littlefs/boards/nucleo_h743zi.conf
@@ -11,7 +11,7 @@ CONFIG_FLASH_MAP=y
 CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_FLASH_STM32_QSPI=y
 
-CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE=8192
+CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=8192
 
 # Littlefs configuration to utilize QSPI operation
 CONFIG_FS_LITTLEFS_CACHE_SIZE=256
diff --git a/samples/subsys/fs/littlefs/boards/nucleo_h743zi_blk.conf b/samples/subsys/fs/littlefs/boards/nucleo_h743zi_blk.conf
@@ -4,6 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 CONFIG_MAIN_STACK_SIZE=2048
-CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE=8192
+CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=8192
 
 CONFIG_FS_LITTLEFS_FC_HEAP_SIZE=8192
diff --git a/samples/subsys/usb/mass/boards/stm32l562e_dk_ns.conf b/samples/subsys/usb/mass/boards/stm32l562e_dk_ns.conf
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 CONFIG_MAIN_STACK_SIZE=2048
-CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE=8192
+CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=8192
 
 CONFIG_DISK_ACCESS=y
 CONFIG_DISK_DRIVERS=y
diff --git a/tests/lib/cpp/cxx/prj.conf b/tests/lib/cpp/cxx/prj.conf
@@ -2,7 +2,7 @@ CONFIG_CPP=y
 CONFIG_NET_BUF=y
 CONFIG_ZTEST=y
 CONFIG_ZTEST_STACK_SIZE=2048
-CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE=128
+CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=128
 CONFIG_ZTEST_NEW_API=y
 CONFIG_CRC=y
 
diff --git a/tests/lib/hash_map/Kconfig b/tests/lib/hash_map/Kconfig
@@ -16,7 +16,7 @@ config TEST_LIB_HASH_MAP_MAX_ENTRIES
 	  heap memory. For test scenarios using the Minimal C library, the heap
 	  size is controlled via
 
-	  CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE
+	  CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE
 
 	  For native_posix_64, the number of entries can be configured
 	  independently of the arena size since the native libc is used.
diff --git a/tests/lib/hash_map/prj.conf b/tests/lib/hash_map/prj.conf
@@ -5,7 +5,7 @@
 CONFIG_ZTEST=y
 CONFIG_ZTEST_NEW_API=y
 
-CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE=8192
+CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=8192
 CONFIG_NEWLIB_LIBC_MIN_REQUIRED_HEAP_SIZE=8192
 CONFIG_PICOLIBC_HEAP_SIZE=8192
 
diff --git a/tests/lib/mem_alloc/prj.conf b/tests/lib/mem_alloc/prj.conf
@@ -1,4 +1,4 @@
 CONFIG_ZTEST=y
-CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE=2048
+CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=2048
 CONFIG_TEST_USERSPACE=y
 CONFIG_ZTEST_NEW_API=y
diff --git a/tests/lib/mem_alloc/prj_negative_testing.conf b/tests/lib/mem_alloc/prj_negative_testing.conf
@@ -1,4 +1,4 @@
 CONFIG_ZTEST=y
-CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE=0
+CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=0
 CONFIG_TEST_USERSPACE=y
 CONFIG_ZTEST_NEW_API=y
diff --git a/tests/lib/mem_alloc/src/main.c b/tests/lib/mem_alloc/src/main.c
@@ -56,7 +56,7 @@ union aligntest {
 };
 
 
-#if defined(CONFIG_MINIMAL_LIBC) && (CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE == 0)
+#if defined(CONFIG_MINIMAL_LIBC) && (CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE == 0)
 __no_optimization void _test_no_mem_malloc(void)
 {
 	int *iptr = NULL;
diff --git a/tests/subsys/fs/littlefs/prj.conf b/tests/subsys/fs/littlefs/prj.conf
@@ -5,7 +5,7 @@ CONFIG_ZTEST_NEW_API=y
 CONFIG_MAIN_STACK_SIZE=4096
 
 # Performance tests need custom buffer allocation
-CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE=8192
+CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=8192
 
 # FS abstraction layer is noisy so it's off.  Turn it on to see the
 # littlefs configuration parameters.

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@`
`4`	`4`	`# SPDX-License-Identifier: Apache-2.0`
`5`	`5`	`#`
`6`	`6`	`CONFIG_MAIN_STACK_SIZE=2048`
`7`		`-CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE=8192`
	`7`	`+CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=8192`
`8`	`8`
`9`	`9`	`CONFIG_FS_LITTLEFS_FC_HEAP_SIZE=8192`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`# SPDX-License-Identifier: Apache-2.0`
`5`	`5`	`#`
`6`	`6`	`CONFIG_MAIN_STACK_SIZE=2048`
`7`		`-CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE=8192`
	`7`	`+CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=8192`
`8`	`8`
`9`	`9`	`CONFIG_DISK_ACCESS=y`
`10`	`10`	`CONFIG_DISK_DRIVERS=y`