Skip to content

Commit 8a19e3e

Browse files
authored
Merge pull request #14362 from LDong-Arm/cypress_signing_fix
Fix imgtool import for CYTFM_064B0S2_4343W signing
2 parents 1712f66 + 5ef82f5 commit 8a19e3e

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

tools/targets/ARM_MUSCA.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@
2020
from os.path import join as path_join
2121
import re
2222
import subprocess
23+
import sys
24+
25+
# Add PSA TF-M binary utility scripts in system path
26+
TFM_SCRIPTS = abspath(path_join(dirname(__file__), '..', 'psa', 'tfm', 'bin_utils'))
27+
sys.path.insert(0, TFM_SCRIPTS)
2328

2429
SCRIPT_DIR = dirname(abspath(__file__))
2530
MBED_OS_ROOT = abspath(path_join(SCRIPT_DIR, os.pardir, os.pardir))

tools/targets/__init__.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,13 @@
2626
from collections import namedtuple
2727
from copy import copy
2828
from future.utils import raise_from
29+
from os.path import dirname, abspath, join
2930
from tools.resources import FileType
3031
from tools.settings import ROOT
3132
from tools.targets.LPC import patch
3233
from tools.paths import TOOLS_BOOTLOADERS
3334
from tools.utils import json_file_to_dict, NotSupportedException
3435

35-
# Add PSA TF-M binary utility scripts in system path
36-
from os.path import dirname, abspath, join
37-
TFM_SCRIPTS = abspath(join(dirname(__file__), '..', 'psa', 'tfm', 'bin_utils'))
38-
sys.path.insert(0, TFM_SCRIPTS)
39-
4036

4137
__all__ = ["target", "TARGETS", "TARGET_MAP", "TARGET_NAMES", "CORE_LABELS",
4238
"CORE_ARCH", "HookError", "generate_py_target", "Target",

0 commit comments

Comments
 (0)