Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-10 06:59:54 +08:00
Code Issues Actions 31 Packages Projects Releases Wiki Activity

[flash modes] change some mode names and luftboot unused by default

Browse Source
This commit is contained in:
Gautier Hattenberger
2013-12-17 17:15:01 +01:00
parent c2de941069
commit 2f0060456b
14 changed files with 72 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/Makefile.stm32
+7 -7
View File
@@ -68,15 +68,15 @@ else
OOCD_BOARD = $($(TARGET).OOCD_BOARD)
endif
# default: assume the luftboot bootloader is used
# if luftboot is not used define NO_LUFTBOOT to a value != 0
OOCD_START_SECTOR = 4
ASSUMING_LUFTBOOT = "yes"
ifdef NO_LUFTBOOT
$(shell echo luftboot: $(NO_LUFTBOOT))
ifneq ($(NO_LUFTBOOT),0)
# default: assume the luftboot bootloader is not used
# if luftboot is used define HAS_LUFTBOOT to a value != 0
OOCD_START_SECTOR = 0
ASSUMING_LUFTBOOT = "no"
ifdef HAS_LUFTBOOT
$(shell echo luftboot: $(HAS_LUFTBOOT))
ifneq ($(HAS_LUFTBOOT),0)
OOCD_START_SECTOR = 4
ASSUMING_LUFTBOOT = "yes"
endif
endif
conf/Makefile.stm32-upload
+20 -17
View File
@@ -27,14 +27,6 @@
# check which flash mode is configured
#
ifeq ($(FLASH_MODE),DFU)
ifeq ($(DFU_UTIL),y)
#
# DFU flash mode using dfu-util
DFU_ADDR ?= 0x08000000
upload: $(OBJDIR)/$(TARGET).bin
@echo "Using dfu-util at $(DFU_ADDR)"
$(Q)dfu-util -d 0483:df11 -c 1 -i 0 -a 0 -s $(DFU_ADDR) -D $^
else
#
# DFU flash mode paparazzi stm32_mem
ifdef DFU_ADDR
@@ -46,7 +38,15 @@ endif
upload: $(OBJDIR)/$(TARGET).bin
@echo "Using stm32 mem dfu loader"
$(PYTHON) $(PAPARAZZI_SRC)/sw/tools/dfu/stm32_mem.py $(DFU_PRODUCT_CMD) $(DFU_ADDR_CMD) $^
endif
else ifeq ($(FLASH_MODE),DFU-UTIL)
#
# DFU flash mode using dfu-util
DFU_ADDR ?= 0x08000000
upload: $(OBJDIR)/$(TARGET).bin
@echo "Using dfu-util at $(DFU_ADDR)"
$(Q)dfu-util -d 0483:df11 -c 1 -i 0 -a 0 -s $(DFU_ADDR) -D $^
#
# serial flash mode
@@ -88,15 +88,9 @@ upload: $(OBJDIR)/$(TARGET).elf
$<
endif
#
# SWD flash mode
# SWD flash mode (with Black Magic Probe)
else ifeq ($(FLASH_MODE),SWD)
# only works if BMP_PORT is defined
ifeq ($(STLINK),y)
STLINK_ADDR ?= 0x08000000
upload: $(OBJDIR)/$(TARGET).bin
@echo "Using ST-LINK with SWD at $(STLINK_ADDR)"
$(Q)st-flash write $^ $(STLINK_ADDR)
else
BMP_PORT ?= /dev/ttyACM0
BMP_UPLOAD_SCRIPT ?= $(PAPARAZZI_SRC)/sw/tools/flash_scripts/bmp_swd_flash.scr
upload: $(OBJDIR)/$(TARGET).elf
@@ -108,7 +102,16 @@ upload: $(OBJDIR)/$(TARGET).elf
-ex 'target extended-remote $(BMP_PORT)' \
-x $(BMP_UPLOAD_SCRIPT) \
$<
endif
#
# SWD flash mode (with STLINK)
else ifeq ($(FLASH_MODE),STLINK)
STLINK_ADDR ?= 0x08000000
upload: $(OBJDIR)/$(TARGET).bin
@echo "Using ST-LINK with SWD at $(STLINK_ADDR)"
$(Q)st-flash write $^ $(STLINK_ADDR)
else
#
# no known flash mode
else
conf/airframes/CDW/DualBoardApFbw.xml
-1
View File
@@ -276,7 +276,6 @@
</target>
<configure name="FLASH_MODE" value="JTAG"/>
<configure name="NO_LUFTBOOT" value="1"/>
<define name="AGR_CLIMB"/>
<define name="LOITER_TRIM"/>
conf/airframes/examples/separate_fbw_ap.xml
-2
View File
@@ -234,7 +234,6 @@
<define name="RADIO_CONTROL_LED" value="4"/>
<configure name="FLASH_MODE" value="JTAG" />
<configure name="NO_LUFTBOOT" value="1" />
<!-- <configure name="BMP_PORT" value="/dev/ttyACM0" /> -->
<define name="OUTBACK_CHALLENGE_DANGEROUS_RULE_RC_LOST_NO_AP" value="1" />
@@ -264,7 +263,6 @@
<define name="AHRS_TRIGGERED_ATTITUDE_LOOP"/>
<configure name="FLASH_MODE" value="JTAG" />
<configure name="NO_LUFTBOOT" value="1" />
<!-- <configure name="BMP_PORT" value="/dev/ttyACM0" /> -->
conf/boards/apogee_0.99.makefile
+2 -5
View File
@@ -18,11 +18,8 @@ $(TARGET).LDSCRIPT=$(SRC_ARCH)/apogee.ld
HARD_FLOAT=yes
# default flash mode is via usb dfu bootloader
# possibilities: DFU, SWD
FLASH_MODE ?= DFU
STLINK ?= y
DFU_UTIL ?= y
NO_LUFTBOOT ?= 1
# possibilities: DFU-UTIL, SWD, STLINK
FLASH_MODE ?= DFU-UTIL
#
# default LED configuration
conf/boards/apogee_1.0.makefile
+2 -5
View File
@@ -18,11 +18,8 @@ $(TARGET).LDSCRIPT=$(SRC_ARCH)/apogee.ld
HARD_FLOAT=yes
# default flash mode is via usb dfu bootloader
# possibilities: DFU, SWD
FLASH_MODE ?= DFU
STLINK ?= y
DFU_UTIL ?= y
NO_LUFTBOOT ?= 1
# possibilities: DFU-UTIL, SWD, STLINK
FLASH_MODE ?= DFU-UTIL
#
# default LED configuration
conf/boards/lia_1.1.makefile
+1 -1
View File
@@ -24,7 +24,7 @@ FLASH_MODE = DFU
#FLASH_MODE = SERIAL
endif
ifndef NO_LUFTBOOT
ifdef HAS_LUFTBOOT
$(TARGET).CFLAGS+=-DLUFTBOOT
$(TARGET).LDFLAGS+=-Wl,-Ttext=0x8002000
endif
conf/boards/lisa_l_1.0.makefile
-1
View File
@@ -9,7 +9,6 @@ BOARD=lisa_l
BOARD_VERSION=1.0
BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
$(TARGET).LDSCRIPT=$(SRC_ARCH)/lisa-l.ld
NO_LUFTBOOT=1
# -----------------------------------------------------------------------
ifeq ($(BOARD_PROCESSOR),'omap')
conf/boards/lisa_l_1.1.makefile
-1
View File
@@ -12,7 +12,6 @@ BOARD=lisa_l
BOARD_VERSION=1.0
BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
$(TARGET).LDSCRIPT=$(SRC_ARCH)/lisa-l.ld
NO_LUFTBOOT=1
# -----------------------------------------------------------------------
ifeq ($(BOARD_PROCESSOR),'omap')
conf/boards/lisa_m_1.0.makefile
-3
View File
@@ -8,9 +8,6 @@
BOARD=lisa_m
BOARD_VERSION=1.0
BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
ifndef NO_LUFTBOOT
NO_LUFTBOOT=1
endif
ARCH=stm32
$(TARGET).ARCHDIR = $(ARCH)
conf/boards/lisa_m_2.0.makefile
+1 -1
View File
@@ -22,7 +22,7 @@ $(TARGET).LDSCRIPT=$(SRC_ARCH)/lisa-m.ld
# other possibilities: JTAG, SWD, SERIAL
FLASH_MODE ?= DFU
ifndef NO_LUFTBOOT
ifdef HAS_LUFTBOOT
$(TARGET).CFLAGS+=-DLUFTBOOT
$(TARGET).LDFLAGS+=-Wl,-Ttext=0x8002000
endif
conf/control_panel_example.xml
-33
View File
@@ -11,39 +11,6 @@
<variable name="flight_plan" value="flight_plans/muret1.xml"/>
</section>
<section name="flash_modes">
<mode name="SERIAL (ISP)" 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="ISP"/>
</mode>
<mode name="SERIAL (stm32)" boards="krooz_sd|lia_1.1|lisa_m_1.0|lisa_m_2.0|lisa_s_0.1">
<variable name="FLASH_MODE" value="SERIAL"/>
</mode>
<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"/>
</mode>
<mode name="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"/>
</mode>
<mode name="DFU (dfu-util)" boards="apogee_1.0|apogee_0.99|stm32f4_discovery">
<variable name="FLASH_MODE" value="DFU"/>
<variable name="DFU_UTIL" value="y"/>
</mode>
<mode name="SWD (STLink)" boards="apogee_1.0|apogee_0.99">
<variable name="FLASH_MODE" value="SWD"/>
<variable name="STLINK" value="y"/>
</mode>
<mode name="SWD (BlackMagic Probe)" boards="lia_1.1|lisa_m_2.0|lisa_s_0.1">
<variable name="FLASH_MODE" value="SWD"/>
</mode>
<mode name="SWD (BMP, NO Luftboot)" boards="apogee_1.0|apogee_0.99|stm32f4_discovery|lisa_m_1.0|px4fmu_1.7">
<variable name="FLASH_MODE" value="SWD"/>
<variable name="NO_LUFTBOOT" value="1"/>
</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">
<variable name="FLASH_MODE" value="JTAG"/>
</mode>
</section>
<section name="programs">
<program name="Server" command="sw/ground_segment/tmtc/server">
<arg flag="-b" variable="ivy_bus"/>
conf/flash_modes.xml
+32
View File
@@ -0,0 +1,32 @@
<?xml version="1.0"?>
<flash_modes>
<mode name="SERIAL (ISP)" 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="ISP"/>
</mode>
<mode name="SERIAL (stm32)" boards="krooz_sd|lia_1.1|lisa_m_1.0|lisa_m_2.0|lisa_s_0.1">
<variable name="FLASH_MODE" value="SERIAL"/>
</mode>
<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"/>
</mode>
<mode name="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"/>
</mode>
<mode name="DFU-UTIL" boards="apogee_1.0|apogee_0.99|stm32f4_discovery">
<variable name="FLASH_MODE" value="DFU-UTIL"/>
</mode>
<mode name="STLink (SWD)" boards="apogee_1.0|apogee_0.99">
<variable name="FLASH_MODE" value="STLINK"/>
</mode>
<mode name="BlackMagic Probe (SWD)" boards="apogee_1.0|apogee_0.99|stm32f4_discovery|lisa_m_1.0|px4fmu_1.7">
<variable name="FLASH_MODE" value="SWD"/>
</mode>
<mode name="BMP (SWD + LUFTBOOT)" boards="lia_1.1|lisa_m_2.0|lisa_s_0.1">
<variable name="FLASH_MODE" value="SWD"/>
<variable name="HAS_LUFTBOOT" value="1"/>
</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">
<variable name="FLASH_MODE" value="JTAG"/>
</mode>
</flash_modes>
sw/supervision/pc_control_panel.ml
+7 -2
View File
@@ -55,10 +55,15 @@ let sessions =
(Xml.children s);
h
let flash_modes_xml_file = Utils.conf_dir // "flash_modes.xml"
let flash_mode_xml = ExtXml.parse_file flash_modes_xml_file
let flash_modes =
let modes = Hashtbl.create 7 in (* table mode -> options *)
let boards = Hashtbl.create 7 in (* table board -> modes *)
let s = ExtXml.child ~select:(fun x -> Xml.attrib x "name" = "flash_modes") control_panel_xml "section" in
let fm_common = Xml.children flash_mode_xml in (* common modes in dedicated file *)
let fm_custom = try
Xml.children (ExtXml.child ~select:(fun x -> Xml.attrib x "name" = "flash_modes") control_panel_xml "section") with
_ -> [] in (* custom mode can be added to personal control_panel.xml file *)
List.iter (fun m ->
let mode = Xml.attrib m "name" in
(* list of boards *)
@@ -76,7 +81,7 @@ let flash_modes =
(* add the new mode with together with the old ones *)
Hashtbl.replace boards b ([mode] @ _modes)
) board_list;
) (Xml.children s);
) (fm_common @ fm_custom);
modes, boards