From 785dd100cf7f8ed69a2aae0615c36760999f86d7 Mon Sep 17 00:00:00 2001 From: sarahmarshy Date: Thu, 11 Jan 2018 14:46:52 -0600 Subject: [PATCH] Use Config class sector variable --- tools/config/__init__.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/tools/config/__init__.py b/tools/config/__init__.py index e47fa74a3c..9eb7a568ca 100644 --- a/tools/config/__init__.py +++ b/tools/config/__init__.py @@ -549,8 +549,7 @@ class Config(object): if ('target.bootloader_img' in target_overrides or 'target.restrict_size' in target_overrides): return self._generate_bootloader_build(target_overrides, - rom_start, rom_size, - self.sectors) + rom_start, rom_size) elif ('target.mbed_app_start' in target_overrides or 'target.mbed_app_size' in target_overrides): return self._generate_linker_overrides(target_overrides, @@ -559,7 +558,7 @@ class Config(object): raise ConfigException( "Bootloader build requested but no bootlader configuration") - def _generate_bootloader_build(self, target_overrides, rom_start, rom_size, sectors): + def _generate_bootloader_build(self, target_overrides, rom_start, rom_size): start = 0 if 'target.bootloader_img' in target_overrides: basedir = abspath(dirname(self.app_config_location)) @@ -571,24 +570,24 @@ class Config(object): raise ConfigException("bootloader executable does not " "start at 0x%x" % rom_start) part_size = (part.maxaddr() - part.minaddr()) + 1 - start = Config._align_on_sector(rom_start + start, sectors) - rom_start + start = Config._align_on_sector(rom_start + start, self.sectors) - rom_start offset = start + rom_start - part_size = Config._align_on_sector(offset + part_size, sectors) - offset + part_size = Config._align_on_sector(offset + part_size, self.sectors) - offset yield Region("bootloader", offset, part_size, False, filename) start += part_size if 'target.restrict_size' in target_overrides: new_size = int(target_overrides['target.restrict_size'], 0) - start = Config._align_on_sector(rom_start + start, sectors) - rom_start + start = Config._align_on_sector(rom_start + start, self.sectors) - rom_start offset = rom_start + start - new_size = Config._align_on_sector(offset + new_size, sectors) - offset + new_size = Config._align_on_sector(offset + new_size, self.sectors) - offset yield Region("application", offset, new_size, True, None) start += new_size - start = Config._align_on_sector(rom_start + start, sectors) - rom_start + start = Config._align_on_sector(rom_start + start, self.sectors) - rom_start yield Region("post_application", rom_start + start, rom_size - start, False, None) else: - start = Config._align_on_sector(rom_start + start, sectors) - rom_start + start = Config._align_on_sector(rom_start + start, self.sectors) - rom_start yield Region("application", rom_start + start, rom_size - start, True, None) if start > rom_size: