Skip to content

Commit 2728603

Browse files
authored
Move tmk_core/common/<plat> (#13918)
1 parent 43b9e23 commit 2728603

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+54
-54
lines changed

build_keyboard.mk

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ VPATH += $(COMMON_VPATH)
388388
include common_features.mk
389389
include $(BUILDDEFS_PATH)/generic_features.mk
390390
include $(TMK_PATH)/protocol.mk
391-
include $(TMK_PATH)/common.mk
391+
include $(PLATFORM_PATH)/common.mk
392392
include $(BUILDDEFS_PATH)/bootloader.mk
393393

394394
SRC += $(patsubst %.c,%.clib,$(LIB_SRC))
@@ -404,13 +404,14 @@ ifneq ($(REQUIRE_PLATFORM_KEY),)
404404
endif
405405
endif
406406

407-
include $(TMK_PATH)/$(PLATFORM_KEY).mk
407+
include $(PLATFORM_PATH)/$(PLATFORM_KEY)/platform.mk
408+
-include $(PLATFORM_PATH)/$(PLATFORM_KEY)/flash.mk
409+
408410
ifneq ($(strip $(PROTOCOL)),)
409411
include $(TMK_PATH)/protocol/$(strip $(shell echo $(PROTOCOL) | tr '[:upper:]' '[:lower:]')).mk
410412
else
411413
include $(TMK_PATH)/protocol/$(PLATFORM_KEY).mk
412414
endif
413-
-include $(TOP_DIR)/platforms/$(PLATFORM_KEY)/flash.mk
414415

415416
# TODO: remove this bodge?
416417
PROJECT_DEFS := $(OPT_DEFS)

build_test.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ endif
5454

5555
include common_features.mk
5656
include $(BUILDDEFS_PATH)/generic_features.mk
57-
include $(TMK_PATH)/common.mk
57+
include $(PLATFORM_PATH)/common.mk
5858
include $(TMK_PATH)/protocol.mk
5959
include $(QUANTUM_PATH)/debounce/tests/rules.mk
6060
include $(QUANTUM_PATH)/sequencer/tests/rules.mk
61-
include $(TMK_PATH)/common/test/rules.mk
61+
include $(PLATFORM_PATH)/test/rules.mk
6262
ifneq ($(filter $(FULL_TESTS),$(TEST)),)
6363
include build_full_test.mk
6464
endif
@@ -73,7 +73,7 @@ $(TEST_OBJ)/$(TEST)_INC := $($(TEST)_INC) $(VPATH) $(GTEST_INC)
7373
$(TEST_OBJ)/$(TEST)_DEFS := $($(TEST)_DEFS)
7474
$(TEST_OBJ)/$(TEST)_CONFIG := $($(TEST)_CONFIG)
7575

76-
include $(TMK_PATH)/native.mk
76+
include $(PLATFORM_PATH)/$(PLATFORM_KEY)/platform.mk
7777
include $(TMK_PATH)/rules.mk
7878

7979

common_features.mk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,10 @@ QUANTUM_SRC += \
3333

3434
VPATH += $(QUANTUM_DIR)/logging
3535
# Fall back to lib/printf if there is no platform provided print
36-
ifeq ("$(wildcard $(TMK_PATH)/common/$(PLATFORM_KEY)/printf.mk)","")
36+
ifeq ("$(wildcard $(PLATFORM_PATH)/$(PLATFORM_KEY)/printf.mk)","")
3737
include $(QUANTUM_PATH)/logging/print.mk
38+
else
39+
include $(PLATFORM_PATH)/$(PLATFORM_KEY)/printf.mk
3840
endif
3941

4042
ifeq ($(strip $(DEBUG_MATRIX_SCAN_RATE_ENABLE)), yes)

docs/feature_layers.md

Lines changed: 1 addition & 1 deletion

docs/fr-fr/faq_keymap.md

Lines changed: 1 addition & 1 deletion

docs/internals_gpio_control.md

Lines changed: 1 addition & 1 deletion

docs/ja/faq_keymap.md

Lines changed: 1 addition & 1 deletion

docs/ja/feature_layers.md

Lines changed: 1 addition & 1 deletion

docs/ja/pr_checklist.md

Lines changed: 1 addition & 1 deletion

docs/pr_checklist.md

Lines changed: 1 addition & 1 deletion

0 commit comments

Comments
 (0)