Merge pull request #8685 from bridadan/clean_up_deprecated_feature_code

Clean up deprecated feature code

features/cellular/README.md

@@ -53,7 +53,6 @@ You can define the debug tracing level in the `mbed_app.json` configuration file
 
     "target_overrides": {
         "*": {
-            "target.features_add": ["COMMON_PAL"],
             "mbed-trace.enable": true,
             "platform.stdio-convert-newlines": true,
             "platform.stdio-baud-rate": 115200,

features/netsocket/cellular/generic_modem_driver/PPPCellularInterface.cpp

@@ -21,14 +21,8 @@
 #if MBED_CONF_PPP_CELL_IFACE_APN_LOOKUP
 #include "APN_db.h"
 #endif //MBED_CONF_PPP_CELL_IFACE_APN_LOOKUP
-#if defined(FEATURE_COMMON_PAL)
 #include "mbed_trace.h"
 #define TRACE_GROUP "UCID"
-#else
-#define tr_debug(...) (void(0)) //dummies if feature common pal is not added
-#define tr_info(...)  (void(0)) //dummies if feature common pal is not added
-#define tr_error(...) (void(0)) //dummies if feature common pal is not added
-#endif //defined(FEATURE_COMMON_PAL)
 
 /**
  * PDP (packet data profile) Context

features/netsocket/cellular/generic_modem_driver/TESTS/unit_tests/default/main.cpp

@@ -27,14 +27,8 @@
 #include "OnboardCellularInterface.h"
 #include "UDPSocket.h"
 #include "TCPSocket.h"
-#if defined(FEATURE_COMMON_PAL)
 #include "mbed_trace.h"
 #define TRACE_GROUP "TEST"
-#else
-#define tr_debug(...) (void(0)) //dummies if feature common pal is not added
-#define tr_info(...)  (void(0)) //dummies if feature common pal is not added
-#define tr_error(...) (void(0)) //dummies if feature common pal is not added
-#endif //defined(FEATURE_COMMON_PAL)
 
 using namespace utest::v1;
 

features/netsocket/cellular/generic_modem_driver/TESTS/unit_tests/default/template_mbed_app.txt

@@ -59,11 +59,10 @@
             "lwip.ethernet-enabled": false,
             "lwip.ppp-enabled": true,
             "lwip.tcp-enabled": true,
-            "target.features_add": ["LWIP", "COMMON_PAL"],
             "platform.stdio-convert-newlines": true,
             "platform.stdio-baud-rate": 115200,
-            "platform.default-serial-baud-rate": 115200, 
+            "platform.default-serial-baud-rate": 115200,
             "mbed-trace.enable": 1
         }
     }
-}
+}

tools/test/config/feature_compesition/lib1/mbed_lib.json

@@ -2,7 +2,7 @@
     "name": "lib1",
     "target_overrides": {
         "*": {
-            "target.features_add": ["IPV4"]
+            "target.features_add": ["BOOTLOADER"]
         }
     }
 }

tools/test/config/feature_compesition/test_data.json

@@ -1,5 +1,5 @@
 {
     "test_target": {
-        "expected_features": ["IPV4", "STORAGE"]
+        "expected_features": ["BOOTLOADER", "STORAGE"]
     }
 }

tools/test/config/feature_conflict/lib1/mbed_lib.json

@@ -2,7 +2,7 @@
     "name": "lib1",
     "target_overrides": {
         "*": {
-            "target.features_add": ["IPV4"]
+            "target.features_add": ["BOOTLOADER"]
         }
     }
 }

tools/test/config/feature_conflict/lib2/mbed_lib.json

@@ -2,7 +2,7 @@
     "name": "lib2",
     "target_overrides": {
         "*": {
-            "target.features_remove": ["IPV4"]
+            "target.features_remove": ["BOOTLOADER"]
         }
     }
 }

tools/test/config/feature_conflict/test_data.json

@@ -1,5 +1,5 @@
 {
     "K64F": {
-        "exception_msg": "Configuration conflict. The feature IPV4 both added and removed." 
+        "exception_msg": "Configuration conflict. The feature BOOTLOADER both added and removed."
     }
 }

tools/test/config/feature_recursive_add/mbed_app.json

@@ -1,7 +1,7 @@
 {
     "target_overrides": {
         "*": {
-            "target.features_add": ["IPV4"]
+            "target.features_add": ["BOOTLOADER"]
         }
     }
 }

tools/test/config/feature_recursive_add/test_data.json

@@ -1,5 +1,5 @@
 {
     "test_target": {
-        "expected_features": ["IPV4", "STORAGE"]
+        "expected_features": ["BOOTLOADER", "STORAGE"]
     }
 }

tools/test/config/feature_recursive_complex/mbed_app.json

@@ -1,7 +1,7 @@
 {
     "target_overrides": {
         "*": {
-            "target.features_add": ["IPV4"],
+            "target.features_add": ["BOOTLOADER"],
             "lib2.test": "GOOD"
         }
     }

tools/test/config/feature_recursive_conflict/FEATURE_STORAGE/FEATURE_BOOTLOADER/lib1/mbed_lib.json

@@ -0,0 +1,8 @@
+{
+    "name": "lib1",
+    "target_overrides": {
+        "*": {
+            "target.features_remove": ["STORAGE"]
+        }
+    }
+}

tools/test/config/feature_recursive_conflict/FEATURE_STORAGE/lib2/mbed_lib.json

@@ -0,0 +1,8 @@
+{
+    "name": "lib2",
+    "target_overrides": {
+        "*": {
+            "target.features_add": ["BOOTLOADER"]
+        }
+    }
+}

tools/test/config/feature_recursive_conflict/mbed_app.json

@@ -0,0 +1,7 @@
+{
+    "target_overrides": {
+        "*": {
+            "target.features_add": ["STORAGE"]
+        }
+    }
+}

tools/test/config/feature_recursive_conflict/test_data.json

@@ -0,0 +1,5 @@
+{
+    "K64F": {
+        "exception_msg": "Configuration conflict. The feature STORAGE both added and removed." 
+    }
+}

tools/test/config/feature_remove/lib1/mbed_lib.json

@@ -2,7 +2,7 @@
     "name": "lib1",
     "target_overrides": {
         "*": {
-            "target.features_remove": ["IPV4"]
+            "target.features_remove": ["BOOTLOADER"]
         }
     }
 }

tools/test/config/feature_remove/targets.json

@@ -3,7 +3,7 @@
         "supported_toolchains": ["GCC_ARM"],
         "core": "Cortex-M0",
         "extra_labels": [],
-        "features": ["IPV4"],
+        "features": ["BOOTLOADER"],
         "default_lib": "std"
     }
 }

tools/test/config/simple_features/mbed_app.json

@@ -1,7 +1,7 @@
 {
     "target_overrides": {
         "*": {
-            "target.features": ["IPV4"]
+            "target.features": ["BOOTLOADER"]
         }
     }
 }

tools/test/config/simple_features/test_data.json

@@ -1,5 +1,5 @@
 {
     "test_target": {
-        "expected_features": ["IPV4"]
+        "expected_features": ["BOOTLOADER"]
     }
 }