Skip to content

Commit a235019

Browse files
committed
Fix MBED_RAM_START/MBED_RAM_SIZE symbol generation
1. Fix MBED_RAM_START/MBED_RAM_SIZE are not generated when there are target.mbed_ram_start/target.mbed_ram_size overrides 2. Fix MBED_RAM_START/MBED_RAM_SIZE are duplicated.
1 parent e417ad2 commit a235019

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

tools/config/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -785,8 +785,6 @@ def get_all_active_memories(self, memory_list):
785785
mem_size = size
786786
memory = 'ROM'
787787
elif memory in ['IRAM1', 'SRAM_OC', 'SRAM_UPPER', 'SRAM']:
788-
if (self.has_ram_regions):
789-
continue
790788
if getattr(self.target, "mbed_ram_start", False):
791789
mem_start = getattr(self.target, "mbed_ram_start")
792790
if getattr(self.target, "mbed_ram_start", False):

tools/toolchains/mbed_toolchain.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -840,7 +840,7 @@ def _add_defines_from_region(
840840
def _add_all_regions(self, region_list, active_region_name):
841841
for region in region_list:
842842
self._add_defines_from_region(region)
843-
if region.active:
843+
if region.active and active_region_name:
844844
for define in [
845845
("%s_START" % active_region_name,
846846
"0x%x" % region.start),
@@ -874,7 +874,7 @@ def add_regions(self):
874874
"s" if len(regions) > 1 else "",
875875
", ".join(r.name for r in regions)
876876
))
877-
self._add_all_regions(regions, "MBED_RAM")
877+
self._add_all_regions(regions, None)
878878
except ConfigException:
879879
pass
880880

0 commit comments

Comments
 (0)