Skip to content

Make mbed-trace available to bare metal #13649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Sep 22, 2020
Merged

Make mbed-trace available to bare metal #13649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ca157c9
nanostack-libservice: add config to indicate its availability
LDong-Arm Sep 21, 2020
378046e
mbed-trace: if fea-ipv6 is null, check nanostack-libservice availability
LDong-Arm Sep 21, 2020
f7b82ac
Make mbed-trace available to bare metal
LDong-Arm Sep 16, 2020
8acb2c3
Baremetal test config: "mbed-trace" is now available by default
LDong-Arm Sep 16, 2020
7a8460a
drivers/SFDP: mbed-trace header is now always available
LDong-Arm Sep 21, 2020
ca40038
Baremetal test config: no need to explicitly disable ipv6 anymore
LDong-Arm Sep 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions TESTS/configs/baremetal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"filesystem",
"littlefs",
"littlefs2",
"mbed-trace",
"device_key",
"storage_tdb_internal",
"storage_filesystem",
Expand All @@ -38,7 +37,6 @@
],
"target_overrides": {
"*": {
"mbed-trace.fea-ipv6": false,
"target.c_lib": "small"
}
}
Expand Down
5 changes: 4 additions & 1 deletion connectivity/libraries/nanostack-libservice/mbed_lib.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
{
"name": "nanostack-libservice"
"name": "nanostack-libservice",
"config": {
"present": 1
}
}
6 changes: 0 additions & 6 deletions drivers/source/SFDP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,8 @@

#if (DEVICE_SPI || DEVICE_QSPI)

#if MBED_CONF_MBED_TRACE_ENABLE
#include "mbed-trace/mbed_trace.h"
#define TRACE_GROUP "SFDP"
#else // MBED_CONF_MBED_TRACE_ENABLE
#define tr_info(...)
#define tr_error(...)
#define tr_debug(...)
#endif // MBED_CONF_MBED_TRACE_ENABLE

namespace {

Expand Down
2 changes: 1 addition & 1 deletion platform/bare_metal/mbed_lib.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"name": "bare-metal",
"requires": ["platform", "drivers", "rtos-api"]
"requires": ["platform", "drivers", "rtos-api", "mbed-trace"]
}
2 changes: 1 addition & 1 deletion platform/mbed-trace/include/mbed-trace/mbed_trace.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ extern "C" {
#define MBED_CONF_MBED_TRACE_ENABLE 0
#endif

#ifndef MBED_CONF_MBED_TRACE_FEA_IPV6
#if !defined(MBED_CONF_MBED_TRACE_FEA_IPV6) && MBED_CONF_NANOSTACK_LIBSERVICE_PRESENT
#define MBED_CONF_MBED_TRACE_FEA_IPV6 1
#endif

Expand Down
2 changes: 1 addition & 1 deletion platform/mbed-trace/source/mbed_trace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#undef MBED_CONF_MBED_TRACE_ENABLE
#endif
#define MBED_CONF_MBED_TRACE_ENABLE 1
#ifndef MBED_CONF_MBED_TRACE_FEA_IPV6
#if !defined(MBED_CONF_MBED_TRACE_FEA_IPV6) && MBED_CONF_NANOSTACK_LIBSERVICE_PRESENT
#define MBED_CONF_MBED_TRACE_FEA_IPV6 1
#endif

Expand Down