diff options
author | skullY <skullydazed@gmail.com> | 2020-05-04 09:25:44 -0700 |
---|---|---|
committer | skullY <skullydazed@gmail.com> | 2020-05-04 09:25:44 -0700 |
commit | 6f30b402a285ddecce9b6f5b002a649f775225d2 (patch) | |
tree | 5a25c7334d931a56d9fbfad80b6284cda7e38950 /tmk_core/common.mk | |
parent | 1ff526dac0e73ea8cce522d0106631e3a748802c (diff) | |
download | qmk_firmware-6f30b402a285ddecce9b6f5b002a649f775225d2.tar.gz qmk_firmware-6f30b402a285ddecce9b6f5b002a649f775225d2.zip |
Revert "Fix conflicting types for 'tfp_printf' (#8269)"
This reverts commit e17b55e33ad5b3dcefcf7b828ac99aeb2daeeae2.
Diffstat (limited to 'tmk_core/common.mk')
-rw-r--r-- | tmk_core/common.mk | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/tmk_core/common.mk b/tmk_core/common.mk index 63de7c7ed..aa8a0eb7a 100644 --- a/tmk_core/common.mk +++ b/tmk_core/common.mk | |||
@@ -1,5 +1,3 @@ | |||
1 | PRINTF_PATH = $(LIB_PATH)/printf | ||
2 | |||
3 | COMMON_DIR = common | 1 | COMMON_DIR = common |
4 | PLATFORM_COMMON_DIR = $(COMMON_DIR)/$(PLATFORM_KEY) | 2 | PLATFORM_COMMON_DIR = $(COMMON_DIR)/$(PLATFORM_KEY) |
5 | 3 | ||
@@ -23,12 +21,7 @@ TMK_COMMON_SRC += $(COMMON_DIR)/host.c \ | |||
23 | ifeq ($(PLATFORM),AVR) | 21 | ifeq ($(PLATFORM),AVR) |
24 | TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/xprintf.S | 22 | TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/xprintf.S |
25 | else ifeq ($(PLATFORM),CHIBIOS) | 23 | else ifeq ($(PLATFORM),CHIBIOS) |
26 | TMK_COMMON_SRC += $(PRINTF_PATH)/printf.c | 24 | TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/printf.c |
27 | TMK_COMMON_DEFS += -DPRINTF_DISABLE_SUPPORT_FLOAT | ||
28 | TMK_COMMON_DEFS += -DPRINTF_DISABLE_SUPPORT_EXPONENTIAL | ||
29 | TMK_COMMON_DEFS += -DPRINTF_DISABLE_SUPPORT_LONG_LONG | ||
30 | TMK_COMMON_DEFS += -DPRINTF_DISABLE_SUPPORT_PTRDIFF_T | ||
31 | VPATH += $(PRINTF_PATH) | ||
32 | else ifeq ($(PLATFORM),ARM_ATSAM) | 25 | else ifeq ($(PLATFORM),ARM_ATSAM) |
33 | TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/printf.c | 26 | TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/printf.c |
34 | endif | 27 | endif |