Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

chibios_hwdef.py: allow re-use of bootloader from other boards

Browse Source
This commit is contained in:
Peter Barker 2024-02-10 11:26:58 +11:00 committed by Peter Barker
parent 81f2e15f8b
commit 1862b5dc27
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py
View File

@ -1106,7 +1106,7 @@ class ChibiOSHWDef(object):
f.write('#define APP_START_OFFSET_KB %u\n' % self.get_config('APP_START_OFFSET_KB', default=0, type=int)) f.write('#define APP_START_OFFSET_KB %u\n' % self.get_config('APP_START_OFFSET_KB', default=0, type=int))
f.write('\n') f.write('\n')
ram_reserve_start,ram0_start_address = self.get_ram_reserve_start() ram_reserve_start, ram0_start_address = self.get_ram_reserve_start()
f.write('#define HAL_RAM0_START 0x%08x\n' % ram0_start_address) f.write('#define HAL_RAM0_START 0x%08x\n' % ram0_start_address)
if ram_reserve_start > 0: if ram_reserve_start > 0:
f.write('#define HAL_RAM_RESERVE_START 0x%08x\n' % ram_reserve_start) f.write('#define HAL_RAM_RESERVE_START 0x%08x\n' % ram_reserve_start)
@ -1385,7 +1385,7 @@ class ChibiOSHWDef(object):
if ext_flash_size > 32: if ext_flash_size > 32:
self.error("We only support 24bit addressing over external flash") self.error("We only support 24bit addressing over external flash")
ram_reserve_start,ram0_start_address = self.get_ram_reserve_start() ram_reserve_start, ram0_start_address = self.get_ram_reserve_start()
if ram_reserve_start > 0 and ram0_start_address == ram0_start: if ram_reserve_start > 0 and ram0_start_address == ram0_start:
ram0_start += ram_reserve_start ram0_start += ram_reserve_start
ram0_len -= ram_reserve_start ram0_len -= ram_reserve_start
@ -2413,6 +2413,10 @@ INCLUDE common.ld
this_dir = os.path.realpath(__file__) this_dir = os.path.realpath(__file__)
rootdir = os.path.relpath(os.path.join(this_dir, "../../../../..")) rootdir = os.path.relpath(os.path.join(this_dir, "../../../../.."))
hwdef_dirname = os.path.basename(os.path.dirname(args.hwdef[0])) hwdef_dirname = os.path.basename(os.path.dirname(args.hwdef[0]))
# allow re-using of bootloader from different build:
use_bootloader_from_board = self.get_config('USE_BOOTLOADER_FROM_BOARD', default=None, required=False)
if use_bootloader_from_board is not None:
hwdef_dirname = use_bootloader_from_board
bootloader_filename = "%s_bl.bin" % (hwdef_dirname,) bootloader_filename = "%s_bl.bin" % (hwdef_dirname,)
bootloader_path = os.path.join(rootdir, bootloader_path = os.path.join(rootdir,
"Tools", "Tools",