diff options
| author | QMK Bot <hello@qmk.fm> | 2022-12-02 10:56:12 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-12-02 10:56:12 +0000 |
| commit | 68c54d846d98754e8ba36245e915e621d35500f9 (patch) | |
| tree | 6791b9b23212f236bd4e2f7a4a28bd1964686b2a /builddefs | |
| parent | e85439eb0472b22ad83d5e99a698aa41e398ef74 (diff) | |
| parent | cf3c26533cadf4e6739dbc9117caad01df2fa5e3 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'builddefs')
| -rw-r--r-- | builddefs/common_features.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk index 63814bbfae..d9130b5338 100644 --- a/builddefs/common_features.mk +++ b/builddefs/common_features.mk @@ -230,7 +230,7 @@ else # Wear-leveling EEPROM implementation, backed by MCU flash OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING SRC += eeprom_driver.c eeprom_wear_leveling.c - WEAR_LEVELING_DRIVER = embedded_flash + WEAR_LEVELING_DRIVER ?= embedded_flash else ifneq ($(filter $(MCU_SERIES),STM32L0xx STM32L1xx),) # True EEPROM on STM32L0xx, L1xx OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_STM32_L0_L1 @@ -239,7 +239,7 @@ else # Wear-leveling EEPROM implementation, backed by RP2040 flash OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING SRC += eeprom_driver.c eeprom_wear_leveling.c - WEAR_LEVELING_DRIVER = rp2040_flash + WEAR_LEVELING_DRIVER ?= rp2040_flash else ifneq ($(filter $(MCU_SERIES),KL2x K20x),) # Teensy EEPROM implementations OPT_DEFS += -DEEPROM_KINETIS_FLEXRAM |