1 files changed, 74 insertions, 72 deletions
diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index 802e01de43..f30a456fc3 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -171,80 +171,82 @@ endif
 VALID_EEPROM_DRIVER_TYPES := vendor custom transient i2c spi wear_leveling legacy_stm32_flash
 EEPROM_DRIVER ?= vendor
-ifeq ($(filter $(EEPROM_DRIVER),$(VALID_EEPROM_DRIVER_TYPES)),)
+ifneq ($(strip $(EEPROM_DRIVER)),none)
+  ifeq ($(filter $(EEPROM_DRIVER),$(VALID_EEPROM_DRIVER_TYPES)),)
  $(call CATASTROPHIC_ERROR,Invalid EEPROM_DRIVER,EEPROM_DRIVER="$(EEPROM_DRIVER)" is not a valid EEPROM driver)
-else
+  else
-  OPT_DEFS += -DEEPROM_ENABLE
+    OPT_DEFS += -DEEPROM_ENABLE
-  COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/eeprom
+    COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/eeprom
-  COMMON_VPATH += $(DRIVER_PATH)/eeprom
+    COMMON_VPATH += $(DRIVER_PATH)/eeprom
-  COMMON_VPATH += $(PLATFORM_COMMON_DIR)
+    COMMON_VPATH += $(PLATFORM_COMMON_DIR)
-  ifeq ($(strip $(EEPROM_DRIVER)), custom)
+    ifeq ($(strip $(EEPROM_DRIVER)), custom)
-    # Custom EEPROM implementation -- only needs to implement init/erase/read_block/write_block
+      # Custom EEPROM implementation -- only needs to implement init/erase/read_block/write_block
-    OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_CUSTOM
+      OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_CUSTOM
-    SRC += eeprom_driver.c
+      SRC += eeprom_driver.c
-  else ifeq ($(strip $(EEPROM_DRIVER)), wear_leveling)
+    else ifeq ($(strip $(EEPROM_DRIVER)), wear_leveling)
-    # Wear-leveling EEPROM implementation
+      # Wear-leveling EEPROM implementation
-    OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
+      OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
-    SRC += eeprom_driver.c eeprom_wear_leveling.c
+      SRC += eeprom_driver.c eeprom_wear_leveling.c
-  else ifeq ($(strip $(EEPROM_DRIVER)), i2c)
+    else ifeq ($(strip $(EEPROM_DRIVER)), i2c)
-    # External I2C EEPROM implementation
+      # External I2C EEPROM implementation
-    OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_I2C
+      OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_I2C
-    I2C_DRIVER_REQUIRED = yes
+      I2C_DRIVER_REQUIRED = yes
-    SRC += eeprom_driver.c eeprom_i2c.c
+      SRC += eeprom_driver.c eeprom_i2c.c
-  else ifeq ($(strip $(EEPROM_DRIVER)), spi)
+    else ifeq ($(strip $(EEPROM_DRIVER)), spi)
-    # External SPI EEPROM implementation
+      # External SPI EEPROM implementation
-    OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_SPI
+      OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_SPI
-    SPI_DRIVER_REQUIRED = yes
+      SPI_DRIVER_REQUIRED = yes
-    SRC += eeprom_driver.c eeprom_spi.c
+      SRC += eeprom_driver.c eeprom_spi.c
-  else ifeq ($(strip $(EEPROM_DRIVER)), legacy_stm32_flash)
+    else ifeq ($(strip $(EEPROM_DRIVER)), legacy_stm32_flash)
-    # STM32 Emulated EEPROM, backed by MCU flash (soon to be deprecated)
+      # STM32 Emulated EEPROM, backed by MCU flash (soon to be deprecated)
-    OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_LEGACY_EMULATED_FLASH
+      OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_LEGACY_EMULATED_FLASH
-    COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash
+      COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash
-    COMMON_VPATH += $(DRIVER_PATH)/flash
+      COMMON_VPATH += $(DRIVER_PATH)/flash
-    SRC += eeprom_driver.c eeprom_legacy_emulated_flash.c legacy_flash_ops.c
+      SRC += eeprom_driver.c eeprom_legacy_emulated_flash.c legacy_flash_ops.c
-  else ifeq ($(strip $(EEPROM_DRIVER)), transient)
+    else ifeq ($(strip $(EEPROM_DRIVER)), transient)
-    # Transient EEPROM implementation -- no data storage but provides runtime area for it
+      # Transient EEPROM implementation -- no data storage but provides runtime area for it
-    OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_TRANSIENT
+      OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_TRANSIENT
-    SRC += eeprom_driver.c eeprom_transient.c
+      SRC += eeprom_driver.c eeprom_transient.c
-  else ifeq ($(strip $(EEPROM_DRIVER)), vendor)
+    else ifeq ($(strip $(EEPROM_DRIVER)), vendor)
-    # Vendor-implemented EEPROM
+      # Vendor-implemented EEPROM
-    OPT_DEFS += -DEEPROM_VENDOR
+      OPT_DEFS += -DEEPROM_VENDOR
-    ifeq ($(PLATFORM),AVR)
+      ifeq ($(PLATFORM),AVR)
-      # Automatically provided by avr-libc, nothing required
+        # Automatically provided by avr-libc, nothing required
-    else ifeq ($(PLATFORM),CHIBIOS)
+      else ifeq ($(PLATFORM),CHIBIOS)
-      ifneq ($(filter %_STM32F072xB %_STM32F042x6, $(MCU_SERIES)_$(MCU_LDSCRIPT)),)
+        ifneq ($(filter %_STM32F072xB %_STM32F042x6, $(MCU_SERIES)_$(MCU_LDSCRIPT)),)
-        # STM32 Emulated EEPROM, backed by MCU flash (soon to be deprecated)
+          # STM32 Emulated EEPROM, backed by MCU flash (soon to be deprecated)
-        OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_LEGACY_EMULATED_FLASH
+          OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_LEGACY_EMULATED_FLASH
-        COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash
+          COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash
-        COMMON_VPATH += $(DRIVER_PATH)/flash
+          COMMON_VPATH += $(DRIVER_PATH)/flash
-        SRC += eeprom_driver.c eeprom_legacy_emulated_flash.c legacy_flash_ops.c
+          SRC += eeprom_driver.c eeprom_legacy_emulated_flash.c legacy_flash_ops.c
-      else ifneq ($(filter $(MCU_SERIES),STM32F1xx STM32F3xx STM32F4xx STM32L4xx STM32G4xx WB32F3G71xx WB32FQ95xx AT32F415 GD32VF103),)
+        else ifneq ($(filter $(MCU_SERIES),STM32F1xx STM32F3xx STM32F4xx STM32L4xx STM32G4xx WB32F3G71xx WB32FQ95xx AT32F415 GD32VF103),)
-        # Wear-leveling EEPROM implementation, backed by MCU flash
+          # Wear-leveling EEPROM implementation, backed by MCU flash
-        OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
+          OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
-        SRC += eeprom_driver.c eeprom_wear_leveling.c
+          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),)
+        else ifneq ($(filter $(MCU_SERIES),STM32L0xx STM32L1xx),)
-        # True EEPROM on STM32L0xx, L1xx
+          # True EEPROM on STM32L0xx, L1xx
-        OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_STM32_L0_L1
+          OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_STM32_L0_L1
-        SRC += eeprom_driver.c eeprom_stm32_L0_L1.c
+          SRC += eeprom_driver.c eeprom_stm32_L0_L1.c
-      else ifneq ($(filter $(MCU_SERIES),RP2040),)
+        else ifneq ($(filter $(MCU_SERIES),RP2040),)
-        # Wear-leveling EEPROM implementation, backed by RP2040 flash
+          # Wear-leveling EEPROM implementation, backed by RP2040 flash
-        OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
+          OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
-        SRC += eeprom_driver.c eeprom_wear_leveling.c
+          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),)
+        else ifneq ($(filter $(MCU_SERIES),KL2x K20x),)
-        # Teensy EEPROM implementations
+          # Teensy EEPROM implementations
-        OPT_DEFS += -DEEPROM_KINETIS_FLEXRAM
+          OPT_DEFS += -DEEPROM_KINETIS_FLEXRAM
-        SRC += eeprom_kinetis_flexram.c
+          SRC += eeprom_kinetis_flexram.c
-      else
+        else
-        # Fall back to transient, i.e. non-persistent
+          # Fall back to transient, i.e. non-persistent
-        OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_TRANSIENT
+          OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_TRANSIENT
-        SRC += eeprom_driver.c eeprom_transient.c
+          SRC += eeprom_driver.c eeprom_transient.c
+        endif
+      else ifeq ($(PLATFORM),TEST)
+        # Test harness "EEPROM"
+        OPT_DEFS += -DEEPROM_TEST_HARNESS
+        SRC += eeprom.c
      endif
-    else ifeq ($(PLATFORM),TEST)
-      # Test harness "EEPROM"
-      OPT_DEFS += -DEEPROM_TEST_HARNESS
-      SRC += eeprom.c
    endif
  endif
 endif

diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk index 802e01de43..f30a456fc3 100644 --- a/builddefs/common_features.mk +++ b/builddefs/common_features.mk
@@ -171,80 +171,82 @@ endif
171		171
172	VALID_EEPROM_DRIVER_TYPES := vendor custom transient i2c spi wear_leveling legacy_stm32_flash	172	VALID_EEPROM_DRIVER_TYPES := vendor custom transient i2c spi wear_leveling legacy_stm32_flash
173	EEPROM_DRIVER ?= vendor	173	EEPROM_DRIVER ?= vendor
174	ifeq ($(filter $(EEPROM_DRIVER),$(VALID_EEPROM_DRIVER_TYPES)),)	174	ifneq ($(strip $(EEPROM_DRIVER)),none)
		175	ifeq ($(filter $(EEPROM_DRIVER),$(VALID_EEPROM_DRIVER_TYPES)),)
175	$(call CATASTROPHIC_ERROR,Invalid EEPROM_DRIVER,EEPROM_DRIVER="$(EEPROM_DRIVER)" is not a valid EEPROM driver)	176	$(call CATASTROPHIC_ERROR,Invalid EEPROM_DRIVER,EEPROM_DRIVER="$(EEPROM_DRIVER)" is not a valid EEPROM driver)
176	else	177	else
177	OPT_DEFS += -DEEPROM_ENABLE	178	OPT_DEFS += -DEEPROM_ENABLE
178	COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/eeprom	179	COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/eeprom
179	COMMON_VPATH += $(DRIVER_PATH)/eeprom	180	COMMON_VPATH += $(DRIVER_PATH)/eeprom
180	COMMON_VPATH += $(PLATFORM_COMMON_DIR)	181	COMMON_VPATH += $(PLATFORM_COMMON_DIR)
181	ifeq ($(strip $(EEPROM_DRIVER)), custom)	182	ifeq ($(strip $(EEPROM_DRIVER)), custom)
182	# Custom EEPROM implementation -- only needs to implement init/erase/read_block/write_block	183	# Custom EEPROM implementation -- only needs to implement init/erase/read_block/write_block
183	OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_CUSTOM	184	OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_CUSTOM
184	SRC += eeprom_driver.c	185	SRC += eeprom_driver.c
185	else ifeq ($(strip $(EEPROM_DRIVER)), wear_leveling)	186	else ifeq ($(strip $(EEPROM_DRIVER)), wear_leveling)
186	# Wear-leveling EEPROM implementation	187	# Wear-leveling EEPROM implementation
187	OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING	188	OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
188	SRC += eeprom_driver.c eeprom_wear_leveling.c	189	SRC += eeprom_driver.c eeprom_wear_leveling.c
189	else ifeq ($(strip $(EEPROM_DRIVER)), i2c)	190	else ifeq ($(strip $(EEPROM_DRIVER)), i2c)
190	# External I2C EEPROM implementation	191	# External I2C EEPROM implementation
191	OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_I2C	192	OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_I2C
192	I2C_DRIVER_REQUIRED = yes	193	I2C_DRIVER_REQUIRED = yes
193	SRC += eeprom_driver.c eeprom_i2c.c	194	SRC += eeprom_driver.c eeprom_i2c.c
194	else ifeq ($(strip $(EEPROM_DRIVER)), spi)	195	else ifeq ($(strip $(EEPROM_DRIVER)), spi)
195	# External SPI EEPROM implementation	196	# External SPI EEPROM implementation
196	OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_SPI	197	OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_SPI
197	SPI_DRIVER_REQUIRED = yes	198	SPI_DRIVER_REQUIRED = yes
198	SRC += eeprom_driver.c eeprom_spi.c	199	SRC += eeprom_driver.c eeprom_spi.c
199	else ifeq ($(strip $(EEPROM_DRIVER)), legacy_stm32_flash)	200	else ifeq ($(strip $(EEPROM_DRIVER)), legacy_stm32_flash)
200	# STM32 Emulated EEPROM, backed by MCU flash (soon to be deprecated)	201	# STM32 Emulated EEPROM, backed by MCU flash (soon to be deprecated)
201	OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_LEGACY_EMULATED_FLASH	202	OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_LEGACY_EMULATED_FLASH
202	COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash	203	COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash
203	COMMON_VPATH += $(DRIVER_PATH)/flash	204	COMMON_VPATH += $(DRIVER_PATH)/flash
204	SRC += eeprom_driver.c eeprom_legacy_emulated_flash.c legacy_flash_ops.c	205	SRC += eeprom_driver.c eeprom_legacy_emulated_flash.c legacy_flash_ops.c
205	else ifeq ($(strip $(EEPROM_DRIVER)), transient)	206	else ifeq ($(strip $(EEPROM_DRIVER)), transient)
206	# Transient EEPROM implementation -- no data storage but provides runtime area for it	207	# Transient EEPROM implementation -- no data storage but provides runtime area for it
207	OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_TRANSIENT	208	OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_TRANSIENT
208	SRC += eeprom_driver.c eeprom_transient.c	209	SRC += eeprom_driver.c eeprom_transient.c
209	else ifeq ($(strip $(EEPROM_DRIVER)), vendor)	210	else ifeq ($(strip $(EEPROM_DRIVER)), vendor)
210	# Vendor-implemented EEPROM	211	# Vendor-implemented EEPROM
211	OPT_DEFS += -DEEPROM_VENDOR	212	OPT_DEFS += -DEEPROM_VENDOR
212	ifeq ($(PLATFORM),AVR)	213	ifeq ($(PLATFORM),AVR)
213	# Automatically provided by avr-libc, nothing required	214	# Automatically provided by avr-libc, nothing required
214	else ifeq ($(PLATFORM),CHIBIOS)	215	else ifeq ($(PLATFORM),CHIBIOS)
215	ifneq ($(filter %_STM32F072xB %_STM32F042x6, $(MCU_SERIES)_$(MCU_LDSCRIPT)),)	216	ifneq ($(filter %_STM32F072xB %_STM32F042x6, $(MCU_SERIES)_$(MCU_LDSCRIPT)),)
216	# STM32 Emulated EEPROM, backed by MCU flash (soon to be deprecated)	217	# STM32 Emulated EEPROM, backed by MCU flash (soon to be deprecated)
217	OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_LEGACY_EMULATED_FLASH	218	OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_LEGACY_EMULATED_FLASH
218	COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash	219	COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash
219	COMMON_VPATH += $(DRIVER_PATH)/flash	220	COMMON_VPATH += $(DRIVER_PATH)/flash
220	SRC += eeprom_driver.c eeprom_legacy_emulated_flash.c legacy_flash_ops.c	221	SRC += eeprom_driver.c eeprom_legacy_emulated_flash.c legacy_flash_ops.c
221	else ifneq ($(filter $(MCU_SERIES),STM32F1xx STM32F3xx STM32F4xx STM32L4xx STM32G4xx WB32F3G71xx WB32FQ95xx AT32F415 GD32VF103),)	222	else ifneq ($(filter $(MCU_SERIES),STM32F1xx STM32F3xx STM32F4xx STM32L4xx STM32G4xx WB32F3G71xx WB32FQ95xx AT32F415 GD32VF103),)
222	# Wear-leveling EEPROM implementation, backed by MCU flash	223	# Wear-leveling EEPROM implementation, backed by MCU flash
223	OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING	224	OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
224	SRC += eeprom_driver.c eeprom_wear_leveling.c	225	SRC += eeprom_driver.c eeprom_wear_leveling.c
225	WEAR_LEVELING_DRIVER ?= embedded_flash	226	WEAR_LEVELING_DRIVER ?= embedded_flash
226	else ifneq ($(filter $(MCU_SERIES),STM32L0xx STM32L1xx),)	227	else ifneq ($(filter $(MCU_SERIES),STM32L0xx STM32L1xx),)
227	# True EEPROM on STM32L0xx, L1xx	228	# True EEPROM on STM32L0xx, L1xx
228	OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_STM32_L0_L1	229	OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_STM32_L0_L1
229	SRC += eeprom_driver.c eeprom_stm32_L0_L1.c	230	SRC += eeprom_driver.c eeprom_stm32_L0_L1.c
230	else ifneq ($(filter $(MCU_SERIES),RP2040),)	231	else ifneq ($(filter $(MCU_SERIES),RP2040),)
231	# Wear-leveling EEPROM implementation, backed by RP2040 flash	232	# Wear-leveling EEPROM implementation, backed by RP2040 flash
232	OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING	233	OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
233	SRC += eeprom_driver.c eeprom_wear_leveling.c	234	SRC += eeprom_driver.c eeprom_wear_leveling.c
234	WEAR_LEVELING_DRIVER ?= rp2040_flash	235	WEAR_LEVELING_DRIVER ?= rp2040_flash
235	else ifneq ($(filter $(MCU_SERIES),KL2x K20x),)	236	else ifneq ($(filter $(MCU_SERIES),KL2x K20x),)
236	# Teensy EEPROM implementations	237	# Teensy EEPROM implementations
237	OPT_DEFS += -DEEPROM_KINETIS_FLEXRAM	238	OPT_DEFS += -DEEPROM_KINETIS_FLEXRAM
238	SRC += eeprom_kinetis_flexram.c	239	SRC += eeprom_kinetis_flexram.c
239	else	240	else
240	# Fall back to transient, i.e. non-persistent	241	# Fall back to transient, i.e. non-persistent
241	OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_TRANSIENT	242	OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_TRANSIENT
242	SRC += eeprom_driver.c eeprom_transient.c	243	SRC += eeprom_driver.c eeprom_transient.c
		244	endif
		245	else ifeq ($(PLATFORM),TEST)
		246	# Test harness "EEPROM"
		247	OPT_DEFS += -DEEPROM_TEST_HARNESS
		248	SRC += eeprom.c
243	endif	249	endif
244	else ifeq ($(PLATFORM),TEST)
245	# Test harness "EEPROM"
246	OPT_DEFS += -DEEPROM_TEST_HARNESS
247	SRC += eeprom.c
248	endif	250	endif
249	endif	251	endif
250	endif	252	endif