Merge pull request #8685 from bridadan/clean_up_deprecated_feature_code

Cruz Monrreal · web-flow · commit fa2077df4199 · 2018-11-15T17:05:22.000-06:00
Clean up deprecated feature code
diff --git a/features/cellular/README.md b/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,
diff --git a/features/netsocket/cellular/generic_modem_driver/PPPCellularInterface.cpp b/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
diff --git a/features/netsocket/cellular/generic_modem_driver/TESTS/unit_tests/default/main.cpp b/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;
 
diff --git a/features/netsocket/cellular/generic_modem_driver/TESTS/unit_tests/default/template_mbed_app.txt b/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
         }
     }
-}
+}
diff --git a/tools/test/config/feature_compesition/lib1/mbed_lib.json b/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"]
         }
     }
 }
diff --git a/tools/test/config/feature_compesition/test_data.json b/tools/test/config/feature_compesition/test_data.json
@@ -1,5 +1,5 @@
 {
     "test_target": {
-        "expected_features": ["IPV4", "STORAGE"]
+        "expected_features": ["BOOTLOADER", "STORAGE"]
     }
 }
diff --git a/tools/test/config/feature_conflict/lib1/mbed_lib.json b/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"]
         }
     }
 }
diff --git a/tools/test/config/feature_conflict/lib2/mbed_lib.json b/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"]
         }
     }
 }
diff --git a/tools/test/config/feature_conflict/test_data.json b/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."
     }
 }
diff --git a/tools/test/config/feature_recursive_add/FEATURE_BOOTLOADER/lib1/mbed_lib.json b/tools/test/config/feature_recursive_add/FEATURE_BOOTLOADER/lib1/mbed_lib.json
diff --git a/tools/test/config/feature_recursive_add/mbed_app.json b/tools/test/config/feature_recursive_add/mbed_app.json
@@ -1,7 +1,7 @@
 {
     "target_overrides": {
         "*": {
-            "target.features_add": ["IPV4"]
+            "target.features_add": ["BOOTLOADER"]
         }
     }
 }
diff --git a/tools/test/config/feature_recursive_add/test_data.json b/tools/test/config/feature_recursive_add/test_data.json
@@ -1,5 +1,5 @@
 {
     "test_target": {
-        "expected_features": ["IPV4", "STORAGE"]
+        "expected_features": ["BOOTLOADER", "STORAGE"]
     }
 }
diff --git a/tools/test/config/feature_recursive_complex/FEATURE_BOOTLOADER/lib1/mbed_lib.json b/tools/test/config/feature_recursive_complex/FEATURE_BOOTLOADER/lib1/mbed_lib.json
diff --git a/tools/test/config/feature_recursive_complex/mbed_app.json b/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"
         }
     }
diff --git a/tools/test/config/feature_recursive_conflict/FEATURE_STORAGE/FEATURE_BOOTLOADER/lib1/mbed_lib.json b/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"]
+        }
+    }
+}
diff --git a/tools/test/config/feature_recursive_conflict/FEATURE_STORAGE/lib2/mbed_lib.json b/tools/test/config/feature_recursive_conflict/FEATURE_STORAGE/lib2/mbed_lib.json
@@ -0,0 +1,8 @@
+{
+    "name": "lib2",
+    "target_overrides": {
+        "*": {
+            "target.features_add": ["BOOTLOADER"]
+        }
+    }
+}
diff --git a/tools/test/config/feature_recursive_conflict/mbed_app.json b/tools/test/config/feature_recursive_conflict/mbed_app.json
@@ -0,0 +1,7 @@
+{
+    "target_overrides": {
+        "*": {
+            "target.features_add": ["STORAGE"]
+        }
+    }
+}
diff --git a/tools/test/config/feature_recursive_conflict/test_data.json b/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." 
+    }
+}
diff --git a/tools/test/config/feature_remove/lib1/mbed_lib.json b/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"]
         }
     }
 }
diff --git a/tools/test/config/feature_remove/targets.json b/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"
     }
 }
diff --git a/tools/test/config/simple_features/mbed_app.json b/tools/test/config/simple_features/mbed_app.json
@@ -1,7 +1,7 @@
 {
     "target_overrides": {
         "*": {
-            "target.features": ["IPV4"]
+            "target.features": ["BOOTLOADER"]
         }
     }
 }
diff --git a/tools/test/config/simple_features/test_data.json b/tools/test/config/simple_features/test_data.json
@@ -1,5 +1,5 @@
 {
     "test_target": {
-        "expected_features": ["IPV4"]
+        "expected_features": ["BOOTLOADER"]
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -59,11 +59,10 @@`
`59`	`59`	`"lwip.ethernet-enabled": false,`
`60`	`60`	`"lwip.ppp-enabled": true,`
`61`	`61`	`"lwip.tcp-enabled": true,`
`62`		`- "target.features_add": ["LWIP", "COMMON_PAL"],`
`63`	`62`	`"platform.stdio-convert-newlines": true,`
`64`	`63`	`"platform.stdio-baud-rate": 115200,`
`65`		`- "platform.default-serial-baud-rate": 115200,`
	`64`	`+ "platform.default-serial-baud-rate": 115200,`
`66`	`65`	`"mbed-trace.enable": 1`
`67`	`66`	`}`
`68`	`67`	`}`
`69`		`-}`
	`68`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"name": "lib1",`
`3`	`3`	`"target_overrides": {`
`4`	`4`	`"*": {`
`5`		`- "target.features_add": ["IPV4"]`
	`5`	`+ "target.features_add": ["BOOTLOADER"]`
`6`	`6`	`}`
`7`	`7`	`}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"test_target": {`
`3`		`- "expected_features": ["IPV4", "STORAGE"]`
	`3`	`+ "expected_features": ["BOOTLOADER", "STORAGE"]`
`4`	`4`	`}`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"name": "lib2",`
`3`	`3`	`"target_overrides": {`
`4`	`4`	`"*": {`
`5`		`- "target.features_remove": ["IPV4"]`
	`5`	`+ "target.features_remove": ["BOOTLOADER"]`
`6`	`6`	`}`
`7`	`7`	`}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"K64F": {`
`3`		`- "exception_msg": "Configuration conflict. The feature IPV4 both added and removed."`
	`3`	`+ "exception_msg": "Configuration conflict. The feature BOOTLOADER both added and removed."`
`4`	`4`	`}`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"target_overrides": {`
`3`	`3`	`"*": {`
`4`		`- "target.features_add": ["IPV4"]`
	`4`	`+ "target.features_add": ["BOOTLOADER"]`
`5`	`5`	`}`
`6`	`6`	`}`
`7`	`7`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +{
 +    "target_overrides": {
 +        "*": {
 +            "target.features_add": ["STORAGE"]
 +        }
 +    }
 +}
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"supported_toolchains": ["GCC_ARM"],`
`4`	`4`	`"core": "Cortex-M0",`
`5`	`5`	`"extra_labels": [],`
`6`		`- "features": ["IPV4"],`
	`6`	`+ "features": ["BOOTLOADER"],`
`7`	`7`	`"default_lib": "std"`
`8`	`8`	`}`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"test_target": {`
`3`		`- "expected_features": ["IPV4"]`
	`3`	`+ "expected_features": ["BOOTLOADER"]`
`4`	`4`	`}`
`5`	`5`	`}`