diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2015-01-14 22:48:54 -0500 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2015-01-14 22:48:54 -0500 |
| commit | a54da1b92663606f5e5c18bc1eaec30c06847da1 (patch) | |
| tree | a1b7485debf62a8c52d1db3199436cac2f3ce346 /converter/terminal_bluefruit/Makefile | |
| parent | 4225f0353c2eb85fbd8ca0622eb89757975093e4 (diff) | |
| parent | 10a6b2c7d8bc9c5d2657acdeefa1102be5035280 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'converter/terminal_bluefruit/Makefile')
| -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 |