libc: cleanup deprecated heap-related Kconfigs

ycsin · nashif · commit 19e4cb8f8950 · 2024-06-18T14:33:58.000-04:00
The following heap-related Kconfigs shared by the picolibc &amp;
minimal libc have been deprecated for more than 2 releases,
remove them and update the Kconfigs accordingly:

- `CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE`
- `CONFIG_MINIMAL_LIBC_REALLOCARRAY`

Cleanup the handling to support the deprecated malloc arena
size configuration values.

Signed-off-by: Yong Cong Sin &lt;ycsin@meta.com&gt;
diff --git a/boards/silabs/dev_kits/xg24_dk2601b/Kconfig.defconfig b/boards/silabs/dev_kits/xg24_dk2601b/Kconfig.defconfig
@@ -27,7 +27,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/boards/silabs/radio_boards/slwrb4104a/Kconfig.defconfig b/boards/silabs/radio_boards/slwrb4104a/Kconfig.defconfig
@@ -32,7 +32,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/boards/silabs/radio_boards/slwrb4161a/Kconfig.defconfig b/boards/silabs/radio_boards/slwrb4161a/Kconfig.defconfig
@@ -32,7 +32,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/boards/silabs/radio_boards/slwrb4170a/Kconfig.defconfig b/boards/silabs/radio_boards/slwrb4170a/Kconfig.defconfig
@@ -32,7 +32,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/boards/silabs/radio_boards/slwrb4180a/Kconfig.defconfig b/boards/silabs/radio_boards/slwrb4180a/Kconfig.defconfig
@@ -32,7 +32,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/boards/silabs/radio_boards/slwrb4250b/Kconfig.defconfig b/boards/silabs/radio_boards/slwrb4250b/Kconfig.defconfig
@@ -32,7 +32,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/boards/silabs/radio_boards/slwrb4255a/Kconfig.defconfig b/boards/silabs/radio_boards/slwrb4255a/Kconfig.defconfig
@@ -32,7 +32,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/boards/silabs/radio_boards/xg24_rb4187c/Kconfig.defconfig b/boards/silabs/radio_boards/xg24_rb4187c/Kconfig.defconfig
@@ -32,7 +32,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/include/zephyr/sys/libc-hooks.h b/include/zephyr/sys/libc-hooks.h
@@ -44,19 +44,6 @@ __syscall size_t zephyr_fwrite(const void *ZRESTRICT ptr, size_t size,
 
 #endif /* CONFIG_NEWLIB_LIBC */
 
-/* Handle deprecated malloc arena size configuration values */
-#ifdef CONFIG_COMMON_LIBC_MALLOC
-# if defined(CONFIG_MINIMAL_LIBC) && (CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE != -2)
-#  undef CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE
-#  define CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE
-#  warning Using deprecated setting CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE
-# elif defined(CONFIG_PICOLIBC) && (CONFIG_PICOLIBC_HEAP_SIZE != -2)
-#  undef CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE
-#  define CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE CONFIG_PICOLIBC_HEAP_SIZE
-#  warning Using deprecated setting CONFIG_PICOLIBC_HEAP_SIZE
-# endif
-#endif
-
 #ifdef CONFIG_USERSPACE
 #ifdef CONFIG_COMMON_LIBC_MALLOC
 
diff --git a/lib/libc/minimal/Kconfig b/lib/libc/minimal/Kconfig
@@ -13,19 +13,6 @@ config MINIMAL_LIBC_NON_REENTRANT_FUNCTIONS
 	  library memory partition when CONFIG_USERSPACE=y, and enabling this
 	  option may require an additional memory protection region.
 
-config MINIMAL_LIBC_MALLOC_ARENA_SIZE
-	int "[DEPRECATED] Size of the minimal libc malloc arena"
-	default -2
-	depends on COMMON_LIBC_MALLOC
-	help
-	  [DEPRECATED] Use COMMON_LIBC_MALLOC_ARENA_SIZE
-
-	  Indicate the size in bytes of the memory arena used for common C
-	  library malloc() implementation when using the minimal C library.
-
-	  If set to -2, then the value of COMMON_LIBC_MALLOC_ARENA_SIZE
-	  will be used.
-
 config MINIMAL_LIBC_LL_PRINTF
 	bool "Build with minimal libc long long printf" if !64BIT
 	default y if 64BIT
diff --git a/lib/libc/picolibc/Kconfig b/lib/libc/picolibc/Kconfig
@@ -19,18 +19,6 @@ config PICOLIBC_USE_TOOLCHAIN
 	default y if PICOLIBC && !PICOLIBC_USE_MODULE
 	select THREAD_LOCAL_STORAGE if ARCH_HAS_THREAD_LOCAL_STORAGE && TOOLCHAIN_SUPPORTS_THREAD_LOCAL_STORAGE
 
-config PICOLIBC_HEAP_SIZE
-	int "[DEPRECATED] Picolibc heap size (bytes)"
-	default -2
-	help
-	  [DEPRECATED] Use COMMON_LIBC_MALLOC_ARENA_SIZE
-
-	  Indicate the size in bytes of the memory arena used for common C
-	  library malloc() implementation when using Picolibc.
-
-	  If set to -2, then the value of COMMON_LIBC_MALLOC_ARENA_SIZE
-	  will be used.
-
 choice PICOLIBC_IO_LEVEL
 	prompt "Picolibc printf/scanf level"
 	default PICOLIBC_IO_MINIMAL if CBPRINTF_NANO
diff --git a/modules/lvgl/Kconfig.memory b/modules/lvgl/Kconfig.memory
@@ -20,7 +20,7 @@ choice LV_Z_MEMORY_POOL
 
 	config LV_Z_MEM_POOL_HEAP_LIB_C
 	  bool "C library Heap"
-	  depends on !MINIMAL_LIBC || (MINIMAL_LIBC_MALLOC_ARENA_SIZE != 0)
+	  depends on !MINIMAL_LIBC || (COMMON_LIBC_MALLOC_ARENA_SIZE != 0)
 	  help
 		Use C library malloc and free to allocate objects on the C library heap
 
