summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorhathach <[email protected]>2019-03-17 15:42:57 +0700
committerhathach <[email protected]>2019-03-17 15:42:57 +0700
commit11eed2f0260c8f71ae14c01403f49bcf2bcf47bd (patch)
tree06da4ac42b474e0cef164fb55a3772bba1e82f36 /examples
parentf932cf38547be27de8978e69385bbdf555d2f109 (diff)
update flash-jlink target for m0 and m4 board
Diffstat (limited to 'examples')
-rw-r--r--examples/device/cdc_msc_hid/Makefile14
1 files changed, 10 insertions, 4 deletions
diff --git a/examples/device/cdc_msc_hid/Makefile b/examples/device/cdc_msc_hid/Makefile
index 21dd059c7..84f313887 100644
--- a/examples/device/cdc_msc_hid/Makefile
+++ b/examples/device/cdc_msc_hid/Makefile
@@ -21,7 +21,6 @@ include $(TOP)/hw/bsp/$(BOARD)/board.mk
CC = $(CROSS_COMPILE)gcc
CXX = $(CROSS_COMPILE)g++
-LD = $(CROSS_COMPILE)ld
OBJCOPY = $(CROSS_COMPILE)objcopy
SIZE = $(CROSS_COMPILE)size
MKDIR = mkdir
@@ -106,7 +105,7 @@ $(OBJ_DIRS):
$(BUILD)/$(BOARD)-firmware.elf: $(OBJ)
@echo LINK $@
- @$(CC) -o $@ $(LDFLAGS) $^ -Wl,--start-group $(LIBS) -Wl,--end-group
+ $(CC) -o $@ $(LDFLAGS) $^ -Wl,--start-group $(LIBS) -Wl,--end-group
$(BUILD)/$(BOARD)-firmware.bin: $(BUILD)/$(BOARD)-firmware.elf
@echo CREATE $@
@@ -136,6 +135,7 @@ vpath %.s . $(TOP)
$(BUILD)/obj/%.o: %.s
@echo AS $(notdir $@)
$(AS) -o $@ $<
+ #$(CC) -x assembler-with-cpp $(ASFLAGS) -c -o $@ $<
# ASM sources upper case .S
vpath %.S . $(TOP)
@@ -150,12 +150,18 @@ else
JLINKEXE = JLinkExe
endif
-flash: $(BUILD)/$(BOARD)-firmware.hex
+# default jlink interface is swd
+ifeq ($(JLINK_IF),)
+ JLINK_IF = swd
+endif
+
+flash-jlink: $(BUILD)/$(BOARD)-firmware.hex
@echo halt > $(BUILD)/$(BOARD).jlink
@echo loadfile $^ >> $(BUILD)/$(BOARD).jlink
+ @echo r >> $(BUILD)/$(BOARD).jlink
@echo go >> $(BUILD)/$(BOARD).jlink
@echo exit >> $(BUILD)/$(BOARD).jlink
- #$(JLINKEXE) -device stm32f407vg -if swd -speed auto -CommandFile $(BUILD)/$(BOARD).jlink
+ $(JLINKEXE) -device $(JLINK_DEVICE) -if $(JLINK_IF) -speed auto -CommandFile $(BUILD)/$(BOARD).jlink
size: $(BUILD)/$(BOARD)-firmware.elf
-@echo ''