diff --git a/tools/config.py b/tools/config.py index 91a35542e6..c95b0206c7 100644 --- a/tools/config.py +++ b/tools/config.py @@ -249,20 +249,20 @@ class Config: # If the label is defined by the target or it has the special value "*", process the overrides if (label == '*') or (label in self.target_labels): # Parse out features - if 'features' in overrides: - features = overrides['features'] - self.remove_features(list(set(self.added_features) - set(features))) + if 'target.features' in overrides: + features = overrides['target.features'] + self.remove_features(self.added_features - set(features)) self.add_features(features) self.removed_unecessary_features = True - del overrides['features'] + del overrides['target.features'] - if 'features_add' in overrides: - self.add_features(overrides['features_add']) - del overrides['features_add'] + if 'target.features_add' in overrides: + self.add_features(overrides['target.features_add']) + del overrides['target.features_add'] - if 'features_remove' in overrides: - self.remove_features(overrides['features_remove']) - del overrides['features_remove'] + if 'target.features_remove' in overrides: + self.remove_features(overrides['target.features_remove']) + del overrides['target.features_remove'] # Consider the others as overrides for name, v in overrides.items(): diff --git a/tools/test/config_test/test21/mbed_app.json b/tools/test/config_test/test21/mbed_app.json index cb3c7ed133..d1a874a23d 100644 --- a/tools/test/config_test/test21/mbed_app.json +++ b/tools/test/config_test/test21/mbed_app.json @@ -1,7 +1,7 @@ { "target_overrides": { "*": { - "features": ["IPV4", "IPV6"] + "target.features": ["IPV4", "IPV6"] } } } diff --git a/tools/test/config_test/test22/lib1/mbed_lib.json b/tools/test/config_test/test22/lib1/mbed_lib.json index b35e4d56c0..07e6e626b5 100644 --- a/tools/test/config_test/test22/lib1/mbed_lib.json +++ b/tools/test/config_test/test22/lib1/mbed_lib.json @@ -2,7 +2,7 @@ "name": "lib1", "target_overrides": { "*": { - "features_add": ["IPV4"] + "target.features_add": ["IPV4"] } } } diff --git a/tools/test/config_test/test22/mbed_app.json b/tools/test/config_test/test22/mbed_app.json index d5126abf78..a070a2d556 100644 --- a/tools/test/config_test/test22/mbed_app.json +++ b/tools/test/config_test/test22/mbed_app.json @@ -1,7 +1,7 @@ { "target_overrides": { "*": { - "features_add": ["IPV6"] + "target.features_add": ["IPV6"] } } } diff --git a/tools/test/config_test/test23/lib1/mbed_lib.json b/tools/test/config_test/test23/lib1/mbed_lib.json index b35e4d56c0..07e6e626b5 100644 --- a/tools/test/config_test/test23/lib1/mbed_lib.json +++ b/tools/test/config_test/test23/lib1/mbed_lib.json @@ -2,7 +2,7 @@ "name": "lib1", "target_overrides": { "*": { - "features_add": ["IPV4"] + "target.features_add": ["IPV4"] } } } diff --git a/tools/test/config_test/test23/lib2/mbed_lib.json b/tools/test/config_test/test23/lib2/mbed_lib.json index 6215ff57d7..c635513a56 100644 --- a/tools/test/config_test/test23/lib2/mbed_lib.json +++ b/tools/test/config_test/test23/lib2/mbed_lib.json @@ -2,7 +2,7 @@ "name": "lib2", "target_overrides": { "*": { - "features_remove": ["IPV4"] + "target.features_remove": ["IPV4"] } } } diff --git a/tools/test/config_test/test23/mbed_app.json b/tools/test/config_test/test23/mbed_app.json index d5126abf78..a070a2d556 100644 --- a/tools/test/config_test/test23/mbed_app.json +++ b/tools/test/config_test/test23/mbed_app.json @@ -1,7 +1,7 @@ { "target_overrides": { "*": { - "features_add": ["IPV6"] + "target.features_add": ["IPV6"] } } } diff --git a/tools/test/config_test/test24/FEATURE_IPV4/lib1/mbed_lib.json b/tools/test/config_test/test24/FEATURE_IPV4/lib1/mbed_lib.json index 6b23b3450a..539d8ccc22 100644 --- a/tools/test/config_test/test24/FEATURE_IPV4/lib1/mbed_lib.json +++ b/tools/test/config_test/test24/FEATURE_IPV4/lib1/mbed_lib.json @@ -2,7 +2,7 @@ "name": "lib1", "target_overrides": { "*": { - "features_add": ["IPV6"] + "target.features_add": ["IPV6"] } } } diff --git a/tools/test/config_test/test24/FEATURE_IPV6/lib2/mbed_lib.json b/tools/test/config_test/test24/FEATURE_IPV6/lib2/mbed_lib.json index 6acafdcdc8..73b57765aa 100644 --- a/tools/test/config_test/test24/FEATURE_IPV6/lib2/mbed_lib.json +++ b/tools/test/config_test/test24/FEATURE_IPV6/lib2/mbed_lib.json @@ -2,7 +2,7 @@ "name": "lib2", "target_overrides": { "*": { - "features_add": ["UVISOR"] + "target.features_add": ["UVISOR"] } } } diff --git a/tools/test/config_test/test24/mbed_app.json b/tools/test/config_test/test24/mbed_app.json index 58a9d08845..56af1f5284 100644 --- a/tools/test/config_test/test24/mbed_app.json +++ b/tools/test/config_test/test24/mbed_app.json @@ -1,7 +1,7 @@ { "target_overrides": { "*": { - "features_add": ["IPV4"] + "target.features_add": ["IPV4"] } } } diff --git a/tools/test/config_test/test25/FEATURE_IPV6/FEATURE_IPV4/lib1/mbed_lib.json b/tools/test/config_test/test25/FEATURE_IPV6/FEATURE_IPV4/lib1/mbed_lib.json index 6b23b3450a..539d8ccc22 100644 --- a/tools/test/config_test/test25/FEATURE_IPV6/FEATURE_IPV4/lib1/mbed_lib.json +++ b/tools/test/config_test/test25/FEATURE_IPV6/FEATURE_IPV4/lib1/mbed_lib.json @@ -2,7 +2,7 @@ "name": "lib1", "target_overrides": { "*": { - "features_add": ["IPV6"] + "target.features_add": ["IPV6"] } } } diff --git a/tools/test/config_test/test25/FEATURE_IPV6/lib2/mbed_lib.json b/tools/test/config_test/test25/FEATURE_IPV6/lib2/mbed_lib.json index 6acafdcdc8..73b57765aa 100644 --- a/tools/test/config_test/test25/FEATURE_IPV6/lib2/mbed_lib.json +++ b/tools/test/config_test/test25/FEATURE_IPV6/lib2/mbed_lib.json @@ -2,7 +2,7 @@ "name": "lib2", "target_overrides": { "*": { - "features_add": ["UVISOR"] + "target.features_add": ["UVISOR"] } } } diff --git a/tools/test/config_test/test25/mbed_app.json b/tools/test/config_test/test25/mbed_app.json index cb3c7ed133..d1a874a23d 100644 --- a/tools/test/config_test/test25/mbed_app.json +++ b/tools/test/config_test/test25/mbed_app.json @@ -1,7 +1,7 @@ { "target_overrides": { "*": { - "features": ["IPV4", "IPV6"] + "target.features": ["IPV4", "IPV6"] } } } diff --git a/tools/test/config_test/test26/FEATURE_IPV4/lib1/mbed_lib.json b/tools/test/config_test/test26/FEATURE_IPV4/lib1/mbed_lib.json index 6b23b3450a..539d8ccc22 100644 --- a/tools/test/config_test/test26/FEATURE_IPV4/lib1/mbed_lib.json +++ b/tools/test/config_test/test26/FEATURE_IPV4/lib1/mbed_lib.json @@ -2,7 +2,7 @@ "name": "lib1", "target_overrides": { "*": { - "features_add": ["IPV6"] + "target.features_add": ["IPV6"] } } } diff --git a/tools/test/config_test/test26/mbed_app.json b/tools/test/config_test/test26/mbed_app.json index 92331b1f62..1d926c1abe 100644 --- a/tools/test/config_test/test26/mbed_app.json +++ b/tools/test/config_test/test26/mbed_app.json @@ -1,7 +1,7 @@ { "target_overrides": { "*": { - "features_add": ["IPV4"], + "target.features_add": ["IPV4"], "lib2.test": "GOOD" } }