diff options
| author | Nathan Ross Powell <nathanrosspowell@gmail.com> | 2015-03-18 23:33:42 -0400 |
|---|---|---|
| committer | Nathan Ross Powell <nathanrosspowell@gmail.com> | 2015-03-18 23:33:42 -0400 |
| commit | 80c4cdb245a3ff55627d40a3a164073b30382def (patch) | |
| tree | e134969a2fc20979101a7e9e7aa06c1877bf82eb /converter/terminal_bluefruit | |
| parent | e7289bb029b28b824eb0ef7be23dba279057d7ac (diff) | |
| parent | 9c3a95663410a294f2c85ad2d1c016f328730e0b (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'converter/terminal_bluefruit')
| -rw-r--r-- | converter/terminal_bluefruit/Makefile | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/converter/terminal_bluefruit/Makefile b/converter/terminal_bluefruit/Makefile index 83d68fc252..28b7397bae 100644 --- a/converter/terminal_bluefruit/Makefile +++ b/converter/terminal_bluefruit/Makefile @@ -83,21 +83,6 @@ COMMAND_ENABLE = yes # Commands for debug and configuration PS2_USE_INT = yes # uses external interrupt for falling edge of PS/2 clock pin #PS2_USE_BUSYWAIT = yes # uses primitive reference code -ifdef PS2_USE_USART - SRC += protocol/ps2_usart.c - OPT_DEFS += -DPS2_USE_USART -endif - -ifdef PS2_USE_INT - SRC += protocol/ps2.c - OPT_DEFS += -DPS2_USE_INT -endif - -ifdef PS2_USE_BUSYWAIT - SRC += protocol/ps2.c - OPT_DEFS += -DPS2_USE_BUSYWAIT -endif - #---------------- Programming Options -------------------------- PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex @@ -107,6 +92,7 @@ VPATH += $(TARGET_DIR) VPATH += $(TOP_DIR) +include $(TOP_DIR)/protocol.mk include $(TOP_DIR)/protocol/bluefruit.mk include $(TOP_DIR)/protocol.mk include $(TOP_DIR)/common.mk |