Skip to content

Commit fac5ff4

Browse files
Remove max_app_addr checking from .hex
* Remove max_app_addr logic from tools/config/__init__.py as it was not working properly with some of the .hex files.
1 parent c069cef commit fac5ff4

File tree

1 file changed

+0
-14
lines changed

1 file changed

+0
-14
lines changed

tools/config/__init__.py

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,6 @@ def _assign_new_offset(rom_start, start, new_offset, region_name):
698698
def _generate_bootloader_build(self, rom_start, rom_size):
699699
start = rom_start
700700
rom_end = rom_start + rom_size
701-
max_app_addr = None
702701
if self.target.bootloader_img:
703702
if isabs(self.target.bootloader_img):
704703
filename = self.target.bootloader_img
@@ -716,12 +715,6 @@ def _generate_bootloader_build(self, rom_start, rom_size):
716715
part_size = part.segments()[0][1] - part.segments()[0][0]
717716
part_size = Config._align_ceiling(rom_start + part_size, self.sectors) - rom_start
718717

719-
if len(part.segments()) > 1 and part.segments()[1][0] < rom_end:
720-
# assume first segment is at start (already checked earlier as segments are returned in order)
721-
# second at the end or outside ROM
722-
# rest outside regular ROM
723-
max_app_addr = part.segments()[1][0]
724-
725718
yield Region("bootloader", rom_start, part_size, False,
726719
filename)
727720
start = rom_start + part_size
@@ -733,13 +726,6 @@ def _generate_bootloader_build(self, rom_start, rom_size):
733726
start, self.target.header_format)
734727
yield region._replace(filename=self.target.header_format)
735728

736-
if max_app_addr is not None and self.target.restrict_size is None:
737-
# Multipart bootloader restricts the app size
738-
if self.target.app_offset:
739-
self.target.restrict_size = "0x%x" % (max_app_addr - int(self.target.app_offset, 0))
740-
else:
741-
self.target.restrict_size = "0x%x" % (max_app_addr - start)
742-
743729
if self.target.restrict_size is not None:
744730
new_size = int(self.target.restrict_size, 0)
745731
new_size = Config._align_floor(start + new_size, self.sectors) - start

0 commit comments

Comments
 (0)