diff options
author | Joel Challis <git@zvecr.com> | 2021-02-28 15:50:15 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-28 15:50:15 +0000 |
commit | a3cbc8a004f6ec5b0e1df326353a2a2fc8221129 (patch) | |
tree | a124699fd5e949703b24abea49df14c34b89f43a /tmk_core/common.mk | |
parent | 02dc3b672217a4bc28b68c944863efd34dc28108 (diff) | |
download | qmk_firmware-a3cbc8a004f6ec5b0e1df326353a2a2fc8221129.tar.gz qmk_firmware-a3cbc8a004f6ec5b0e1df326353a2a2fc8221129.zip |
Overhaul bootmagic logic to have single entrypoint (#8532)
* Relocate bootmagic logic to have single entrypoint
* Align init of layer state
Diffstat (limited to 'tmk_core/common.mk')
-rw-r--r-- | tmk_core/common.mk | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/tmk_core/common.mk b/tmk_core/common.mk index 238b3c69f..c2fc522ce 100644 --- a/tmk_core/common.mk +++ b/tmk_core/common.mk | |||
@@ -24,28 +24,6 @@ else | |||
24 | include $(TMK_PATH)/$(COMMON_DIR)/lib_printf.mk | 24 | include $(TMK_PATH)/$(COMMON_DIR)/lib_printf.mk |
25 | endif | 25 | endif |
26 | 26 | ||
27 | # Option modules | ||
28 | BOOTMAGIC_ENABLE ?= no | ||
29 | VALID_MAGIC_TYPES := yes full lite | ||
30 | ifneq ($(strip $(BOOTMAGIC_ENABLE)), no) | ||
31 | ifeq ($(filter $(BOOTMAGIC_ENABLE),$(VALID_MAGIC_TYPES)),) | ||
32 | $(error BOOTMAGIC_ENABLE="$(BOOTMAGIC_ENABLE)" is not a valid type of magic) | ||
33 | endif | ||
34 | ifeq ($(strip $(BOOTMAGIC_ENABLE)), lite) | ||
35 | TMK_COMMON_DEFS += -DBOOTMAGIC_LITE | ||
36 | TMK_COMMON_SRC += $(COMMON_DIR)/bootmagic_lite.c | ||
37 | |||
38 | TMK_COMMON_DEFS += -DMAGIC_ENABLE | ||
39 | TMK_COMMON_SRC += $(COMMON_DIR)/magic.c | ||
40 | else | ||
41 | TMK_COMMON_DEFS += -DBOOTMAGIC_ENABLE | ||
42 | TMK_COMMON_SRC += $(COMMON_DIR)/bootmagic.c | ||
43 | endif | ||
44 | else | ||
45 | TMK_COMMON_DEFS += -DMAGIC_ENABLE | ||
46 | TMK_COMMON_SRC += $(COMMON_DIR)/magic.c | ||
47 | endif | ||
48 | |||
49 | SHARED_EP_ENABLE = no | 27 | SHARED_EP_ENABLE = no |
50 | MOUSE_SHARED_EP ?= yes | 28 | MOUSE_SHARED_EP ?= yes |
51 | ifeq ($(strip $(KEYBOARD_SHARED_EP)), yes) | 29 | ifeq ($(strip $(KEYBOARD_SHARED_EP)), yes) |