diff options
| author | Olivier <olivier@gid0.org> | 2016-08-20 18:07:02 +0200 |
|---|---|---|
| committer | Olivier <olivier@gid0.org> | 2016-08-20 18:07:02 +0200 |
| commit | 009ab77d3e26bd348e45a9a8102b2737c9367979 (patch) | |
| tree | b01491320736c818584098c4b7a6dce8de53f405 /keyboards/atreus/Makefile | |
| parent | 4cfb262faab653247f4d66d44bf5f3339d82bd36 (diff) | |
| parent | a3f726174c0f8f358f7970767a1bf743fd9ad761 (diff) | |
| download | qmk_firmware-009ab77d3e26bd348e45a9a8102b2737c9367979.tar.gz qmk_firmware-009ab77d3e26bd348e45a9a8102b2737c9367979.tar.xz | |
Merge https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'keyboards/atreus/Makefile')
| -rw-r--r-- | keyboards/atreus/Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/keyboards/atreus/Makefile b/keyboards/atreus/Makefile index 72b694faa..5894d231f 100644 --- a/keyboards/atreus/Makefile +++ b/keyboards/atreus/Makefile @@ -2,10 +2,11 @@ ifdef TEENSY2 OPT_DEFS += -DATREUS_TEENSY2 - ATRUES_UPLOAD_COMMAND = teensy_loader_cli -w -mmcu=$(MCU) $(TARGET).hex + ATREUS_UPLOAD_COMMAND = teensy_loader_cli -w -mmcu=$(MCU) $(TARGET).hex else OPT_DEFS += -DATREUS_ASTAR - ATRUES_UPLOAD_COMMAND = while [ ! -r $(USB) ]; do sleep 1; done; \ + OPT_DEFS += -DCATERINA_BOOTLOADER + ATREUS_UPLOAD_COMMAND = while [ ! -r $(USB) ]; do sleep 1; done; \ avrdude -p $(MCU) -c avr109 -U flash:w:$(TARGET).hex -P $(USB) endif @@ -83,5 +84,5 @@ endif USB ?= /dev/cu.usbmodem1411 upload: build - $(ATRUES_UPLOAD_COMMAND) -
\ No newline at end of file + $(ATREUS_UPLOAD_COMMAND) + |