diff options
author | Nick Brassel <nick@tzarc.org> | 2019-11-06 08:04:50 +1100 |
---|---|---|
committer | Nick Brassel <nick@tzarc.org> | 2020-01-24 12:45:58 +1100 |
commit | d13ada11622977bcc0b530212b4405229805016d (patch) | |
tree | 3f8874ac3c9b5950b1fed6ac4d0081a268d9f487 /tmk_core/common.mk | |
parent | 6ff093efbee21d3f64f5b4bfdbc66d4648490523 (diff) | |
download | qmk_firmware-d13ada11622977bcc0b530212b4405229805016d.tar.gz qmk_firmware-d13ada11622977bcc0b530212b4405229805016d.zip |
Add customisable EEPROM driver selection (#7274)
- uprintf -> dprintf
- Fix atsam "vendor" eeprom.
- Bump Kinetis K20x to 64 bytes, too.
- Rollback Kinetis to 32 bytes as partitioning can only be done once. Add warning about changing the value.
- Change RAM-backed "fake" EEPROM implementations to match eeconfig's current usage.
- Add 24LC128 by request.
Diffstat (limited to 'tmk_core/common.mk')
-rw-r--r-- | tmk_core/common.mk | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/tmk_core/common.mk b/tmk_core/common.mk index 8f355da12..5f149d8f4 100644 --- a/tmk_core/common.mk +++ b/tmk_core/common.mk | |||
@@ -26,29 +26,11 @@ TMK_COMMON_SRC += $(COMMON_DIR)/host.c \ | |||
26 | $(PLATFORM_COMMON_DIR)/bootloader.c \ | 26 | $(PLATFORM_COMMON_DIR)/bootloader.c \ |
27 | 27 | ||
28 | ifeq ($(PLATFORM),AVR) | 28 | ifeq ($(PLATFORM),AVR) |
29 | TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/xprintf.S | 29 | TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/xprintf.S |
30 | endif | 30 | endif |
31 | 31 | ||
32 | ifeq ($(PLATFORM),CHIBIOS) | 32 | ifeq ($(PLATFORM),CHIBIOS) |
33 | TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/printf.c | 33 | TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/printf.c |
34 | ifeq ($(MCU_SERIES), STM32F3xx) | ||
35 | TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/eeprom_stm32.c | ||
36 | TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/flash_stm32.c | ||
37 | TMK_COMMON_DEFS += -DEEPROM_EMU_STM32F303xC | ||
38 | TMK_COMMON_DEFS += -DSTM32_EEPROM_ENABLE | ||
39 | else ifeq ($(MCU_SERIES), STM32F1xx) | ||
40 | TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/eeprom_stm32.c | ||
41 | TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/flash_stm32.c | ||
42 | TMK_COMMON_DEFS += -DEEPROM_EMU_STM32F103xB | ||
43 | TMK_COMMON_DEFS += -DSTM32_EEPROM_ENABLE | ||
44 | else ifeq ($(MCU_SERIES)_$(MCU_LDSCRIPT), STM32F0xx_STM32F072xB) | ||
45 | TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/eeprom_stm32.c | ||
46 | TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/flash_stm32.c | ||
47 | TMK_COMMON_DEFS += -DEEPROM_EMU_STM32F072xB | ||
48 | TMK_COMMON_DEFS += -DSTM32_EEPROM_ENABLE | ||
49 | else | ||
50 | TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/eeprom_teensy.c | ||
51 | endif | ||
52 | ifeq ($(strip $(AUTO_SHIFT_ENABLE)), yes) | 34 | ifeq ($(strip $(AUTO_SHIFT_ENABLE)), yes) |
53 | TMK_COMMON_SRC += $(CHIBIOS)/os/various/syscalls.c | 35 | TMK_COMMON_SRC += $(CHIBIOS)/os/various/syscalls.c |
54 | else ifeq ($(strip $(TERMINAL_ENABLE)), yes) | 36 | else ifeq ($(strip $(TERMINAL_ENABLE)), yes) |
@@ -57,15 +39,9 @@ ifeq ($(PLATFORM),CHIBIOS) | |||
57 | endif | 39 | endif |
58 | 40 | ||
59 | ifeq ($(PLATFORM),ARM_ATSAM) | 41 | ifeq ($(PLATFORM),ARM_ATSAM) |
60 | TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/printf.c | 42 | TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/printf.c |
61 | TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/eeprom.c | ||
62 | endif | 43 | endif |
63 | 44 | ||
64 | ifeq ($(PLATFORM),TEST) | ||
65 | TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/eeprom.c | ||
66 | endif | ||
67 | |||
68 | |||
69 | 45 | ||
70 | # Option modules | 46 | # Option modules |
71 | BOOTMAGIC_ENABLE ?= no | 47 | BOOTMAGIC_ENABLE ?= no |