From 7941d34e35295d3f8ba91af003f8025a713216a9 Mon Sep 17 00:00:00 2001 From: "fred.li" Date: Mon, 22 Apr 2019 11:50:38 +0800 Subject: [PATCH 1/2] Size should be calculate after confirm the start address --- tools/config/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/config/__init__.py b/tools/config/__init__.py index 996c9a40988..824b4fa18f0 100755 --- a/tools/config/__init__.py +++ b/tools/config/__init__.py @@ -980,10 +980,6 @@ def _generate_bootloader_build(self, rom_memories): yield region._replace(filename=self.target.header_format) 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 if self.target.app_offset: start = self._assign_new_offset( @@ -992,6 +988,10 @@ def _generate_bootloader_build(self, rom_memories): "application", regions ) + new_size = int(self.target.restrict_size, 0) + new_size = Config._align_floor( + start + new_size, self.sectors + ) - start yield Region("application", start, new_size, True, None) start += new_size From 38e088eaddf329301676f52c1efb5afffe764122 Mon Sep 17 00:00:00 2001 From: "fred.li" Date: Thu, 25 Apr 2019 09:56:52 +0800 Subject: [PATCH 2/2] remove blank line --- tools/config/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/config/__init__.py b/tools/config/__init__.py index 824b4fa18f0..771ea071429 100755 --- a/tools/config/__init__.py +++ b/tools/config/__init__.py @@ -980,7 +980,6 @@ def _generate_bootloader_build(self, rom_memories): yield region._replace(filename=self.target.header_format) if self.target.restrict_size is not None: - if self.target.app_offset: start = self._assign_new_offset( rom_start,