diff options
Diffstat (limited to 'tmk_core/protocol/lufa.mk')
| -rw-r--r-- | tmk_core/protocol/lufa.mk | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/tmk_core/protocol/lufa.mk b/tmk_core/protocol/lufa.mk index 9ac6298f11..0eeace44ec 100644 --- a/tmk_core/protocol/lufa.mk +++ b/tmk_core/protocol/lufa.mk @@ -5,24 +5,20 @@ LUFA_PATH ?= $(LUFA_DIR)/LUFA-git # Create the LUFA source path variables by including the LUFA makefile -ifneq (, $(wildcard $(TMK_DIR)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk)) +ifneq (, $(wildcard $(TMK_PATH)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk)) # New build system from 20120730 LUFA_ROOT_PATH = $(LUFA_PATH)/LUFA - include $(TMK_DIR)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk + include $(TMK_PATH)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk else - include $(TMK_DIR)/$(LUFA_PATH)/LUFA/makefile + include $(TMK_PATH)/$(LUFA_PATH)/LUFA/makefile endif -LUFA_SRC = $(LUFA_DIR)/lufa.c \ - $(LUFA_DIR)/descriptor.c \ +LUFA_SRC = lufa.c \ + descriptor.c \ $(LUFA_SRC_USB) ifeq ($(strip $(MIDI_ENABLE)), yes) - LUFA_SRC += $(LUFA_DIR)/midi/midi.c \ - $(LUFA_DIR)/midi/midi_device.c \ - $(LUFA_DIR)/midi/bytequeue/bytequeue.c \ - $(LUFA_DIR)/midi/bytequeue/interrupt_setting.c \ - $(LUFA_SRC_USBCLASS) + include $(TMK_PATH)/protocol/midi.mk endif ifeq ($(strip $(BLUETOOTH_ENABLE)), yes) @@ -33,8 +29,8 @@ endif SRC += $(LUFA_SRC) # Search Path -VPATH += $(TMK_DIR)/$(LUFA_DIR) -VPATH += $(TMK_DIR)/$(LUFA_PATH) +VPATH += $(TMK_PATH)/$(LUFA_DIR) +VPATH += $(TMK_PATH)/$(LUFA_PATH) # Option modules #ifdef $(or MOUSEKEY_ENABLE, PS2_MOUSE_ENABLE) @@ -51,6 +47,11 @@ LUFA_OPTS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABL LUFA_OPTS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 LUFA_OPTS += -DFIXED_NUM_CONFIGURATIONS=1 +# Remote wakeup fix for ATmega32U2 https://github.com/tmk/tmk_keyboard/issues/361 +ifeq ($(MCU),atmega32u2) + LUFA_OPTS += -DNO_LIMITED_CONTROLLER_CONNECT +endif + OPT_DEFS += -DF_USB=$(F_USB)UL OPT_DEFS += -DARCH=ARCH_$(ARCH) OPT_DEFS += $(LUFA_OPTS) |