Merge pull request #1805 from sg-/move-target-json

move target description from tools into hal where the target code lives
ARMmbed · May 28, 2016 · 3055b28 · 3055b28
2 parents a7ff058 + d94627e
commit 3055b28
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/workspace_tools/targets.json → hal/targets.json b/workspace_tools/targets.json → hal/targets.json
diff --git a/workspace_tools/targets.py b/workspace_tools/targets.py
@@ -79,7 +79,7 @@ def to_ascii(input):
     @staticmethod
     @cached
     def get_json_target_data():
-        with open(os.path.join(os.path.dirname(os.path.abspath(__file__)), "targets.json"), "rt") as f:
+        with open(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../hal/targets.json"), "rt") as f:
             return Target.to_ascii(json.load(f))
 
     # Get the members of this module using Python's "inspect" module