Skip to content
Snippets Groups Projects
Verified Commit e41c4607 authored by rahix's avatar rahix
Browse files

chore(sdk): Move heap into separate lib


Signed-off-by: default avatarRahix <rahix@rahix.de>
parent 85f8bd64
No related branches found
No related tags found
No related merge requests found
...@@ -74,7 +74,7 @@ elf = executable( ...@@ -74,7 +74,7 @@ elf = executable(
module_sources, module_sources,
dependencies: [libcard10, max32665_startup_core0, maxusb, libff13], dependencies: [libcard10, max32665_startup_core0, maxusb, libff13],
link_with: [api_dispatcher_lib, freertos], link_with: [api_dispatcher_lib, freertos],
link_whole: [max32665_startup_core0_lib, board_card10_lib], link_whole: [max32665_startup_core0_lib, board_card10_lib, newlib_heap_lib],
include_directories: [freertos_includes], include_directories: [freertos_includes],
link_args: [ link_args: [
'-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map', '-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
......
...@@ -3,7 +3,7 @@ executable( ...@@ -3,7 +3,7 @@ executable(
name + '.elf', name + '.elf',
'main.c', 'main.c',
dependencies: [libcard10, max32665_startup_core0], dependencies: [libcard10, max32665_startup_core0],
link_whole: [max32665_startup_core0_lib, board_card10_lib], link_whole: [max32665_startup_core0_lib, board_card10_lib, newlib_heap_lib],
link_args: [ link_args: [
'-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map', '-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
], ],
...@@ -14,7 +14,7 @@ executable( ...@@ -14,7 +14,7 @@ executable(
name + '.elf', name + '.elf',
'core1.c', 'core1.c',
dependencies: [periphdriver, board_card10, max32665_startup_core1], dependencies: [periphdriver, board_card10, max32665_startup_core1],
link_whole: [max32665_startup_core1_lib, board_card10_lib], link_whole: [max32665_startup_core1_lib, board_card10_lib, newlib_heap_lib],
link_args: [ link_args: [
'-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map', '-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
], ],
......
#############################################################
# NewLib Heap
#############################################################
sources = files(
'./Source/heap.c',
)
newlib_heap_lib = static_library(
'newlib_heap',
sources,
)
############################################################# #############################################################
# For applications using just core0 or not dual-binaries # For applications using just core0 or not dual-binaries
############################################################# #############################################################
...@@ -28,7 +41,6 @@ max32665_startup = declare_dependency( ...@@ -28,7 +41,6 @@ max32665_startup = declare_dependency(
sources = files( sources = files(
'./Source/GCC/startup_max32665.S', './Source/GCC/startup_max32665.S',
'./Source/system_max32665.c', './Source/system_max32665.c',
'./Source/heap.c',
) )
max32665_startup_core0_lib = static_library( max32665_startup_core0_lib = static_library(
...@@ -51,7 +63,6 @@ max32665_startup_core0 = declare_dependency( ...@@ -51,7 +63,6 @@ max32665_startup_core0 = declare_dependency(
sources = files( sources = files(
'./Source/GCC/startup_max32665.S', './Source/GCC/startup_max32665.S',
'./Source/system_max32665_core1.c', './Source/system_max32665_core1.c',
'./Source/heap.c',
) )
max32665_startup_core1_lib = static_library( max32665_startup_core1_lib = static_library(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment