aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFred Sundvik <fsundvik@gmail.com>2016-07-05 19:28:17 +0300
committerFred Sundvik <fsundvik@gmail.com>2016-07-05 19:28:17 +0300
commitf9a6e34c28f6de0f6ec505144acc287b90326436 (patch)
treeb7d4bc00bba07e3b0e7c298e57462b80236da7c9
parentb4cd0cfd15bf844ef5c8840592da55ceac342c9a (diff)
downloadqmk_firmware-f9a6e34c28f6de0f6ec505144acc287b90326436.tar.gz
qmk_firmware-f9a6e34c28f6de0f6ec505144acc287b90326436.zip
Add dfu-util command for programming
Also add .bin generation, which is needed for dfu-util.
-rw-r--r--tmk_core/avr.mk1
-rw-r--r--tmk_core/chibios.mk6
-rw-r--r--tmk_core/rules.mk6
3 files changed, 12 insertions, 1 deletions
diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk
index 72be5e6da..3bf2b34f8 100644
--- a/tmk_core/avr.mk
+++ b/tmk_core/avr.mk
@@ -10,6 +10,7 @@ AR = avr-ar rcs
10NM = avr-nm 10NM = avr-nm
11HEX = $(OBJCOPY) -O $(FORMAT) -R .eeprom -R .fuse -R .lock -R .signature 11HEX = $(OBJCOPY) -O $(FORMAT) -R .eeprom -R .fuse -R .lock -R .signature
12EEP = $(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 --no-change-warnings -O $(FORMAT) 12EEP = $(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 --no-change-warnings -O $(FORMAT)
13BIN =
13 14
14 15
15 16
diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk
index 0abb933a8..cb67ac6f2 100644
--- a/tmk_core/chibios.mk
+++ b/tmk_core/chibios.mk
@@ -113,6 +113,7 @@ AR = arm-none-eabi-ar
113NM = arm-none-eabi-nm 113NM = arm-none-eabi-nm
114HEX = $(OBJCOPY) -O $(FORMAT) 114HEX = $(OBJCOPY) -O $(FORMAT)
115EEP = 115EEP =
116BIN = $(OBJCOPY) -O binary
116 117
117THUMBFLAGS = -DTHUMB_PRESENT -mno-thumb-interwork -DTHUMB_NO_INTERWORKING -mthumb -DTHUMB 118THUMBFLAGS = -DTHUMB_PRESENT -mno-thumb-interwork -DTHUMB_NO_INTERWORKING -mthumb -DTHUMB
118 119
@@ -151,4 +152,7 @@ else ifneq ("$(wildcard $(KEYBOARD_PATH)/boards/$(BOARD)/bootloader_defs.h)","")
151endif 152endif
152 153
153# List any extra directories to look for libraries here. 154# List any extra directories to look for libraries here.
154EXTRALIBDIRS = $(RULESPATH)/ld \ No newline at end of file 155EXTRALIBDIRS = $(RULESPATH)/ld
156
157dfu-util: $(BUILD_DIR)/$(TARGET).bin sizeafter
158 dfu-util -D $(BUILD_DIR)/$(TARGET).bin \ No newline at end of file
diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk
index 7d3d8f9a6..352e9314b 100644
--- a/tmk_core/rules.mk
+++ b/tmk_core/rules.mk
@@ -234,6 +234,7 @@ MSG_COFF = Converting to AVR COFF:
234MSG_EXTENDED_COFF = Converting to AVR Extended COFF: 234MSG_EXTENDED_COFF = Converting to AVR Extended COFF:
235MSG_FLASH = Creating load file for Flash: 235MSG_FLASH = Creating load file for Flash:
236MSG_EEPROM = Creating load file for EEPROM: 236MSG_EEPROM = Creating load file for EEPROM:
237MSG_BIN = Creating binary load file for Flash:
237MSG_EXTENDED_LISTING = Creating Extended Listing: 238MSG_EXTENDED_LISTING = Creating Extended Listing:
238MSG_SYMBOL_TABLE = Creating Symbol Table: 239MSG_SYMBOL_TABLE = Creating Symbol Table:
239MSG_LINKING = Linking: 240MSG_LINKING = Linking:
@@ -369,6 +370,11 @@ gccversion :
369 $(eval CMD=$(NM) -n $< > $@ ) 370 $(eval CMD=$(NM) -n $< > $@ )
370 @$(BUILD_CMD) 371 @$(BUILD_CMD)
371 372
373%.bin: %.elf
374 @$(SILENT) || printf "$(MSG_BIN) $@" | $(AWK_CMD)
375 $(eval CMD=$(BIN) $< $@ || exit 0)
376 @$(BUILD_CMD)
377
372# Create library from object files. 378# Create library from object files.
373.SECONDARY : $(BUILD_DIR)/$(TARGET).a 379.SECONDARY : $(BUILD_DIR)/$(TARGET).a
374.PRECIOUS : $(OBJ) 380.PRECIOUS : $(OBJ)