ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Correct calls to merge_region_list

pull/10021/head
Brian Daniels 2019-03-11 10:43:25 -05:00
parent ae344342d1
commit bbef60fbf2
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/export/uvision/postbuild.py
View File

@ -87,7 +87,9 @@ if __name__ == "__main__":
notify = TerminalNotifier() notify = TerminalNotifier()
restrict_size = export_info_data.get("target", {}).get("restrict_size") restrict_size = export_info_data.get("target", {}).get("restrict_size")
merge_region_list(region_list, combined_hex_file, notify, restrict_size) merge_region_list(
region_list, combined_hex_file, notify, restrict_size=restrict_size
)
update_regions = [ update_regions = [
r for r in region_list if r.name in UPDATE_WHITELIST r for r in region_list if r.name in UPDATE_WHITELIST
@ -100,6 +102,8 @@ if __name__ == "__main__":
generate_update_filename(output_name, None) generate_update_filename(output_name, None)
) )
) )
merge_region_list(update_regions, update_res, notify, restrict_size) merge_region_list(
update_regions, update_res, notify, restrict_size=restrict_size
)
sys.exit(0) sys.exit(0)

5
tools/toolchains/mbed_toolchain.py
View File

@ -664,7 +664,8 @@ class mbedToolchain:
for r in region_list] for r in region_list]
res = "{}.{}".format(join(self.build_dir, name), ext) res = "{}.{}".format(join(self.build_dir, name), ext)
merge_region_list( merge_region_list(
region_list, res, self.notify, self.config.target.restrict_size region_list, res, self.notify,
restrict_size=self.config.target.restrict_size
) )
update_regions = [ update_regions = [
r for r in region_list if r.name in UPDATE_WHITELIST r for r in region_list if r.name in UPDATE_WHITELIST
@ -678,7 +679,7 @@ class mbedToolchain:
update_regions, update_regions,
update_res, update_res,
self.notify, self.notify,
self.config.target.restrict_size restrict_size=self.config.target.restrict_size
) )
return res, update_res return res, update_res
else: else: