Skip to content

Fix MBED_RAM_START/MBED_RAM_SIZE symbol generation #10008

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 27, 2019
Merged

Fix MBED_RAM_START/MBED_RAM_SIZE symbol generation #10008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions tools/config/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,8 +768,6 @@ def get_all_active_memories(self, memory_list):
mem_size = size
memory = 'ROM'
elif memory in ['IRAM1', 'SRAM_OC', 'SRAM_UPPER', 'SRAM']:
if (self.has_ram_regions):
continue
start, size = self._get_primary_memory_override("ram")
if start:
mem_start = start
Expand Down
4 changes: 2 additions & 2 deletions tools/toolchains/mbed_toolchain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -840,7 +840,7 @@ def _add_defines_from_region(
def _add_all_regions(self, region_list, active_region_name):
for region in region_list:
self._add_defines_from_region(region)
if region.active:
if region.active and active_region_name:
for define in [
("%s_START" % active_region_name,
"0x%x" % region.start),
Expand Down Expand Up @@ -874,7 +874,7 @@ def add_regions(self):
"s" if len(regions) > 1 else "",
", ".join(r.name for r in regions)
))
self._add_all_regions(regions, "MBED_RAM")
self._add_all_regions(regions, None)
except ConfigException:
pass

Expand Down