Skip to content

Commit 58330fb

Browse files
committed
Treat start variable as addrss in generate_bootloader_build
Correct spacing.
1 parent 623b171 commit 58330fb

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

tools/config/__init__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -545,11 +545,11 @@ def regions(self):
545545
rom_start = int(cmsis_part['memory']['PROGRAM_FLASH']['start'], 0)
546546
except KeyError:
547547
raise ConfigException("Not enough information in CMSIS packs to "
548-
"build a bootloader project")
548+
"build a bootloader project")
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)
552+
rom_start, rom_size)
553553
elif ('target.mbed_app_start' in target_overrides or
554554
'target.mbed_app_size' in target_overrides):
555555
return self._generate_linker_overrides(target_overrides,
@@ -559,7 +559,7 @@ def regions(self):
559559
"Bootloader build requested but no bootlader configuration")
560560

561561
def _generate_bootloader_build(self, target_overrides, rom_start, rom_size):
562-
start = 0
562+
start = rom_start
563563
if 'target.bootloader_img' in target_overrides:
564564
basedir = abspath(dirname(self.app_config_location))
565565
filename = join(basedir, target_overrides['target.bootloader_img'])
@@ -579,7 +579,7 @@ def _generate_bootloader_build(self, target_overrides, rom_start, rom_size):
579579
new_size = Config._align_floor(start + new_size, self.sectors) - start
580580
yield Region("application", start, new_size, True, None)
581581
start += new_size
582-
yield Region("post_application", rom_start + start, rom_size - start,
582+
yield Region("post_application", start, rom_size - start,
583583
False, None)
584584
else:
585585
yield Region("application", start, rom_size - start,

0 commit comments

Comments
 (0)