From 997534bdae1d31db5b595a8e754475ac35df425d Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Sun, 26 Jun 2022 10:11:56 +1000 Subject: [PATCH] Cleanup makefile, force FNV inclusion. --- builddefs/common_features.mk | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk index 4b1bc6470ec9..be772e04c04c 100644 --- a/builddefs/common_features.mk +++ b/builddefs/common_features.mk @@ -262,18 +262,20 @@ ifneq ($(strip $(WEAR_LEVELING_DRIVER)),none) ifeq ($(filter $(WEAR_LEVELING_DRIVER),$(VALID_WEAR_LEVELING_DRIVER_TYPES)),) $(call CATASTROPHIC_ERROR,Invalid WEAR_LEVELING_DRIVER,WEAR_LEVELING_DRIVER="$(WEAR_LEVELING_DRIVER)" is not a valid wear leveling driver) else + FNV_ENABLE := yes OPT_DEFS += -DWEAR_LEVELING_ENABLE + OPT_DEFS += -DWEAR_LEVELING_$(strip $(shell echo $(WEAR_LEVELING_DRIVER) | tr '[:lower:]' '[:upper:]')) COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/wear_leveling COMMON_VPATH += $(DRIVER_PATH)/wear_leveling COMMON_VPATH += $(QUANTUM_DIR)/wear_leveling + SRC += wear_leveling.c ifeq ($(strip $(WEAR_LEVELING_DRIVER)), efl) - OPT_DEFS += -DWEAR_LEVELING_DRIVER_EFL -DHAL_USE_EFL - SRC += wear_leveling.c wear_leveling_efl.c + OPT_DEFS += -DHAL_USE_EFL + SRC += wear_leveling_efl.c POST_CONFIG_H += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/wear_leveling/wear_leveling_efl_config.h else ifeq ($(strip $(WEAR_LEVELING_DRIVER)), stm32f4x1) - OPT_DEFS += -DWEAR_LEVELING_DRIVER_STM32F4X1 COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash - SRC += wear_leveling.c flash_stm32.c wear_leveling_stm32f4x1.c + SRC += flash_stm32.c wear_leveling_stm32f4x1.c POST_CONFIG_H += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/wear_leveling/wear_leveling_stm32f4x1_config.h endif endif