zrzk
/
ardupilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

master
bugobliterator 3 years ago committed by Peter Barker
parent
ba13f4d116
commit
3c30991153
1 changed files with 11 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      Tools/ardupilotwaf/chibios.py

17
Tools/ardupilotwaf/chibios.py
Unescape 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)

Write Preview
Loading…
Cancel
Save