Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

More common settings for unit tests and keyboards

Browse source
This commit is contained in:
Fred Sundvik 2016-08-27 13:43:12 +03:00
parent fc855cb30e
commit c692fd1d55
4 changed files with 59 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
build_keyboard.mk
View file

@ -23,6 +23,16 @@ ifdef master
MASTER = $(master) MASTER = $(master)
endif endif
ifeq ($(MASTER),right)
OPT_DEFS += -DMASTER_IS_ON_RIGHT
else
ifneq ($(MASTER),left)
$(error MASTER does not have a valid value(left/right))
endif
endif
KEYBOARD_PATH := keyboards/$(KEYBOARD) KEYBOARD_PATH := keyboards/$(KEYBOARD)
KEYBOARD_C := $(KEYBOARD_PATH)/$(KEYBOARD).c KEYBOARD_C := $(KEYBOARD_PATH)/$(KEYBOARD).c
@ -169,15 +179,14 @@ ifneq ($(SUBPROJECT),)
VPATH += $(SUBPROJECT_PATH) VPATH += $(SUBPROJECT_PATH)
endif endif
VPATH += $(KEYBOARD_PATH) VPATH += $(KEYBOARD_PATH)
VPATH += $(TOP_DIR) VPATH += $(COMMON_VPATH)
VPATH += $(TMK_PATH)
VPATH += $(QUANTUM_PATH)
VPATH += $(QUANTUM_PATH)/keymap_extras
VPATH += $(QUANTUM_PATH)/audio
VPATH += $(QUANTUM_PATH)/process_keycode
include $(TMK_PATH)/common.mk include $(TMK_PATH)/common.mk
SRC += $(TMK_COMMON_SRC)
OPT_DEFS += $(TMK_COMMON_DEFS)
EXTRALDFLAGS += $(TMK_COMMON_LDFLAGS)
ifeq ($(PLATFORM),AVR) ifeq ($(PLATFORM),AVR)
include $(TMK_PATH)/protocol/lufa.mk include $(TMK_PATH)/protocol/lufa.mk
include $(TMK_PATH)/avr.mk include $(TMK_PATH)/avr.mk
@ -189,11 +198,13 @@ ifeq ($(strip $(VISUALIZER_ENABLE)), yes)
include $(VISUALIZER_PATH)/visualizer.mk include $(VISUALIZER_PATH)/visualizer.mk
endif endif
$(info $(VPATH))
OUTPUTS := $(KEYMAP_OUTPUT) $(KEYBOARD_OUTPUT) OUTPUTS := $(KEYMAP_OUTPUT) $(KEYBOARD_OUTPUT)
$(KEYMAP_OUTPUT)_SRC := $(SRC) $(KEYMAP_OUTPUT)_SRC := $(SRC)
$(KEYMAP_OUTPUT)_DEFS := $(OPT_DEFS) -DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYMAP=\"$(KEYMAP)\" $(KEYMAP_OUTPUT)_DEFS := $(OPT_DEFS) -DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYMAP=\"$(KEYMAP)\"
$(KEYMAP_OUTPUT)_INC := $(EXTRAINCDIRS) $(VPATH) $(KEYMAP_OUTPUT)_INC := $(VPATH) $(EXTRAINCDIRS)
$(KEYMAP_OUTPUT)_CONFIG := $(CONFIG_H) $(KEYMAP_OUTPUT)_CONFIG := $(CONFIG_H)
$(KEYBOARD_OUTPUT)_SRC := $(CHIBISRC) $(KEYBOARD_OUTPUT)_SRC := $(CHIBISRC)
$(KEYBOARD_OUTPUT)_DEFS := $(PROJECT_DEFS) $(KEYBOARD_OUTPUT)_DEFS := $(PROJECT_DEFS)

3
build_test.mk
View file

@ -38,6 +38,9 @@ VPATH +=\
all: elf all: elf
VPATH += $(COMMON_VPATH)
include $(TMK_PATH)/common.mk
include $(QUANTUM_PATH)/serial_link/tests/rules.mk include $(QUANTUM_PATH)/serial_link/tests/rules.mk
$(TEST_OBJ)/$(TEST)_SRC := $($(TEST)_SRC) $(TEST_OBJ)/$(TEST)_SRC := $($(TEST)_SRC)

14
common.mk
View file

@ -17,10 +17,10 @@ SERIAL_SRC := $(wildcard $(SERIAL_PATH)/protocol/*.c)
SERIAL_SRC += $(wildcard $(SERIAL_PATH)/system/*.c) SERIAL_SRC += $(wildcard $(SERIAL_PATH)/system/*.c)
SERIAL_DEFS += -DSERIAL_LINK_ENABLE SERIAL_DEFS += -DSERIAL_LINK_ENABLE
VPATH += $(TOP_DIR) COMMON_VPATH := $(TOP_DIR)
VPATH += $(TMK_PATH) COMMON_VPATH += $(TMK_PATH)
VPATH += $(QUANTUM_PATH) COMMON_VPATH += $(QUANTUM_PATH)
VPATH += $(QUANTUM_PATH)/keymap_extras COMMON_VPATH += $(QUANTUM_PATH)/keymap_extras
VPATH += $(QUANTUM_PATH)/audio COMMON_VPATH += $(QUANTUM_PATH)/audio
VPATH += $(QUANTUM_PATH)/process_keycode COMMON_VPATH += $(QUANTUM_PATH)/process_keycode
VPATH += $(SERIAL_PATH) COMMON_VPATH += $(SERIAL_PATH)

71
tmk_core/common.mk
View file

@ -5,7 +5,7 @@ else ifeq ($(PLATFORM),CHIBIOS)
PLATFORM_COMMON_DIR = $(COMMON_DIR)/chibios PLATFORM_COMMON_DIR = $(COMMON_DIR)/chibios
endif endif
SRC += $(COMMON_DIR)/host.c \ TMK_COMMON_SRC += $(COMMON_DIR)/host.c \
$(COMMON_DIR)/keyboard.c \ $(COMMON_DIR)/keyboard.c \
$(COMMON_DIR)/action.c \ $(COMMON_DIR)/action.c \
$(COMMON_DIR)/action_tapping.c \ $(COMMON_DIR)/action_tapping.c \
@ -21,98 +21,89 @@ SRC += $(COMMON_DIR)/host.c \
$(PLATFORM_COMMON_DIR)/bootloader.c \ $(PLATFORM_COMMON_DIR)/bootloader.c \
ifeq ($(PLATFORM),AVR) ifeq ($(PLATFORM),AVR)
SRC += $(PLATFORM_COMMON_DIR)/xprintf.S TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/xprintf.S
endif endif
ifeq ($(PLATFORM),CHIBIOS) ifeq ($(PLATFORM),CHIBIOS)
SRC += $(PLATFORM_COMMON_DIR)/printf.c TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/printf.c
SRC += $(PLATFORM_COMMON_DIR)/eeprom.c TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/eeprom.c
endif endif
# Option modules # Option modules
ifeq ($(strip $(BOOTMAGIC_ENABLE)), yes) ifeq ($(strip $(BOOTMAGIC_ENABLE)), yes)
OPT_DEFS += -DBOOTMAGIC_ENABLE TMK_COMMON_DEFS += -DBOOTMAGIC_ENABLE
SRC += $(COMMON_DIR)/bootmagic.c TMK_COMMON_SRC += $(COMMON_DIR)/bootmagic.c
else else
OPT_DEFS += -DMAGIC_ENABLE TMK_COMMON_DEFS += -DMAGIC_ENABLE
SRC += $(COMMON_DIR)/magic.c TMK_COMMON_SRC += $(COMMON_DIR)/magic.c
endif endif
ifeq ($(strip $(MOUSEKEY_ENABLE)), yes) ifeq ($(strip $(MOUSEKEY_ENABLE)), yes)
SRC += $(COMMON_DIR)/mousekey.c TMK_COMMON_SRC += $(COMMON_DIR)/mousekey.c
OPT_DEFS += -DMOUSEKEY_ENABLE TMK_COMMON_DEFS += -DMOUSEKEY_ENABLE
OPT_DEFS += -DMOUSE_ENABLE TMK_COMMON_DEFS += -DMOUSE_ENABLE
endif endif
ifeq ($(strip $(EXTRAKEY_ENABLE)), yes) ifeq ($(strip $(EXTRAKEY_ENABLE)), yes)
OPT_DEFS += -DEXTRAKEY_ENABLE TMK_COMMON_DEFS += -DEXTRAKEY_ENABLE
endif endif
ifeq ($(strip $(CONSOLE_ENABLE)), yes) ifeq ($(strip $(CONSOLE_ENABLE)), yes)
OPT_DEFS += -DCONSOLE_ENABLE TMK_COMMON_DEFS += -DCONSOLE_ENABLE
else else
OPT_DEFS += -DNO_PRINT TMK_COMMON_DEFS += -DNO_PRINT
OPT_DEFS += -DNO_DEBUG TMK_COMMON_DEFS += -DNO_DEBUG
endif endif
ifeq ($(strip $(COMMAND_ENABLE)), yes) ifeq ($(strip $(COMMAND_ENABLE)), yes)
SRC += $(COMMON_DIR)/command.c TMK_COMMON_SRC += $(COMMON_DIR)/command.c
OPT_DEFS += -DCOMMAND_ENABLE TMK_COMMON_DEFS += -DCOMMAND_ENABLE
endif endif
ifeq ($(strip $(NKRO_ENABLE)), yes) ifeq ($(strip $(NKRO_ENABLE)), yes)
OPT_DEFS += -DNKRO_ENABLE TMK_COMMON_DEFS += -DNKRO_ENABLE
endif endif
ifeq ($(strip $(USB_6KRO_ENABLE)), yes) ifeq ($(strip $(USB_6KRO_ENABLE)), yes)
OPT_DEFS += -DUSB_6KRO_ENABLE TMK_COMMON_DEFS += -DUSB_6KRO_ENABLE
endif endif
ifeq ($(strip $(SLEEP_LED_ENABLE)), yes) ifeq ($(strip $(SLEEP_LED_ENABLE)), yes)
SRC += $(PLATFORM_COMMON_DIR)/sleep_led.c TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/sleep_led.c
OPT_DEFS += -DSLEEP_LED_ENABLE TMK_COMMON_DEFS += -DSLEEP_LED_ENABLE
OPT_DEFS += -DNO_SUSPEND_POWER_DOWN TMK_COMMON_DEFS += -DNO_SUSPEND_POWER_DOWN
endif endif
ifeq ($(strip $(BACKLIGHT_ENABLE)), yes) ifeq ($(strip $(BACKLIGHT_ENABLE)), yes)
SRC += $(COMMON_DIR)/backlight.c TMK_COMMON_SRC += $(COMMON_DIR)/backlight.c
OPT_DEFS += -DBACKLIGHT_ENABLE TMK_COMMON_DEFS += -DBACKLIGHT_ENABLE
endif endif
ifeq ($(strip $(BLUETOOTH_ENABLE)), yes) ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
OPT_DEFS += -DBLUETOOTH_ENABLE TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE
endif endif
ifeq ($(strip $(ONEHAND_ENABLE)), yes) ifeq ($(strip $(ONEHAND_ENABLE)), yes)
OPT_DEFS += -DONEHAND_ENABLE TMK_COMMON_DEFS += -DONEHAND_ENABLE
endif endif
ifeq ($(strip $(KEYMAP_SECTION_ENABLE)), yes) ifeq ($(strip $(KEYMAP_SECTION_ENABLE)), yes)
OPT_DEFS += -DKEYMAP_SECTION_ENABLE TMK_COMMON_DEFS += -DKEYMAP_SECTION_ENABLE
ifeq ($(strip $(MCU)),atmega32u2) ifeq ($(strip $(MCU)),atmega32u2)
EXTRALDFLAGS = -Wl,-L$(TMK_DIR),-Tldscript_keymap_avr35.x TMK_COMMON_LDFLAGS = -Wl,-L$(TMK_DIR),-Tldscript_keymap_avr35.x
else ifeq ($(strip $(MCU)),atmega32u4) else ifeq ($(strip $(MCU)),atmega32u4)
EXTRALDFLAGS = -Wl,-L$(TMK_DIR),-Tldscript_keymap_avr5.x TMK_COMMON_LDFLAGS = -Wl,-L$(TMK_DIR),-Tldscript_keymap_avr5.x
else else
EXTRALDFLAGS = $(error no ldscript for keymap section) TMK_COMMON_LDFLAGS = $(error no ldscript for keymap section)
endif endif
endif endif
ifeq ($(MASTER),right)
OPT_DEFS += -DMASTER_IS_ON_RIGHT
else
ifneq ($(MASTER),left)
$(error MASTER does not have a valid value(left/right))
endif
endif
# Bootloader address # Bootloader address
ifdef STM32_BOOTLOADER_ADDRESS ifdef STM32_BOOTLOADER_ADDRESS
OPT_DEFS += -DSTM32_BOOTLOADER_ADDRESS=$(STM32_BOOTLOADER_ADDRESS) TMK_COMMON_DEFS += -DSTM32_BOOTLOADER_ADDRESS=$(STM32_BOOTLOADER_ADDRESS)
endif endif
# Search Path # Search Path