Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-22 07:44:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

waf: ensure we don't apply app desc step on BL

Browse Source
This commit is contained in:
bugobliterator 2022-08-15 09:17:04 +05:30 committed by Peter Barker
parent ba13f4d116
commit 3c30991153
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Tools/ardupilotwaf/chibios.py
View File

@ -382,12 +382,17 @@ def chibios_firmware(self):
generate_bin_task.set_run_after(default_params_task) generate_bin_task.set_run_after(default_params_task)
# we need to setup the app descriptor so the bootloader can validate the firmware # we need to setup the app descriptor so the bootloader can validate the firmware
app_descriptor_task = self.create_task('set_app_descriptor', src=bin_target) if not self.bld.env.BOOTLOADER:
app_descriptor_task.set_run_after(generate_bin_task) app_descriptor_task = self.create_task('set_app_descriptor', src=bin_target)
generate_apj_task.set_run_after(app_descriptor_task) app_descriptor_task.set_run_after(generate_bin_task)
if hex_task is not None: generate_apj_task.set_run_after(app_descriptor_task)
hex_task.set_run_after(app_descriptor_task) if hex_task is not None:
hex_task.set_run_after(app_descriptor_task)
else:
generate_apj_task.set_run_after(generate_bin_task)
if hex_task is not None:
hex_task.set_run_after(generate_bin_task)
if self.bld.options.upload: if self.bld.options.upload:
_upload_task = self.create_task('upload_fw', src=apj_target) _upload_task = self.create_task('upload_fw', src=apj_target)
_upload_task.set_run_after(generate_apj_task) _upload_task.set_run_after(generate_apj_task)