diff options
| author | px4dev <px4@purgatory.org> | 2012-12-01 00:50:39 -0800 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2012-12-01 00:50:39 -0800 |
| commit | ea8872f5456dbba566fb4167ec66b4afa183b3e1 (patch) | |
| tree | 40def937aa4253700cb78c07b0e70b0963537da1 /Makefile | |
| parent | efd3b9dea689ef4244a3a2fd9f4217a544b254ee (diff) | |
| parent | ef4a54666d760a18b18800163a24faf5883c1e61 (diff) | |
| download | px4-firmware-ea8872f5456dbba566fb4167ec66b4afa183b3e1.tar.gz px4-firmware-ea8872f5456dbba566fb4167ec66b4afa183b3e1.tar.bz2 px4-firmware-ea8872f5456dbba566fb4167ec66b4afa183b3e1.zip | |
Merge branch 'sbus' of https://github.com/PX4/Firmware into #61-px4io-spektrum-decoder
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 15 |
1 files changed, 13 insertions, 2 deletions
@@ -114,10 +114,21 @@ endif upload: $(FIRMWARE_BUNDLE) $(UPLOADER) @python -u $(UPLOADER) --port $(SERIAL_PORTS) $(FIRMWARE_BUNDLE) - + +# +# JTAG firmware uploading with OpenOCD +# +ifeq ($(JTAGCONFIG),) +JTAGCONFIG=interface/olimex-jtag-tiny.cfg +endif + upload-jtag-px4fmu: @echo Attempting to flash PX4FMU board via JTAG - @openocd -f interface/olimex-jtag-tiny.cfg -f ../Bootloader/stm32f4x.cfg -c init -c "reset halt" -c "flash write_image erase nuttx/nuttx" -c "flash write_image erase ../Bootloader/px4fmu_bl.elf" -c "reset run" -c shutdown + @openocd -f $(JTAGCONFIG) -f ../Bootloader/stm32f4x.cfg -c init -c "reset halt" -c "flash write_image erase nuttx/nuttx" -c "flash write_image erase ../Bootloader/px4fmu_bl.elf" -c "reset run" -c shutdown + +upload-jtag-px4io: all + @echo Attempting to flash PX4IO board via JTAG + @openocd -f $(JTAGCONFIG) -f ../Bootloader/stm32f1x.cfg -c init -c "reset halt" -c "flash write_image erase nuttx/nuttx" -c "flash write_image erase ../Bootloader/px4io_bl.elf" -c "reset run" -c shutdown # # Hacks and fixups |