Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-30 11:37:06 +08:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

[conf] separate JTAG_BMP FLASH_MODE

Browse Source
This commit is contained in:
Felix Ruess
2013-12-18 12:51:01 +01:00
parent 4e9c66d269
commit 4dfba18f5b
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/Makefile.stm32-upload
+7 -6
View File
@@ -73,9 +73,7 @@ upload: $(OBJDIR)/$(TARGET).bin
# #
# JTAG flash mode # JTAG flash mode
else ifeq ($(FLASH_MODE),JTAG) else ifeq ($(FLASH_MODE),JTAG)
# either via normal jtag or BlackMagicProbe # via OpenOCD and "normal" jtag
ifeq ($(BMP_PORT),)
# normal jtag via OpenOCD
OOCD ?= openocd OOCD ?= openocd
ifneq ($(BOARD_SERIAL),) ifneq ($(BOARD_SERIAL),)
OOCD_OPTIONS = -c "ft2232_serial $(BOARD_SERIAL)" OOCD_OPTIONS = -c "ft2232_serial $(BOARD_SERIAL)"
@@ -105,10 +103,12 @@ upload: $(OBJDIR)/$(TARGET).hex
-c "flash write_image $<" \ -c "flash write_image $<" \
-c reset \ -c reset \
-c shutdown -c shutdown
else
# jtag via BMP
BMP_UPLOAD_SCRIPT ?= $(PAPARAZZI_SRC)/sw/tools/flash_scripts/bmp_jtag_flash.scr
#
# JTAG flash mode (with Black Magic Probe)
else ifeq ($(FLASH_MODE),JTAG_BMP)
BMP_PORT ?= /dev/ttyACM0
BMP_UPLOAD_SCRIPT ?= $(PAPARAZZI_SRC)/sw/tools/flash_scripts/bmp_jtag_flash.scr
upload: $(OBJDIR)/$(TARGET).elf upload: $(OBJDIR)/$(TARGET).elf
@echo "Assuming luftboot bootloader: $(ASSUMING_LUFTBOOT)" @echo "Assuming luftboot bootloader: $(ASSUMING_LUFTBOOT)"
@echo "Using Black Magic Probe with JTAG on BMP_PORT $(BMP_PORT)" @echo "Using Black Magic Probe with JTAG on BMP_PORT $(BMP_PORT)"
@@ -119,6 +119,7 @@ upload: $(OBJDIR)/$(TARGET).elf
-x $(BMP_UPLOAD_SCRIPT) \ -x $(BMP_UPLOAD_SCRIPT) \
$< $<
endif endif
# #
# SWD flash mode (with Black Magic Probe) # SWD flash mode (with Black Magic Probe)
else ifeq ($(FLASH_MODE),SWD) else ifeq ($(FLASH_MODE),SWD)
conf/flash_modes.xml
+6 -7
View File
@@ -10,23 +10,22 @@
<mode name="USB (IAP)" boards="booz_1.0|classix|hb_1.1|logom_2.2|navgo_1.0|sdlog_1.0|tiny_0.99|tiny_1.1|tiny_2.1|tiny_2.11|twog_1.0|umarim_1.0|umarim_lite_2.0|yapa_2.0"> <mode name="USB (IAP)" boards="booz_1.0|classix|hb_1.1|logom_2.2|navgo_1.0|sdlog_1.0|tiny_0.99|tiny_1.1|tiny_2.1|tiny_2.11|twog_1.0|umarim_1.0|umarim_lite_2.0|yapa_2.0">
<variable name="FLASH_MODE" value="IAP"/> <variable name="FLASH_MODE" value="IAP"/>
</mode> </mode>
<mode name="DFU (stm32_mem)" boards="krooz_sd|lia_1.1|lisa_m_1.1|lisa_m_2.0|px4fmu_1.7"> <mode name="USB DFU (stm32_mem)" boards="krooz_sd|lia_1.1|lisa_m_1.1|lisa_m_2.0|px4fmu_1.7">
<variable name="FLASH_MODE" value="DFU"/> <variable name="FLASH_MODE" value="DFU"/>
</mode> </mode>
<mode name="DFU-UTIL" boards="apogee_1.0|apogee_0.99|stm32f4_discovery"> <mode name="USB DFU-UTIL" boards="apogee_1.0|apogee_0.99|stm32f4_discovery">
<variable name="FLASH_MODE" value="DFU-UTIL"/> <variable name="FLASH_MODE" value="DFU-UTIL"/>
</mode> </mode>
<mode name="STLink (SWD)" boards="apogee_1.0|apogee_0.99"> <mode name="STLink (SWD)" boards="apogee_1.0|apogee_0.99">
<variable name="FLASH_MODE" value="STLINK"/> <variable name="FLASH_MODE" value="STLINK"/>
</mode> </mode>
<mode name="BlackMagic Probe (SWD)" boards="apogee_1.0|apogee_0.99|stm32f4_discovery|lisa_m_1.0|px4fmu_1.7"> <mode name="BlackMagic Probe (SWD)" boards="apogee_1.0|apogee_0.99|stm32f4_discovery|lisa_m_1.0|lia_1.1|lisa_m_2.0|lisa_s_0.1|px4fmu_1.7">
<variable name="FLASH_MODE" value="SWD"/> <variable name="FLASH_MODE" value="SWD"/>
</mode> </mode>
<mode name="BMP (SWD + LUFTBOOT)" boards="lia_1.1|lisa_m_2.0|lisa_s_0.1"> <mode name="BlackMagic Probe (JTAG)" boards="apogee_1.0|apogee_0.99|stm32f4_discovery|lisa_m_1.0|lia_1.1|lisa_m_2.0|lisa_s_0.1|px4fmu_1.7">
<variable name="FLASH_MODE" value="SWD"/> <variable name="FLASH_MODE" value="JTAG_BMP"/>
<variable name="HAS_LUFTBOOT" value="1"/>
</mode> </mode>
<mode name="JTAG (OpenOCD or BMP)" boards="krooz_sd|lia_1.1|lisa_l_1.0|lisa_l_1.1|lisa_m_1.0|lisa_m_2.0"> <mode name="JTAG (OpenOCD)" boards="krooz_sd|lia_1.1|lisa_l_1.0|lisa_l_1.1|lisa_m_1.0|lisa_m_2.0">
<variable name="FLASH_MODE" value="JTAG"/> <variable name="FLASH_MODE" value="JTAG"/>
</mode> </mode>
</flash_modes> </flash_modes>