From 34446b79d7a17ba6e753d39956ebb5e871618d84 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Mon, 4 Jan 2021 08:45:43 +1100
Subject: [PATCH] Split up QWIIC_ENABLE to use QWIIC_DRIVERS as well, with
 yes/no for enable flag. (#11426)

---
 drivers/qwiic/qwiic.mk                       | 9 +++++----
 keyboards/boston_meetup/2019/rules.mk        | 3 ++-
 keyboards/cannonkeys/satisfaction75/rules.mk | 5 +++--
 keyboards/hadron/ver3/rules.mk               | 3 ++-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/drivers/qwiic/qwiic.mk b/drivers/qwiic/qwiic.mk
index b23c25657de..164bd721081 100644
--- a/drivers/qwiic/qwiic.mk
+++ b/drivers/qwiic/qwiic.mk
@@ -1,16 +1,17 @@
-ifneq ($(strip $(QWIIC_ENABLE)),)
+ifeq ($(strip $(QWIIC_ENABLE)),yes)
   COMMON_VPATH += $(DRIVER_PATH)/qwiic
   OPT_DEFS += -DQWIIC_ENABLE
   SRC += qwiic.c
   QUANTUM_LIB_SRC += i2c_master.c
-endif
 
-ifneq ($(filter JOYSTIIC, $(QWIIC_ENABLE)),)
+ifneq ($(filter JOYSTIIC, $(QWIIC_DRIVERS)),)
   OPT_DEFS += -DQWIIC_JOYSTIIC_ENABLE
   SRC += joystiic.c
 endif
 
-ifneq ($(filter MICRO_OLED, $(QWIIC_ENABLE)),)
+ifneq ($(filter MICRO_OLED, $(QWIIC_DRIVERS)),)
   OPT_DEFS += -DQWIIC_MICRO_OLED_ENABLE
   SRC += micro_oled.c
 endif
+
+endif
diff --git a/keyboards/boston_meetup/2019/rules.mk b/keyboards/boston_meetup/2019/rules.mk
index 7b9df20a884..c79ce4b441a 100644
--- a/keyboards/boston_meetup/2019/rules.mk
+++ b/keyboards/boston_meetup/2019/rules.mk
@@ -19,5 +19,6 @@ RGBLIGHT_ENABLE = no
 RGB_MATRIX_ENABLE = no
 RGB_MATRIX_DRIVER = WS2812
 HAPTIC_ENABLE += DRV2605L
-QWIIC_ENABLE += MICRO_OLED
+QWIIC_ENABLE = yes
+QWIIC_DRIVERS += MICRO_OLED
 # SERIAL_LINK_ENABLE = yes
diff --git a/keyboards/cannonkeys/satisfaction75/rules.mk b/keyboards/cannonkeys/satisfaction75/rules.mk
index 3a48d3ebfd2..e0f646ccc36 100644
--- a/keyboards/cannonkeys/satisfaction75/rules.mk
+++ b/keyboards/cannonkeys/satisfaction75/rules.mk
@@ -19,12 +19,13 @@ SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
 NKRO_ENABLE = yes	    # USB Nkey Rollover
 CUSTOM_MATRIX = no # Custom matrix file
 ENCODER_ENABLE = yes
-QWIIC_ENABLE += MICRO_OLED
+QWIIC_ENABLE = yes
+QWIIC_DRIVERS += MICRO_OLED
 #BACKLIGHT_ENABLE = yes
 
 DEFAULT_FOLDER = cannonkeys/satisfaction75/rev1
 
-# Wildcard to allow APM32 MCU 
+# Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -p FFFF -v FFFF
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
diff --git a/keyboards/hadron/ver3/rules.mk b/keyboards/hadron/ver3/rules.mk
index ae7f67862af..62d7fb09e50 100644
--- a/keyboards/hadron/ver3/rules.mk
+++ b/keyboards/hadron/ver3/rules.mk
@@ -19,6 +19,7 @@ RGBLIGHT_ENABLE = yes
 RGB_MATRIX_ENABLE = no # once arm_rgb is implemented
 RGB_MATRIX_DRIVER = WS2812
 HAPTIC_ENABLE += DRV2605L
-QWIIC_ENABLE += MICRO_OLED
+QWIIC_ENABLE = yes
+QWIIC_DRIVERS += MICRO_OLED
 ENCODER_ENABLER = yes
 # SERIAL_LINK_ENABLE = yes