Merge pull request #10008 from OpenNuvoton/nuvoton_fix-ram-symbol

Fix MBED_RAM_START/MBED_RAM_SIZE symbol generation
ARMmbed · Mar 27, 2019 · a6c9c8c · a6c9c8c
2 parents b872d08 + da7035e
commit a6c9c8c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/tools/config/__init__.py b/tools/config/__init__.py
@@ -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

diff --git a/tools/toolchains/mbed_toolchain.py b/tools/toolchains/mbed_toolchain.py
@@ -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),
@@ -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