Skip to content

Commit

Permalink
Fix imgtool import for CYTFM_064B0S2_4343W signing
Browse files Browse the repository at this point in the history
Fixes: #14153

The target CYTFM_064B0S2_4343W is signed using `cysecuretools` which
depends on `imgtool` managed by `pip`. However, Arm Musca targets
requires a modified/wrapped version of the image tool copied from
trusted-firmware-m + MCUboot.

To avoid conflicts in the version of `imgtool` used, we should only
add the copied version of `imgtool` to python's system path for
Musca targets instead of doing it globally for all targets.
  • Loading branch information
LDong-Arm committed Mar 3, 2021
1 parent 76b2902 commit 5ef82f5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
5 changes: 5 additions & 0 deletions tools/targets/ARM_MUSCA.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@
from os.path import join as path_join
import re
import subprocess
import sys

# Add PSA TF-M binary utility scripts in system path
TFM_SCRIPTS = abspath(path_join(dirname(__file__), '..', 'psa', 'tfm', 'bin_utils'))
sys.path.insert(0, TFM_SCRIPTS)

SCRIPT_DIR = dirname(abspath(__file__))
MBED_OS_ROOT = abspath(path_join(SCRIPT_DIR, os.pardir, os.pardir))
Expand Down
6 changes: 1 addition & 5 deletions tools/targets/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,13 @@
from collections import namedtuple
from copy import copy
from future.utils import raise_from
from os.path import dirname, abspath, join
from tools.resources import FileType
from tools.settings import ROOT
from tools.targets.LPC import patch
from tools.paths import TOOLS_BOOTLOADERS
from tools.utils import json_file_to_dict, NotSupportedException

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


__all__ = ["target", "TARGETS", "TARGET_MAP", "TARGET_NAMES", "CORE_LABELS",
"CORE_ARCH", "HookError", "generate_py_target", "Target",
Expand Down

0 comments on commit 5ef82f5

Please sign in to comment.