[conf] FLASH_MODE cleanup

This commit is contained in:
Felix Ruess
2014-03-03 18:47:54 +01:00
parent a0bc3a70e7
commit 161c25e5a0
9 changed files with 17 additions and 28 deletions
@@ -42,6 +42,11 @@
<!--define name="KILL_ON_GROUND_DETECT" value="TRUE"/--> <!--define name="KILL_ON_GROUND_DETECT" value="TRUE"/-->
</firmware> </firmware>
<firmware name="test_progs">
<target name="test_sys_time_timer" board="lisa_mx_2.0"/>
<target name="test_telemetry" board="lisa_mx_2.0"/>
</firmware>
<modules> <modules>
<load name="adc_generic.xml"> <load name="adc_generic.xml">
<configure name="ADC_CHANNEL_GENERIC1" value="ADC_1"/> <configure name="ADC_CHANNEL_GENERIC1" value="ADC_1"/>
+1 -3
View File
@@ -8,9 +8,7 @@ BOARD=booz
BOARD_VERSION=1.0 BOARD_VERSION=1.0
BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\" BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
ifndef FLASH_MODE FLASH_MODE ?= IAP
FLASH_MODE = IAP
endif
# #
# #
+1 -3
View File
@@ -8,9 +8,7 @@ BOARD=hb
BOARD_VERSION=1.1 BOARD_VERSION=1.1
BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\" BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
ifndef FLASH_MODE FLASH_MODE ?= IAP
FLASH_MODE = IAP
endif
# #
# #
+3 -5
View File
@@ -22,11 +22,9 @@ $(TARGET).LDSCRIPT=$(SRC_ARCH)/krooz.ld
# ----------------------------------------------------------------------- # -----------------------------------------------------------------------
ifndef FLASH_MODE # default flash mode is via usb dfu bootloader (luftboot)
FLASH_MODE = DFU # other possibilities: DFU-UTIL, JTAG, SWD, STLINK, SERIAL
#FLASH_MODE = JTAG FLASH_MODE ?= DFU
#FLASH_MODE = SERIAL
endif
DFU_ADDR = 0x8004000 DFU_ADDR = 0x8004000
DFU_PRODUCT = any DFU_PRODUCT = any
+2 -7
View File
@@ -13,19 +13,14 @@ ARCH=stm32
ARCH_L=f4 ARCH_L=f4
HARD_FLOAT=yes HARD_FLOAT=yes
$(TARGET).ARCHDIR = $(ARCH) $(TARGET).ARCHDIR = $(ARCH)
# not needed?
$(TARGET).OOCD_INTERFACE=flossjtag
#$(TARGET).OOCD_INTERFACE=jtagkey-tiny
$(TARGET).LDSCRIPT=$(SRC_ARCH)/lisa-mx.ld $(TARGET).LDSCRIPT=$(SRC_ARCH)/lisa-mx.ld
# ----------------------------------------------------------------------- # -----------------------------------------------------------------------
# default flash mode is via usb dfu bootloader (luftboot) # default flash mode is via usb dfu bootloader (luftboot)
# other possibilities: JTAG, SWD, SERIAL # other possibilities: DFU-UTIL, SWD, JTAG_BMP, STLINK, SERIAL
FLASH_MODE ?= DFU FLASH_MODE ?= DFU-UTIL
DFU_ADDR = 0x8004000
DFU_PRODUCT = any
# #
# #
+1 -3
View File
@@ -11,9 +11,7 @@ BOARD_VERSION=2.6
BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\" BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
ifndef FLASH_MODE FLASH_MODE ?= IAP
FLASH_MODE = IAP
endif
LPC21ISP_BAUD = 38400 LPC21ISP_BAUD = 38400
+1 -3
View File
@@ -11,9 +11,7 @@ BOARD_VERSION=1.0
BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\" BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
ifndef FLASH_MODE FLASH_MODE ?= IAP
FLASH_MODE = IAP
endif
LPC21ISP_BAUD = 38400 LPC21ISP_BAUD = 38400
+2 -4
View File
@@ -18,10 +18,8 @@ $(TARGET).LDSCRIPT=$(SRC_ARCH)/apogee.ld
HARD_FLOAT=yes HARD_FLOAT=yes
# default flash mode is via usb dfu bootloader # default flash mode is via usb dfu bootloader
# possibilities: DFU, SWD # possibilities: STLINK, DFU-UTIL, SWD, JTAG_BMP
FLASH_MODE ?= DFU FLASH_MODE ?= STLINK
STLINK ?= n
DFU_UTIL ?= y
# #
# default LED configuration # default LED configuration
+1
View File
@@ -52,6 +52,7 @@
<boards> <boards>
<board name="apogee_*"/> <board name="apogee_*"/>
<board name="stm32f4_discovery"/> <board name="stm32f4_discovery"/>
<board name="lisa_mx*"/>
</boards> </boards>
</mode> </mode>
<mode name="STLink (SWD)"> <mode name="STLink (SWD)">