ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #8782 from bridadan/fix_test_traceback 

Fix traceback when running mbed test
pull/8803/head
Martin Kojtal 2018-11-19 13:12:34 +00:00 committed by GitHub
parent 00c5b56e32 6cab1e0018
commit 8dc54f1f76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/config/__init__.py
View File

@ -749,7 +749,7 @@ class Config(object):
if start > rom_start + rom_size: if start > rom_start + rom_size:
raise ConfigException("Not enough memory on device to fit all " raise ConfigException("Not enough memory on device to fit all "
"application regions") "application regions")
@staticmethod @staticmethod
def _find_sector(address, sectors): def _find_sector(address, sectors):
target_size = -1 target_size = -1
@ -762,13 +762,13 @@ class Config(object):
if (target_size < 0): if (target_size < 0):
raise ConfigException("No valid sector found") raise ConfigException("No valid sector found")
return target_start, target_size return target_start, target_size
@staticmethod @staticmethod
def _align_floor(address, sectors): def _align_floor(address, sectors):
target_start, target_size = Config._find_sector(address, sectors) target_start, target_size = Config._find_sector(address, sectors)
sector_num = (address - target_start) // target_size sector_num = (address - target_start) // target_size
return target_start + (sector_num * target_size) return target_start + (sector_num * target_size)
@staticmethod @staticmethod
def _align_ceiling(address, sectors): def _align_ceiling(address, sectors):
target_start, target_size = Config._find_sector(address, sectors) target_start, target_size = Config._find_sector(address, sectors)
@ -778,7 +778,7 @@ class Config(object):
@property @property
def report(self): def report(self):
return {'app_config': self.app_config_location, return {'app_config': self.app_config_location,
'library_configs': map(relpath, self.processed_configs.keys())} 'library_configs': list(map(relpath, self.processed_configs.keys()))}
def _generate_linker_overrides(self, rom_start, rom_size): def _generate_linker_overrides(self, rom_start, rom_size):
if self.target.mbed_app_start is not None: if self.target.mbed_app_start is not None: