diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-25 09:48:15 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-25 09:48:15 +0100 |
| commit | 25af4b266ca48b183a1ad375856396f67d6ab30f (patch) | |
| tree | 64e031ec3747ab706e5ae8ed9fd052e12ee3248b /makefiles | |
| parent | ad189cf7d69b8de16244b90d398e1d84ed6d0f4b (diff) | |
| parent | 9b535f6553944f3468bbec9203301623412524ad (diff) | |
| download | px4-firmware-25af4b266ca48b183a1ad375856396f67d6ab30f.tar.gz px4-firmware-25af4b266ca48b183a1ad375856396f67d6ab30f.tar.bz2 px4-firmware-25af4b266ca48b183a1ad375856396f67d6ab30f.zip | |
Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts:
.gitignore
src/lib/uavcan
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/gumstix-aerocore.cfg | 10 | ||||
| -rw-r--r-- | makefiles/upload.mk | 5 |
2 files changed, 15 insertions, 0 deletions
diff --git a/makefiles/gumstix-aerocore.cfg b/makefiles/gumstix-aerocore.cfg new file mode 100644 index 000000000..ba217c043 --- /dev/null +++ b/makefiles/gumstix-aerocore.cfg @@ -0,0 +1,10 @@ +# JTAG for the STM32F4x chip used on the Gumstix AeroCore is available on +# the first interface of a Quad FTDI chip. nTRST is bit 4. +interface ftdi +ftdi_vid_pid 0x0403 0x6011 + +ftdi_layout_init 0x0000 0x001b +ftdi_layout_signal nTRST -data 0x0010 + +source [find target/stm32f4x.cfg] +reset_config trst_only diff --git a/makefiles/upload.mk b/makefiles/upload.mk index bc26d743d..29b415688 100644 --- a/makefiles/upload.mk +++ b/makefiles/upload.mk @@ -30,6 +30,11 @@ upload-serial-px4fmu-v1: $(BUNDLE) $(UPLOADER) upload-serial-px4fmu-v2: $(BUNDLE) $(UPLOADER) $(Q) $(PYTHON) -u $(UPLOADER) --port $(SERIAL_PORTS) $(BUNDLE) +upload-serial-aerocore: + openocd -f $(PX4_BASE)/makefiles/gumstix-aerocore.cfg -c 'init; reset halt; flash write_image erase $(PX4_BASE)/../Bootloader/px4aerocore_bl.bin 0x08000000; flash write_image erase $(PX4_BASE)/Build/aerocore_default.build/firmware.bin 0x08004000; reset run; exit' + + + # # JTAG firmware uploading with OpenOCD # |