Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
François Revol
firmware
Commits
48120d1f
Verified
Commit
48120d1f
authored
Aug 05, 2019
by
Rahix
Browse files
build(ble): Only link cordio-phy where necessary
Signed-off-by:
Rahix
<
rahix@rahix.de
>
parent
c4e07041
Changes
2
Hide whitespace changes
Inline
Side-by-side
card10-cross.ini
View file @
48120d1f
...
...
@@ -6,7 +6,7 @@ strip = 'arm-none-eabi-strip'
[properties]
c_args
=
['-mthumb', '-mcpu=cortex-m4', '-mfloat-abi=softfp', '-mfpu=fpv4-sp-d16', '-Wa,-mimplicit-it=thumb', '-ffunction-sections', '-fdata-sections', '-fsingle-precision-constant', '-fno-isolate-erroneous-paths-dereference']
c_link_args
=
['-mthumb', '-mcpu=cortex-m4', '-mfloat-abi=softfp', '-mfpu=fpv4-sp-d16', '-Wl,--start-group', '-lc', '-lnosys', '-Wl,--end-group', '--specs=nano.specs'
, '../lib/sdk/Libraries/BTLE/cordio-phy.a'
]
c_link_args
=
['-mthumb', '-mcpu=cortex-m4', '-mfloat-abi=softfp', '-mfpu=fpv4-sp-d16', '-Wl,--start-group', '-lc', '-lnosys', '-Wl,--end-group', '--specs=nano.specs']
target_defs
=
['-DTARGET=32665', '-DTARGET_REV=0x4131', '-DBOARD_CARD10=1', '-DWSF_TRACE_ENABLED=TRUE', '-DWSF_ASSERT_ENABLED=TRUE', '-DWSF_MS_PER_TICK=1', '-DINIT_BROADCASTER', '-DINIT_PERIPHERAL', '-DINIT_ENCRYPTED']
...
...
lib/sdk/Libraries/BTLE/meson.build
View file @
48120d1f
# cordio-phy.a
cc = meson.get_compiler('c')
libcordiophy = cc.find_library('cordio-phy', dirs: meson.current_source_dir())
includes = include_directories(
'wsf/include',
'stack/ble-host/include',
...
...
@@ -413,7 +418,7 @@ lib = static_library(
'ble',
sources,
include_directories: includes,
dependencies: periphdriver,
dependencies:
[
periphdriver,
libcordiophy],
c_args: ['-w',
'-DLHCI_ENABLE_VS=TRUE',
'-DBB_CLK_RATE_HZ=1600000',
...
...
@@ -426,5 +431,5 @@ lib = static_library(
ble = declare_dependency(
include_directories: includes,
link_with: lib,
dependencies: periphdriver,
dependencies:
[
periphdriver,
libcordiophy],
)
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment