diff options
| author | Joel Challis <git@zvecr.com> | 2023-01-11 22:44:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-11 22:44:55 +0000 |
| commit | 1bbacec44d6be90b6044ca46865738887e709b30 (patch) | |
| tree | 9445c1d2ea410e06aef7e19eee5e28f35f4c537d | |
| parent | 53caeb7952262b0d28ef1c9dcc5aff435f457f51 (diff) | |
Promote CTPC warning to error (#19565)
| -rw-r--r-- | builddefs/converters.mk | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/builddefs/converters.mk b/builddefs/converters.mk index c7e499226c..4593c7113f 100644 --- a/builddefs/converters.mk +++ b/builddefs/converters.mk @@ -1,19 +1,8 @@ # 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 |