Skip to content

Commit 2a080a0

Browse files
committed
Correct call to add_file_ref
1 parent 3b9baf9 commit 2a080a0

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

tools/export/makefile/__init__.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -272,10 +272,14 @@ def generate(self):
272272
if self.resources.linker_script:
273273
sct_file = self.resources.get_file_refs(FileType.LD_SCRIPT)[-1]
274274
new_script = self.toolchain.correct_scatter_shebang(
275-
sct_file, dirname(sct_file.name))
275+
sct_file, dirname(sct_file.name)
276+
)
276277
if new_script is not sct_file:
277-
self.resources.add_files_to_type(
278-
FileType.LD_SCRIPT, [new_script])
278+
self.resources.add_file_ref(
279+
FileType.LD_SCRIPT,
280+
new_script.name,
281+
new_script.path
282+
)
279283
return super(Arm, self).generate()
280284

281285
class Armc5(Arm):

tools/toolchains/arm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ def correct_scatter_shebang(self, sc_fileref, cur_dir_name=None):
284284
scatter file
285285
286286
Return:
287-
The location of the correct scatter file
287+
The FileRef of the correct scatter file
288288
289289
Side Effects:
290290
This method MAY write a new scatter file to disk

0 commit comments

Comments
 (0)