diff options
| author | Nick Brassel <nick@tzarc.org> | 2024-08-26 10:01:57 +1000 |
|---|---|---|
| committer | Nick Brassel <nick@tzarc.org> | 2024-08-26 10:01:57 +1000 |
| commit | 5d76c5280dc0aff398cdce19fa54d0e0725c418d (patch) | |
| tree | 40026340f0d524a6006f18f01ef988e15d271075 /builddefs/common_features.mk | |
| parent | e6a898e3eea3521d3f0497ee26937d5269d78fb7 (diff) | |
| parent | 81dcf2b547bacc42bd9cf8ccaccd3d7164e69926 (diff) | |
Merge branch 'develop'
Diffstat (limited to 'builddefs/common_features.mk')
| -rw-r--r-- | builddefs/common_features.mk | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk index 68f9a1dd08..498614dd26 100644 --- a/builddefs/common_features.mk +++ b/builddefs/common_features.mk @@ -282,18 +282,17 @@ ifneq ($(strip $(WEAR_LEVELING_DRIVER)),none) endif endif -VALID_FLASH_DRIVER_TYPES := spi +VALID_FLASH_DRIVER_TYPES := spi custom FLASH_DRIVER ?= none ifneq ($(strip $(FLASH_DRIVER)), none) ifeq ($(filter $(FLASH_DRIVER),$(VALID_FLASH_DRIVER_TYPES)),) $(call CATASTROPHIC_ERROR,Invalid FLASH_DRIVER,FLASH_DRIVER="$(FLASH_DRIVER)" is not a valid flash driver) else - OPT_DEFS += -DFLASH_ENABLE + OPT_DEFS += -DFLASH_ENABLE -DFLASH_DRIVER -DFLASH_DRIVER_$(strip $(shell echo $(FLASH_DRIVER) | tr '[:lower:]' '[:upper:]')) + COMMON_VPATH += $(DRIVER_PATH)/flash ifeq ($(strip $(FLASH_DRIVER)),spi) - SPI_DRIVER_REQUIRED = yes - OPT_DEFS += -DFLASH_DRIVER -DFLASH_SPI - COMMON_VPATH += $(DRIVER_PATH)/flash SRC += flash_spi.c + SPI_DRIVER_REQUIRED = yes endif endif endif |