Skip to content

Commit 8784913

Browse files
authored
Merge pull request #3995 from theotherjimmy/targets-refactor
Move target related code into it's own directory
2 parents 9875c29 + f590dc1 commit 8784913

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed
File renamed without changes.
File renamed without changes.

tools/targets.py renamed to tools/targets/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import sys
2424
from copy import copy
2525
from collections import namedtuple
26-
from tools.patch import patch
26+
from tools.targets.LPC import patch
2727
from tools.paths import TOOLS_BOOTLOADERS
2828
from tools.utils import json_file_to_dict
2929

@@ -121,7 +121,7 @@ class Target(namedtuple("Target", "name json_data resolution_order resolution_or
121121

122122
# Default location of the 'targets.json' file
123123
__targets_json_location_default = os.path.join(
124-
os.path.dirname(os.path.abspath(__file__)), '..', 'targets', 'targets.json')
124+
os.path.dirname(os.path.abspath(__file__)), '..', '..', 'targets', 'targets.json')
125125

126126
# Current/new location of the 'targets.json' file
127127
__targets_json_location = None
@@ -494,7 +494,7 @@ def binary_hook(t_self, resources, _, binf):
494494
class NCS36510TargetCode:
495495
@staticmethod
496496
def ncs36510_addfib(t_self, resources, elf, binf):
497-
from tools.add_fib import add_fib_at_start
497+
from tools.targets.NCS import add_fib_at_start
498498
print("binf ", binf)
499499
add_fib_at_start(binf[:-4])
500500
################################################################################

0 commit comments

Comments
 (0)