Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2020-12-14 19:13:38 +00:00
commit ac0ad5ad17

View File

@ -1,24 +1,29 @@
BOOTMAGIC = lite BOOTMAGIC_ENABLE = lite
DYNAMIC_KEYMAP_ENABLE = no DYNAMIC_KEYMAP_ENABLE = no
CONSOLE_ENABLE = yes
COMMAND_ENABLE = yes
LTO_ENABLE = yes LTO_ENABLE = yes
AUDIO_ENABLE = no AUDIO_ENABLE = no
# only enable audio on specific boards # only enable audio on specific boards
ifeq ($(strip $(KEYBOARD)), evyd13/plain60) ifeq ($(strip $(KEYBOARD)), evyd13/plain60)
AUDIO_ENABLE = yes AUDIO_ENABLE = yes
CONSOLE_ENABLE = yes
COMMAND_ENABLE = yes
endif endif
ifeq ($(strip $(KEYBOARD)), clueboard/60) ifeq ($(strip $(KEYBOARD)), clueboard/60)
AUDIO_ENABLE = yes AUDIO_ENABLE = yes
CONSOLE_ENABLE = yes
COMMAND_ENABLE = yes
endif endif
ifeq ($(strip $(KEYBOARD)), hadron/ver3) ifeq ($(strip $(KEYBOARD)), hadron/ver3)
AUDIO_ENABLE = yes AUDIO_ENABLE = yes
CONSOLE_ENABLE = yes
COMMAND_ENABLE = yes
endif endif
ifeq ($(strip $(KEYBOARD)), fruity60) ifeq ($(strip $(KEYBOARD)), fruity60)
CONSOLE_ENABLE = yes
COMMAND_ENABLE = no COMMAND_ENABLE = no
endif endif
@ -28,4 +33,6 @@ endif
ifeq ($(strip $(KEYBOARD)), ai03/polaris) ifeq ($(strip $(KEYBOARD)), ai03/polaris)
RGBLIGHT_ENABLE = no RGBLIGHT_ENABLE = no
CONSOLE_ENABLE = yes
COMMAND_ENABLE = yes
endif endif