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

Make mbed-trace available to bare metal

TESTS/configs/baremetal.json

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

connectivity/libraries/nanostack-libservice/mbed_lib.json

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

drivers/source/SFDP.cpp

@@ -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 {
 

platform/bare_metal/mbed_lib.json

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

platform/mbed-trace/include/mbed-trace/mbed_trace.h

@@ -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
 

platform/mbed-trace/source/mbed_trace.c

@@ -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