diff options
| author | Meco Jianting Man <[email protected]> | 2021-09-27 06:16:39 -0500 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-09-27 06:16:39 -0500 |
| commit | 37d4abb822c60872bf21f6a1bb0b61e8e1409cc7 (patch) | |
| tree | ac8e69dbd720d5ad50529a029ba81c9fc9e7d9f9 /src | |
| parent | 8e287cfdf70da52937eebe59a1e2527775dd1f0c (diff) | |
| parent | 94bd9f96a4b49e94916a2904eea882792e0460d2 (diff) | |
Merge branch 'master' into libc_stdio
Diffstat (limited to 'src')
| -rw-r--r-- | src/Kconfig | 15 | ||||
| -rw-r--r-- | src/memheap.c | 2 |
2 files changed, 13 insertions, 4 deletions
diff --git a/src/Kconfig b/src/Kconfig index 71abd9cf4f..fc7fcd54f4 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -268,11 +268,18 @@ menu "Memory Management" help Using static memory fixed partition - config RT_USING_MEMHEAP + menuconfig RT_USING_MEMHEAP bool "Using memory heap object" default n - help - Using memory heap object to manage dynamic memory heap. + + if RT_USING_MEMHEAP + + if RT_USING_MEMHEAP_AS_HEAP + config RT_USING_MEMHEAP_AUTO_BINDING + bool "Use all of memheap objects as heap" + default y + endif + endif choice prompt "Dynamic Memory Management" @@ -289,7 +296,7 @@ menu "Memory Management" if RT_USING_MEMHEAP config RT_USING_MEMHEAP_AS_HEAP - bool "Use all of memheap objects as heap" + bool "Use memheap objects as heap" endif config RT_USING_USERHEAP diff --git a/src/memheap.c b/src/memheap.c index f9da3ac015..68a15d1a8e 100644 --- a/src/memheap.c +++ b/src/memheap.c @@ -852,6 +852,7 @@ void *rt_malloc(rt_size_t size) /* try to allocate in system heap */ ptr = rt_memheap_alloc(&_heap, size); +#ifdef RT_USING_MEMHEAP_AUTO_BINDING if (ptr == RT_NULL) { struct rt_object *object; @@ -881,6 +882,7 @@ void *rt_malloc(rt_size_t size) break; } } +#endif /* RT_USING_MEMHEAP_AUTO_BINDING */ #ifdef RT_USING_MEMTRACE if (ptr == RT_NULL) |