diff options
| author | Joel Challis <git@zvecr.com> | 2022-10-22 20:39:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-22 12:39:39 -0700 |
| commit | 575db6949abb76d7f75ba69311a9492d7b79108a (patch) | |
| tree | 014f45e05547066868f774a7e6447b3784bd0b5f /builddefs | |
| parent | 416c54297efe6345cdf950c537ca5c2f611fe937 (diff) | |
Generalise CTPC logic from common_features (#18803)
Diffstat (limited to 'builddefs')
| -rw-r--r-- | builddefs/build_keyboard.mk | 4 | ||||
| -rw-r--r-- | builddefs/common_features.mk | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk index cfec9cdebe..499e6ffc69 100644 --- a/builddefs/build_keyboard.mk +++ b/builddefs/build_keyboard.mk @@ -368,6 +368,10 @@ endif # Disable features that a keyboard doesn't support -include $(BUILDDEFS_PATH)/disable_features.mk +ifneq ("$(CONVERTER)","") + -include $(CONVERTER)/post_converter.mk +endif + # Pull in post_rules.mk files from all our subfolders ifneq ("$(wildcard $(KEYBOARD_PATH_1)/post_rules.mk)","") include $(KEYBOARD_PATH_1)/post_rules.mk diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk index 8814d8b0f9..9939e0e5df 100644 --- a/builddefs/common_features.mk +++ b/builddefs/common_features.mk @@ -539,11 +539,7 @@ endif VALID_BACKLIGHT_TYPES := pwm timer software custom BACKLIGHT_ENABLE ?= no -ifeq ($(strip $(CONVERT_TO_PROTON_C)), yes) - BACKLIGHT_DRIVER ?= software -else - BACKLIGHT_DRIVER ?= pwm -endif +BACKLIGHT_DRIVER ?= pwm ifeq ($(strip $(BACKLIGHT_ENABLE)), yes) ifeq ($(filter $(BACKLIGHT_DRIVER),$(VALID_BACKLIGHT_TYPES)),) $(call CATASTROPHIC_ERROR,Invalid BACKLIGHT_DRIVER,BACKLIGHT_DRIVER="$(BACKLIGHT_DRIVER)" is not a valid backlight type) |