Merge pull request #10448 from fredlee12001/master

Size should be calculate after confirm the final start address
pull/10512/head
Martin Kojtal 2019-04-30 09:46:39 +01:00 committed by GitHub
commit 8a92271a3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions

View File

@ -980,11 +980,6 @@ class Config(object):
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(
rom_start,
@ -992,6 +987,10 @@ class Config(object):
"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