Merge pull request #10157 from theotherjimmy/dedupe-mbed-rom

Deduplicate IAR MBED_ROM__xxxx defines
ARMmbed · Mar 20, 2019 · da3a759 · da3a759
2 parents 23cd1aa + dabad7a
commit da3a759
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 60 deletions.
diff --git a/tools/config/__init__.py b/tools/config/__init__.py
@@ -689,26 +689,35 @@ def _get_mem_specs(self, permissions, cmsis_part):
  )
  )
 
- def _get_primary_rom_override(self):
+ def _get_primary_memory_override(self, memory_type):
  mem_start = None
  mem_size = None
- if hasattr(self.target, "mbed_rom_start"):
- mem_start = getattr(self.target, "mbed_rom_start")
- if hasattr(self.target, "mbed_rom_size"):
- mem_size = getattr(self.target, "mbed_rom_size")
+ if hasattr(self.target, "mbed_{}_start".format(memory_type)):
+ mem_start = getattr(
+ self.target,
+ "mbed_{}_start".format(memory_type)
+ )
+ if hasattr(self.target, "mbed_{}_size".format(memory_type)):
+ mem_size = getattr(self.target, "mbed_{}_size".format(memory_type))
  if (
  self.target.is_PSA_non_secure_target or
  self.target.is_PSA_secure_target
  ):
  config, _ = self.get_config_data()
  if self.target.is_PSA_secure_target:
- mem_start = config.get("target.secure-rom-start", mem_start).value
- mem_size = config.get("target.secure-rom-size", mem_size).value
+ mem_start = config.get(
+ "target.secure-{}-start".format(memory_type), mem_start
+ ).value
+ mem_size = config.get(
+ "target.secure-{}-size".format(memory_type), mem_size
+ ).value
  elif self.target.is_PSA_non_secure_target:
  mem_start = config.get(
- "target.non-secure-rom-start", mem_start
+ "target.non-secure-{}-start".format(memory_type), mem_start
+ ).value
+ mem_size = config.get(
+ "target.non-secure-{}-size".format(memory_type), mem_size
  ).value
- mem_size = config.get("target.non-secure-rom-size", mem_size).value
  if mem_start and not isinstance(mem_start, int):
  mem_start = int(mem_start, 0)
  if mem_size and not isinstance(mem_size, int):
@@ -739,33 +748,21 @@ def get_all_active_memories(self, memory_list):
  except ConfigException:
  """ If the target doesn't exits in cmsis, but present in targets.json
  with ram and rom start/size defined"""
- if (
- getattr(self.target, "mbed_ram_start")
- and active_memory == 'RAM'
- ):
- mem_start = int(getattr(self.target, "mbed_ram_start"), 0)
- mem_size = int(getattr(self.target, "mbed_ram_size"), 0)
- available_memories[active_memory] = [mem_start, mem_size]
- return available_memories
- elif active_memory == 'ROM':
- start, size = self._get_primary_rom_override()
- if not start:
- raise ConfigException(
- "Bootloader not supported on this target. rom "
- "start not found in targets.json."
- )
- if not size:
- raise ConfigException(
- "Bootloader not supported on this target. rom "
- "size not found in targets.json."
- )
- available_memories[active_memory] = [start, size]
- return available_memories
- else:
+ start, size = self._get_primary_memory_override(
+ active_memory.lower()
+ )
+ if not start:
+ raise ConfigException(
+ "Bootloader not supported on this target. {} "
+ "start not found in targets.json.".format(active_memory)
+ )
+ if not size:
  raise ConfigException(
- "Bootloader not supported on this target. ram/rom "
- "start/size not found in targets.json."
+ "Bootloader not supported on this target. {} "
+ "size not found in targets.json.".format(active_memory)
  )
+ available_memories[active_memory] = [start, size]
+ return available_memories
 
  present_memories = set(cmsis_part['memories'].keys())
  valid_memories = set(memory_list).intersection(present_memories)
@@ -778,7 +775,7 @@ def get_all_active_memories(self, memory_list):
  mem_start = memories[memory]["start"]
  mem_size = memories[memory]["size"]
  if memory in ['IROM1', 'PROGRAM_FLASH']:
- start, size = self._get_primary_rom_override()
+ start, size = self._get_primary_memory_override("rom")
  if start:
  mem_start = start
  if size:
@@ -787,10 +784,11 @@ def get_all_active_memories(self, memory_list):
  elif memory in ['IRAM1', 'SRAM_OC', 'SRAM_UPPER', 'SRAM']:
  if (self.has_ram_regions):
  continue
- if getattr(self.target, "mbed_ram_start", False):
- mem_start = getattr(self.target, "mbed_ram_start")
- if getattr(self.target, "mbed_ram_start", False):
- mem_size = getattr(self.target, "mbed_ram_size")
+ start, size = self._get_primary_memory_override("ram")
+ if start:
+ mem_start = start
+ if size:
+ mem_size = size
  memory = 'RAM'
  else:
  active_memory_counter += 1

diff --git a/tools/toolchains/mbed_toolchain.py b/tools/toolchains/mbed_toolchain.py
@@ -926,28 +926,14 @@ def add_linker_defines(self):
  self.ld.append(define_string)
  self.flags["ld"].append(define_string)
 
- flags2params = {}
- if self.target.is_PSA_non_secure_target:
- flags2params = {
- "MBED_ROM_START": "target.non-secure-rom-start",
- "MBED_ROM_SIZE": "target.non-secure-rom-size",
- "MBED_RAM_START": "target.non-secure-ram-start",
- "MBED_RAM_SIZE": "target.non-secure-ram-size"
- }
  if self.target.is_PSA_secure_target:
- flags2params = {
- "MBED_ROM_START": "target.secure-rom-start",
- "MBED_ROM_SIZE": "target.secure-rom-size",
- "MBED_RAM_START": "target.secure-ram-start",
- "MBED_RAM_SIZE": "target.secure-ram-size",
- "MBED_PUBLIC_RAM_START": "target.public-ram-start",
- "MBED_PUBLIC_RAM_SIZE": "target.public-ram-size"
- }
-
- for flag, param in flags2params.items():
- define_string = self.make_ld_define(flag, params[param].value)
- self.ld.append(define_string)
- self.flags["ld"].append(define_string)
+ for flag, param in [
+ ("MBED_PUBLIC_RAM_START", "target.public-ram-start"),
+ ("MBED_PUBLIC_RAM_SIZE", "target.public-ram-size")
+ ]:
+ define_string = self.make_ld_define(flag, params[param].value)
+ self.ld.append(define_string)
+ self.flags["ld"].append(define_string)
 
  # Set the configuration data
  def set_config_data(self, config_data):