Skip to content

Commit ae16aa2

Browse files
committed
Fix overridden MBED_ROM_START/MBED_ROM_SIZE/MBED_RAM_START/MBED_RAM_SIZE don't pass to linker
1 parent 58f1521 commit ae16aa2

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

tools/toolchains/__init__.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -467,22 +467,26 @@ def __init__(self, target, notify=None, macros=None, build_profile=None,
467467
rom_start_override = getattr(self.target, "mbed_rom_start", False)
468468
if rom_start_override:
469469
self.macros.append("MBED_ROM_START=0x%x" % int(rom_start_override, 0))
470-
self.make_ld_define("MBED_ROM_START", int(rom_start_override, 0))
470+
_ = self.make_ld_define("MBED_ROM_START", int(rom_start_override, 0))
471+
self.flags["ld"].append(_)
471472
rom_size_override = getattr(self.target, "mbed_rom_size", False)
472473
if rom_size_override:
473474
self.macros.append("MBED_ROM_SIZE=0x%x" % int(rom_size_override, 0))
474-
self.make_ld_define("MBED_ROM_SIZE", int(rom_size_override, 0))
475+
_ = self.make_ld_define("MBED_ROM_SIZE", int(rom_size_override, 0))
476+
self.flags["ld"].append(_)
475477

476478
# Pass SRAM information (MBED_RAM_START/MBED_RAM_SIZE) to compiler/linker
477479
# if target configuration options (mbed_ram_start/mbed_ram_size) are defined.
478480
ram_start_override = getattr(self.target, "mbed_ram_start", False)
479481
if ram_start_override:
480482
self.macros.append("MBED_RAM_START=0x%x" % int(ram_start_override, 0))
481-
self.make_ld_define("MBED_RAM_START", int(ram_start_override, 0))
483+
_ = self.make_ld_define("MBED_RAM_START", int(ram_start_override, 0))
484+
self.flags["ld"].append(_)
482485
ram_size_override = getattr(self.target, "mbed_ram_size", False)
483486
if ram_size_override:
484487
self.macros.append("MBED_RAM_SIZE=0x%x" % int(ram_size_override, 0))
485-
self.make_ld_define("MBED_RAM_SIZE", int(ram_size_override, 0))
488+
_ = self.make_ld_define("MBED_RAM_SIZE", int(ram_size_override, 0))
489+
self.flags["ld"].append(_)
486490

487491
# Stats cache is used to reduce the amount of IO requests to stat
488492
# header files during dependency change. See need_update()

0 commit comments

Comments
 (0)