Skip to content

Commit c22c98e

Browse files
ycsinnashif
authored andcommitted
libc: minimal: remove deprecated Kconfigs
The following Kconfigs have been deprecated for more than 2 releases, remove them: - `CONFIG_SUPPORT_MINIMAL_LIBC` - `CONFIG_MINIMAL_LIBC_MALLOC` - `CONFIG_MINIMAL_LIBC_CALLOC` - `CONFIG_MINIMAL_LIBC_REALLOCARRAY` Signed-off-by: Yong Cong Sin <[email protected]>
1 parent c9d08fc commit c22c98e

File tree

3 files changed

+5
-37
lines changed

3 files changed

+5
-37
lines changed

lib/libc/Kconfig

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,6 @@ config PICOLIBC_SUPPORTED
4949
help
5050
Selected when the target has support for picolibc.
5151

52-
config SUPPORT_MINIMAL_LIBC
53-
bool
54-
select MINIMAL_LIBC_SUPPORTED
55-
select DEPRECATED
56-
help
57-
Legacy symbol that selects MINIMAL_LIBC_SUPPORTED
58-
5952
config NATIVE_LIBC_INCOMPATIBLE
6053
bool
6154
help
@@ -79,6 +72,9 @@ config MINIMAL_LIBC
7972
imply COMPILER_FREESTANDING
8073
select COMMON_LIBC_ABORT
8174
select COMMON_LIBC_STRNLEN
75+
imply COMMON_LIBC_MALLOC
76+
imply COMMON_LIBC_CALLOC
77+
imply COMMON_LIBC_REALLOCARRAY
8278
help
8379
Build with minimal C library.
8480

lib/libc/common/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ config COMMON_LIBC_MALLOC_ARENA_SIZE
5353
config COMMON_LIBC_CALLOC
5454
bool "Common C library calloc"
5555
depends on COMMON_LIBC_MALLOC
56-
default n if MINIMAL_LIBC && !MINIMAL_LIBC_CALLOC
56+
default n if MINIMAL_LIBC
5757
default y
5858
help
5959
Enable the common C library trivial implementation of calloc,
@@ -62,7 +62,7 @@ config COMMON_LIBC_CALLOC
6262
config COMMON_LIBC_REALLOCARRAY
6363
bool "Common C library reallocarray"
6464
depends on COMMON_LIBC_MALLOC
65-
default n if MINIMAL_LIBC && !MINIMAL_LIBC_REALLOCARRAY
65+
default n if MINIMAL_LIBC
6666
default y
6767
help
6868
Enable the common C library trivial implementation of

lib/libc/minimal/Kconfig

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,6 @@ config MINIMAL_LIBC_NON_REENTRANT_FUNCTIONS
1313
library memory partition when CONFIG_USERSPACE=y, and enabling this
1414
option may require an additional memory protection region.
1515

16-
config MINIMAL_LIBC_MALLOC
17-
bool "[DEPRECATED] Minimal libc malloc implementation"
18-
default y
19-
imply COMMON_LIBC_MALLOC
20-
help
21-
[DEPRECATED] Use COMMON_LIBC_MALLOC
22-
23-
Enable the minimal libc's implementation of malloc, free, and realloc.
24-
Disable if you wish to provide your own implementations of these functions.
25-
2616
config MINIMAL_LIBC_MALLOC_ARENA_SIZE
2717
int "[DEPRECATED] Size of the minimal libc malloc arena"
2818
default -2
@@ -36,24 +26,6 @@ config MINIMAL_LIBC_MALLOC_ARENA_SIZE
3626
If set to -2, then the value of COMMON_LIBC_MALLOC_ARENA_SIZE
3727
will be used.
3828

39-
config MINIMAL_LIBC_CALLOC
40-
bool "[DEPRECATED] Minimal libc trivial calloc implementation"
41-
default y
42-
help
43-
[DEPRECATED] Use COMMON_LIBC_CALLOC
44-
45-
Enable the minimal libc's trivial implementation of calloc, which
46-
forwards to malloc and memset.
47-
48-
config MINIMAL_LIBC_REALLOCARRAY
49-
bool "[DEPRECATED] Minimal libc trivial reallocarray implementation"
50-
default y
51-
help
52-
[DEPRECATED] Use COMMON_LIBC_REALLOCARRAY
53-
54-
Enable the minimal libc's trivial implementation of reallocarray, which
55-
forwards to realloc.
56-
5729
config MINIMAL_LIBC_LL_PRINTF
5830
bool "Build with minimal libc long long printf" if !64BIT
5931
default y if 64BIT

0 commit comments

Comments
 (0)