Skip to content
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

Jump to bottom

Deduplicate IAR MBED_ROM__xxxx defines #10157

Merged
merged 3 commits into from
Mar 20, 2019
Merged

Deduplicate IAR MBED_ROM__xxxx defines #10157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0bb3031
Deduplicate MBED_ROM_xxxx defines on IAR linker command line
theotherjimmy Mar 19, 2019
c37a31c
Use PSA overrides for RAM
theotherjimmy Mar 19, 2019
dabad7a
Deduplicate RAM defines to linker command line
theotherjimmy Mar 19, 2019
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
76 changes: 37 additions & 39 deletions tools/config/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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)
Expand All @@ -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:
Expand All @@ -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
Expand Down
28 changes: 7 additions & 21 deletions tools/toolchains/mbed_toolchain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So how will these parameter be passed to the linker?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With other code that was duplicating this define. It was duplicated this is the one that's no longer needed.

"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):
Expand Down