aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common_features.mk15
-rw-r--r--quantum/stm32/proton_c.mk4
2 files changed, 9 insertions, 10 deletions
diff --git a/common_features.mk b/common_features.mk
index 1c814286c..9b60eeed0 100644
--- a/common_features.mk
+++ b/common_features.mk
@@ -231,15 +231,16 @@ endif
231 231
232# backward compat 232# backward compat
233ifeq ($(strip $(BACKLIGHT_CUSTOM_DRIVER)), yes) 233ifeq ($(strip $(BACKLIGHT_CUSTOM_DRIVER)), yes)
234 BACKLIGHT_ENABLE = custom 234 BACKLIGHT_DRIVER = custom
235endif 235endif
236 236
237VALID_BACKLIGHT_TYPES := yes software custom 237VALID_BACKLIGHT_TYPES := pwm software custom
238 238
239BACKLIGHT_ENABLE ?= no 239BACKLIGHT_ENABLE ?= no
240ifneq ($(strip $(BACKLIGHT_ENABLE)), no) 240BACKLIGHT_DRIVER ?= pwm
241 ifeq ($(filter $(BACKLIGHT_ENABLE),$(VALID_BACKLIGHT_TYPES)),) 241ifeq ($(strip $(BACKLIGHT_ENABLE)), yes)
242 $(error BACKLIGHT_ENABLE="$(BACKLIGHT_ENABLE)" is not a valid backlight type) 242 ifeq ($(filter $(BACKLIGHT_DRIVER),$(VALID_BACKLIGHT_TYPES)),)
243 $(error BACKLIGHT_DRIVER="$(BACKLIGHT_DRIVER)" is not a valid backlight type)
243 endif 244 endif
244 245
245 ifeq ($(strip $(VISUALIZER_ENABLE)), yes) 246 ifeq ($(strip $(VISUALIZER_ENABLE)), yes)
@@ -250,10 +251,10 @@ ifneq ($(strip $(BACKLIGHT_ENABLE)), no)
250 SRC += $(QUANTUM_DIR)/backlight/backlight.c 251 SRC += $(QUANTUM_DIR)/backlight/backlight.c
251 OPT_DEFS += -DBACKLIGHT_ENABLE 252 OPT_DEFS += -DBACKLIGHT_ENABLE
252 253
253 ifeq ($(strip $(BACKLIGHT_ENABLE)), software) 254 ifeq ($(strip $(BACKLIGHT_DRIVER)), software)
254 SRC += $(QUANTUM_DIR)/backlight/backlight_soft.c 255 SRC += $(QUANTUM_DIR)/backlight/backlight_soft.c
255 else 256 else
256 ifeq ($(strip $(BACKLIGHT_ENABLE)), custom) 257 ifeq ($(strip $(BACKLIGHT_DRIVER)), custom)
257 OPT_DEFS += -DBACKLIGHT_CUSTOM_DRIVER 258 OPT_DEFS += -DBACKLIGHT_CUSTOM_DRIVER
258 endif 259 endif
259 260
diff --git a/quantum/stm32/proton_c.mk b/quantum/stm32/proton_c.mk
index ff28a4cb5..b25b55504 100644
--- a/quantum/stm32/proton_c.mk
+++ b/quantum/stm32/proton_c.mk
@@ -5,9 +5,7 @@ AUDIO_ENABLE = yes
5WS2812_DRIVER = bitbang 5WS2812_DRIVER = bitbang
6 6
7# Force task driven PWM until ARM can provide automatic configuration 7# Force task driven PWM until ARM can provide automatic configuration
8ifneq ($(strip $(BACKLIGHT_ENABLE)), no) 8BACKLIGHT_DRIVER = software
9 BACKLIGHT_ENABLE = software
10endif
11 9
12# The rest of these settings shouldn't change 10# The rest of these settings shouldn't change
13 11