ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #13649 from LDong-Arm/mbed-trace-default 

Make mbed-trace available to bare metal
pull/13671/head
Martin Kojtal 2020-09-22 16:24:18 +01:00 committed by GitHub
parent 2ab7b44f10 ca40038073
commit d829ac3fa8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TESTS/configs/baremetal.json
View File

@ -13,7 +13,6 @@
"filesystem", "filesystem",
"littlefs", "littlefs",
"littlefs2", "littlefs2",
"mbed-trace",
"device_key", "device_key",
"storage_tdb_internal", "storage_tdb_internal",
"storage_filesystem", "storage_filesystem",
@ -38,7 +37,6 @@
], ],
"target_overrides": { "target_overrides": {
"*": { "*": {
"mbed-trace.fea-ipv6": false,
"target.c_lib": "small" "target.c_lib": "small"
} }
} }

5
connectivity/libraries/nanostack-libservice/mbed_lib.json
View File

@ -1,3 +1,6 @@
{ {
"name": "nanostack-libservice" "name": "nanostack-libservice",
"config": {
"present": 1
}
} }

6
drivers/source/SFDP.cpp
View File

@ -26,14 +26,8 @@
#if (DEVICE_SPI || DEVICE_QSPI) #if (DEVICE_SPI || DEVICE_QSPI)
#if MBED_CONF_MBED_TRACE_ENABLE
#include "mbed-trace/mbed_trace.h" #include "mbed-trace/mbed_trace.h"
#define TRACE_GROUP "SFDP" #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 { namespace {

2
platform/bare_metal/mbed_lib.json
View File

@ -1,4 +1,4 @@
{ {
"name": "bare-metal", "name": "bare-metal",
"requires": ["platform", "drivers", "rtos-api"] "requires": ["platform", "drivers", "rtos-api", "mbed-trace"]
} }

2
platform/mbed-trace/include/mbed-trace/mbed_trace.h
View File

@ -69,7 +69,7 @@ extern "C" {
#define MBED_CONF_MBED_TRACE_ENABLE 0 #define MBED_CONF_MBED_TRACE_ENABLE 0
#endif #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 #define MBED_CONF_MBED_TRACE_FEA_IPV6 1
#endif #endif

2
platform/mbed-trace/source/mbed_trace.c
View File

@ -21,7 +21,7 @@
#undef MBED_CONF_MBED_TRACE_ENABLE #undef MBED_CONF_MBED_TRACE_ENABLE
#endif #endif
#define MBED_CONF_MBED_TRACE_ENABLE 1 #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 #define MBED_CONF_MBED_TRACE_FEA_IPV6 1
#endif #endif