Skip to content

Commit 785dd10

Browse files
committed
Use Config class sector variable
1 parent 6f39d5a commit 785dd10

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

tools/config/__init__.py

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -549,8 +549,7 @@ def regions(self):
549549
if ('target.bootloader_img' in target_overrides or
550550
'target.restrict_size' in target_overrides):
551551
return self._generate_bootloader_build(target_overrides,
552-
rom_start, rom_size,
553-
self.sectors)
552+
rom_start, rom_size)
554553
elif ('target.mbed_app_start' in target_overrides or
555554
'target.mbed_app_size' in target_overrides):
556555
return self._generate_linker_overrides(target_overrides,
@@ -559,7 +558,7 @@ def regions(self):
559558
raise ConfigException(
560559
"Bootloader build requested but no bootlader configuration")
561560

562-
def _generate_bootloader_build(self, target_overrides, rom_start, rom_size, sectors):
561+
def _generate_bootloader_build(self, target_overrides, rom_start, rom_size):
563562
start = 0
564563
if 'target.bootloader_img' in target_overrides:
565564
basedir = abspath(dirname(self.app_config_location))
@@ -571,24 +570,24 @@ def _generate_bootloader_build(self, target_overrides, rom_start, rom_size, sect
571570
raise ConfigException("bootloader executable does not "
572571
"start at 0x%x" % rom_start)
573572
part_size = (part.maxaddr() - part.minaddr()) + 1
574-
start = Config._align_on_sector(rom_start + start, sectors) - rom_start
573+
start = Config._align_on_sector(rom_start + start, self.sectors) - rom_start
575574
offset = start + rom_start
576-
part_size = Config._align_on_sector(offset + part_size, sectors) - offset
575+
part_size = Config._align_on_sector(offset + part_size, self.sectors) - offset
577576
yield Region("bootloader", offset, part_size, False,
578577
filename)
579578
start += part_size
580579
if 'target.restrict_size' in target_overrides:
581580
new_size = int(target_overrides['target.restrict_size'], 0)
582-
start = Config._align_on_sector(rom_start + start, sectors) - rom_start
581+
start = Config._align_on_sector(rom_start + start, self.sectors) - rom_start
583582
offset = rom_start + start
584-
new_size = Config._align_on_sector(offset + new_size, sectors) - offset
583+
new_size = Config._align_on_sector(offset + new_size, self.sectors) - offset
585584
yield Region("application", offset, new_size, True, None)
586585
start += new_size
587-
start = Config._align_on_sector(rom_start + start, sectors) - rom_start
586+
start = Config._align_on_sector(rom_start + start, self.sectors) - rom_start
588587
yield Region("post_application", rom_start + start, rom_size - start,
589588
False, None)
590589
else:
591-
start = Config._align_on_sector(rom_start + start, sectors) - rom_start
590+
start = Config._align_on_sector(rom_start + start, self.sectors) - rom_start
592591
yield Region("application", rom_start + start, rom_size - start,
593592
True, None)
594593
if start > rom_size:

0 commit comments

Comments
 (0)