aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

waf: move external flash binaries to regular name to aid publishing

Browse Source
This commit is contained in:
Andy Piper 2022-02-25 20:13:38 +00:00 committed by Andrew Tridgell
parent b3af8221be
commit fdaaa589e5
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Tools/ardupilotwaf/chibios.py
View File

@ -266,6 +266,18 @@ class build_abin(Task.Task):
def __str__(self): def __str__(self):
return self.outputs[0].path_from(self.generator.bld.bldnode) return self.outputs[0].path_from(self.generator.bld.bldnode)
class build_normalized_bins(Task.Task):
'''Move external flash binaries to regular location if regular bin is zero length'''
color='CYAN'
always_run = True
def run(self):
if self.env.HAS_EXTERNAL_FLASH_SECTIONS and os.path.getsize(self.inputs[0].abspath()) == 0:
os.remove(self.inputs[0].abspath())
shutil.move(self.inputs[1].abspath(), self.inputs[0].abspath())
def keyword(self):
return "bin cleanup"
class build_intel_hex(Task.Task): class build_intel_hex(Task.Task):
'''build an intel hex file for upload with DFU''' '''build an intel hex file for upload with DFU'''
color='CYAN' color='CYAN'
@ -302,12 +314,15 @@ def chibios_firmware(self):
abin_task = self.create_task('build_abin', src=link_output, tgt=abin_target) abin_task = self.create_task('build_abin', src=link_output, tgt=abin_target)
abin_task.set_run_after(generate_apj_task) abin_task.set_run_after(generate_apj_task)
cleanup_task = self.create_task('build_normalized_bins', src=bin_target)
cleanup_task.set_run_after(generate_apj_task)
bootloader_bin = self.bld.srcnode.make_node("Tools/bootloaders/%s_bl.bin" % self.env.BOARD) bootloader_bin = self.bld.srcnode.make_node("Tools/bootloaders/%s_bl.bin" % self.env.BOARD)
if self.bld.env.HAVE_INTEL_HEX: if self.bld.env.HAVE_INTEL_HEX:
if os.path.exists(bootloader_bin.abspath()): if os.path.exists(bootloader_bin.abspath()):
hex_target = self.bld.bldnode.find_or_declare('bin/' + link_output.change_ext('.hex').name) hex_target = self.bld.bldnode.find_or_declare('bin/' + link_output.change_ext('.hex').name)
hex_task = self.create_task('build_intel_hex', src=[bin_target[0], bootloader_bin], tgt=hex_target) hex_task = self.create_task('build_intel_hex', src=[bin_target[0], bootloader_bin], tgt=hex_target)
hex_task.set_run_after(generate_bin_task) hex_task.set_run_after(cleanup_task)
else: else:
print("Not embedding bootloader; %s does not exist" % bootloader_bin) print("Not embedding bootloader; %s does not exist" % bootloader_bin)