Skip to content

Commit 7e4000c

Browse files
committed
To be squashed: Revert find_cm0_image() changes
1 parent 161376a commit 7e4000c

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

tools/targets/PSOC6.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,18 +137,18 @@ def complete_func(message_func, elf0, hexf0, hexf1=None, dest=None):
137137

138138

139139
# Find Cortex M0 image.
140-
def find_cm0_image(message_func, resources, m0hex_filename):
141-
if m0hex_filename is None:
140+
def find_cm0_image(toolchain, resources, elf, hexf, hex_filename):
141+
if hex_filename is None:
142142
return None
143143
# Locate user-specified image
144144
from tools.resources import FileType
145145
hex_files = resources.get_file_paths(FileType.HEX)
146-
m0hexf = next((f for f in hex_files if os.path.basename(f) == m0hex_filename), None)
146+
m0hexf = next((f for f in hex_files if os.path.basename(f) == hex_filename), None)
147147

148148
if m0hexf:
149-
message_func("M0 core image file found: %s." % m0hexf)
149+
toolchain.notify.info("M0 core image file found: %s." % m0hexf)
150150
else:
151-
message_func("M0 core hex image file %s not found. Aborting." % m0hex_filename)
151+
toolchain.notify.info("M0 core hex image file %s not found. Aborting." % hex_filename)
152152
raise ConfigException("Required M0 core hex image not found.")
153153

154154
return m0hexf

0 commit comments

Comments
 (0)