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 #10008 from OpenNuvoton/nuvoton_fix-ram-symbol 

Fix MBED_RAM_START/MBED_RAM_SIZE symbol generation
pull/9904/head
Cruz Monrreal 2019-03-27 00:21:37 -05:00 committed by GitHub
parent b872d08181 da7035eb6b
commit a6c9c8c253
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/config/__init__.py
View File

@ -768,8 +768,6 @@ class Config(object):
mem_size = size mem_size = size
memory = 'ROM' memory = 'ROM'
elif memory in ['IRAM1', 'SRAM_OC', 'SRAM_UPPER', 'SRAM']: elif memory in ['IRAM1', 'SRAM_OC', 'SRAM_UPPER', 'SRAM']:
if (self.has_ram_regions):
continue
start, size = self._get_primary_memory_override("ram") start, size = self._get_primary_memory_override("ram")
if start: if start:
mem_start = start mem_start = start

4
tools/toolchains/mbed_toolchain.py
View File

@ -840,7 +840,7 @@ class mbedToolchain:
def _add_all_regions(self, region_list, active_region_name): def _add_all_regions(self, region_list, active_region_name):
for region in region_list: for region in region_list:
self._add_defines_from_region(region) self._add_defines_from_region(region)
if region.active: if region.active and active_region_name:
for define in [ for define in [
("%s_START" % active_region_name, ("%s_START" % active_region_name,
"0x%x" % region.start), "0x%x" % region.start),
@ -874,7 +874,7 @@ class mbedToolchain:
"s" if len(regions) > 1 else "", "s" if len(regions) > 1 else "",
", ".join(r.name for r in regions) ", ".join(r.name for r in regions)
)) ))
self._add_all_regions(regions, "MBED_RAM") self._add_all_regions(regions, None)
except ConfigException: except ConfigException:
pass pass