Review fixes for bootloader region generation

Author: Jammu Kekkonen

tools/config/__init__.py

@@ -698,7 +698,7 @@ def _assign_new_offset(rom_start, start, new_offset, region_name):
     def _generate_bootloader_build(self, rom_start, rom_size):
         start = rom_start
         rom_end = rom_start + rom_size
-        max_app_addr = -1
+        max_app_addr = None
         if self.target.bootloader_img:
             if isabs(self.target.bootloader_img):
                 filename = self.target.bootloader_img
@@ -718,15 +718,12 @@ def _generate_bootloader_build(self, rom_start, rom_size):
                 # assume first segment is at start
                 # second at the end or outside ROM
                 # rest outside regular ROM
-                if part.segments()[0][0] != 0x0:
+                if part.segments()[0][0] != rom_start:
                     raise ConfigException("bootloader segments not in order")
                 part_size = part.segments()[0][1] - part.segments()[0][0]
                 part_size = Config._align_ceiling(rom_start + part_size, self.sectors) - rom_start
-                if part.segments()[1][0] < rom_end and self.target.restrict_size is None:
-                    if self.target.app_offset:
-                        self.target.restrict_size = "0x%x" % (part.segments()[1][0] - int(self.target.app_offset, 0))
-                    else:
-                        max_app_addr = part.segments()[1][0]
+                if part.segments()[1][0] < rom_end:
+                    max_app_addr = part.segments()[1][0]
 
             yield Region("bootloader", rom_start, part_size, False,
                          filename)
@@ -739,8 +736,12 @@ def _generate_bootloader_build(self, rom_start, rom_size):
                     start, self.target.header_format)
                 yield region._replace(filename=self.target.header_format)
 
-            if max_app_addr != -1 and self.target.restrict_size is None and not self.target.app_offset:
-                self.target.restrict_size = "0x%x" % (max_app_addr - start)
+            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)