diff options
Diffstat (limited to 'builddefs/converters.mk')
| -rw-r--r-- | builddefs/converters.mk | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/builddefs/converters.mk b/builddefs/converters.mk index c7e499226c..17b1c3b6ee 100644 --- a/builddefs/converters.mk +++ b/builddefs/converters.mk @@ -1,30 +1,25 @@ # Note for new boards -- CTPC and CONVERT_TO_PROTON_C are deprecated terms # and should not be replicated for new boards. These will be removed from # documentation as well as existing keymaps in due course. -ifeq ($(strip $(CTPC)), yes) - CONVERT_TO_PROTON_C=yes -endif -ifeq ($(strip $(CONVERT_TO_PROTON_C)), yes) - CONVERT_TO=proton_c - -cpfirmware: ctpc_warning -.INTERMEDIATE: ctpc_warning -ctpc_warning: elf - $(info @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@) - $(info The `CONVERT_TO_PROTON_C` and `CTPC` options are soon to be deprecated.) - $(info Boards should be changed to use `CONVERT_TO=proton_c` instead.) - $(info @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@) +ifneq ($(findstring yes, $(CTPC)$(CONVERT_TO_PROTON_C)),) +$(call CATASTROPHIC_ERROR,The `CONVERT_TO_PROTON_C` and `CTPC` options are now deprecated. `CONVERT_TO=proton_c` should be used instead.) endif # TODO: opt in rather than assume everything uses a pro micro PIN_COMPATIBLE ?= promicro ifneq ($(CONVERT_TO),) + # stash so we can overwrite env provided vars if needed + ACTIVE_CONVERTER=$(CONVERT_TO) + # glob to search each platfrorm and/or check for valid converter CONVERTER := $(wildcard $(PLATFORM_PATH)/*/converters/$(PIN_COMPATIBLE)_to_$(CONVERT_TO)/) ifeq ($(CONVERTER),) $(call CATASTROPHIC_ERROR,Converting from '$(PIN_COMPATIBLE)' to '$(CONVERT_TO)' not possible!) endif + -include $(CONVERTER)/pre_converter.mk + + PLATFORM_KEY = $(shell echo $(CONVERTER) | cut -d "/" -f2) TARGET := $(TARGET)_$(CONVERT_TO) # Configure any defaults @@ -33,6 +28,9 @@ ifneq ($(CONVERT_TO),) OPT_DEFS += -DCONVERTER_ENABLED VPATH += $(CONVERTER) + # Configure for "alias" - worst case it produces an idential define + OPT_DEFS += -DCONVERT_TO_$(strip $(shell echo $(ACTIVE_CONVERTER) | tr '[:lower:]' '[:upper:]')) + # Finally run any converter specific logic include $(CONVERTER)/converter.mk endif |