From e33706c12db5f4356fa36af96d3ce6e86bf297e9 Mon Sep 17 00:00:00 2001 From: Simo Sillankorva Date: Fri, 5 Oct 2018 03:15:24 -0700 Subject: [PATCH] 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. --- tools/config/__init__.py | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/tools/config/__init__.py b/tools/config/__init__.py index b60eeda2fa..91d4ad2ed7 100644 --- a/tools/config/__init__.py +++ b/tools/config/__init__.py @@ -785,7 +785,6 @@ class Config(object): rom_start, rom_size = rom_memories.get('ROM') start = rom_start rom_end = rom_start + rom_size - max_app_addr = None if self.target.bootloader_img: if isabs(self.target.bootloader_img): filename = self.target.bootloader_img @@ -803,12 +802,6 @@ class Config(object): part_size = part.segments()[0][1] - part.segments()[0][0] part_size = Config._align_ceiling(rom_start + part_size, self.sectors) - rom_start - if len(part.segments()) > 1 and part.segments()[1][0] < rom_end: - # assume first segment is at start (already checked earlier as segments are returned in order) - # second at the end or outside ROM - # rest outside regular ROM - max_app_addr = part.segments()[1][0] - yield Region("bootloader", rom_start, part_size, False, filename) start = rom_start + part_size @@ -820,13 +813,6 @@ class Config(object): start, self.target.header_format) yield region._replace(filename=self.target.header_format) - if max_app_addr is not None and self.target.restrict_size is None: - # Multipart bootloader restricts the app size - if self.target.app_offset: - self.target.restrict_size = "0x%x" % (max_app_addr - int(self.target.app_offset, 0)) - else: - self.target.restrict_size = "0x%x" % (max_app_addr - start) - if self.target.restrict_size is not None: new_size = int(self.target.restrict_size, 0) new_size = Config._align_floor(start + new_size, self.sectors) - start