diff options
author | Takuya Urakawa <urkwtky@gmail.com> | 2018-10-19 13:33:23 +0900 |
---|---|---|
committer | Jack Humbert <jack.humb@gmail.com> | 2018-10-19 00:33:23 -0400 |
commit | f4094930a393ec3dc597e06e95cd3365e3f8cb97 (patch) | |
tree | 33d53e5b898bf645965dfc99f842cf1998b857d4 /tmk_core/common.mk | |
parent | 8efe8b498d344928fb55ea78a289d9eb32145e48 (diff) | |
download | qmk_firmware-f4094930a393ec3dc597e06e95cd3365e3f8cb97.tar.gz qmk_firmware-f4094930a393ec3dc597e06e95cd3365e3f8cb97.zip |
stm32f1xx EEPROM emulation (#3914)
* * Add stm32f1xx EEPROM emulation
* Fix eeprom update compare bug
Squashed commit of the following:
commit b8f248ae08cec0cd81ecbb8854d9b39221d4d573
Author: hsgw <urkwtky@gmail.com>
Date: Sat Sep 15 19:13:48 2018 +0900
fix EEPROM_update wrong compare
commit d4ed4e6ea864e967a3e17f7edee4b0c3b4a25541
Author: hsgw <urkwtky@gmail.com>
Date: Sat Sep 15 17:43:47 2018 +0900
eeprom fix initialization define
commit b61aa7c04d70c64df3416d63e5da08b73b6053af
Author: hsgw <urkwtky@gmail.com>
Date: Sat Sep 15 16:33:40 2018 +0900
maybe working
* Fix FLASH_KEY defines
Diffstat (limited to 'tmk_core/common.mk')
-rw-r--r-- | tmk_core/common.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tmk_core/common.mk b/tmk_core/common.mk index 4a0f7dcf9..33bcc97b2 100644 --- a/tmk_core/common.mk +++ b/tmk_core/common.mk | |||
@@ -34,6 +34,13 @@ ifeq ($(PLATFORM),CHIBIOS) | |||
34 | ifeq ($(MCU_SERIES), STM32F3xx) | 34 | ifeq ($(MCU_SERIES), STM32F3xx) |
35 | TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/eeprom_stm32.c | 35 | TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/eeprom_stm32.c |
36 | TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/flash_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 | ||
37 | else | 44 | else |
38 | TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/eeprom_teensy.c | 45 | TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/eeprom_teensy.c |
39 | endif | 46 | endif |