liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FL-1609] Redirected malloc, calloc, realloc and free functions from newlib to freertos heap. (#604)

Browse Source 
* Core: newlib-nano heap management functions replaced with freertos functions
* Core: replace newlib heap management functions for firmware only, not for bootloader
* Core, Linker: automatically determine available heap size at linking.

Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
SG
2021-07-25 22:37:43 +10:00
committed by GitHub
parent 81080a3a8b
commit 653295df6f
8 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/Makefile
View File

@@ -2,6 +2,7 @@ PROJECT_ROOT = $(abspath $(dir $(abspath $(firstword $(MAKEFILE_LIST))))..)
PROJECT = firmware
include $(PROJECT_ROOT)/make/base.mk
include $(PROJECT_ROOT)/make/freertos-heap.mk
include $(PROJECT_ROOT)/assets/assets.mk
include $(PROJECT_ROOT)/core/core.mk
include $(PROJECT_ROOT)/applications/applications.mk

3
firmware/targets/f6/Inc/FreeRTOSConfig.h
View File

@@ -69,7 +69,8 @@
#define configTICK_RATE_HZ ((TickType_t)1024)
#define configMAX_PRIORITIES ( 56 )
#define configMINIMAL_STACK_SIZE ((uint16_t)128)
#define configTOTAL_HEAP_SIZE ((size_t)131072)
/* Heap size determined automatically by linker */
// #define configTOTAL_HEAP_SIZE ((size_t)0)
#define configMAX_TASK_NAME_LEN ( 16 )
#define configGENERATE_RUN_TIME_STATS 0
#define configUSE_TRACE_FACILITY 1

6
firmware/targets/f6/stm32wb55xx_flash_cm4_boot.ld
View File

@@ -161,9 +161,9 @@ SECTIONS
._user_heap_stack :
{
. = ALIGN(8);
PROVIDE ( end = . );
PROVIDE ( _end = . );
. = . + _Min_Heap_Size;
__heap_start__ = .;
. = ORIGIN(RAM1) + LENGTH(RAM1) - _Min_Stack_Size;
__heap_end__ = .;
. = . + _Min_Stack_Size;
. = ALIGN(8);
} >RAM1

6
firmware/targets/f6/stm32wb55xx_flash_cm4_no_boot.ld
View File

@@ -161,9 +161,9 @@ SECTIONS
._user_heap_stack :
{
. = ALIGN(8);
PROVIDE ( end = . );
PROVIDE ( _end = . );
. = . + _Min_Heap_Size;
__heap_start__ = .;
. = ORIGIN(RAM1) + LENGTH(RAM1) - _Min_Stack_Size;
__heap_end__ = .;
. = . + _Min_Stack_Size;
. = ALIGN(8);
} >RAM1