diff options
| author | Ryan <fauxpark@gmail.com> | 2023-07-29 15:16:14 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-29 15:16:14 +1000 |
| commit | b4a7b9253a996484b10b4762f7b2fff7c9105c34 (patch) | |
| tree | 5690b166d442664d46df40cdf6c98c7bef247245 /builddefs | |
| parent | 4af6f1df06326376ce07a43560ff0a68e9dd1eb1 (diff) | |
Bluetooth: driver naming cleanups (#21624)
Diffstat (limited to 'builddefs')
| -rw-r--r-- | builddefs/common_features.mk | 6 | ||||
| -rw-r--r-- | builddefs/show_options.mk | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk index 2de2bdd56b..dd7e93d780 100644 --- a/builddefs/common_features.mk +++ b/builddefs/common_features.mk @@ -903,7 +903,7 @@ ifeq ($(strip $(USBPD_ENABLE)), yes) endif BLUETOOTH_ENABLE ?= no -VALID_BLUETOOTH_DRIVER_TYPES := BluefruitLE RN42 custom +VALID_BLUETOOTH_DRIVER_TYPES := bluefruit_le custom rn42 ifeq ($(strip $(BLUETOOTH_ENABLE)), yes) ifeq ($(filter $(strip $(BLUETOOTH_DRIVER)),$(VALID_BLUETOOTH_DRIVER_TYPES)),) $(call CATASTROPHIC_ERROR,Invalid BLUETOOTH_DRIVER,BLUETOOTH_DRIVER="$(BLUETOOTH_DRIVER)" is not a valid Bluetooth driver type) @@ -913,7 +913,7 @@ ifeq ($(strip $(BLUETOOTH_ENABLE)), yes) COMMON_VPATH += $(DRIVER_PATH)/bluetooth SRC += outputselect.c - ifeq ($(strip $(BLUETOOTH_DRIVER)), BluefruitLE) + ifeq ($(strip $(BLUETOOTH_DRIVER)), bluefruit_le) OPT_DEFS += -DBLUETOOTH_BLUEFRUIT_LE -DHAL_USE_SPI=TRUE SRC += $(DRIVER_PATH)/bluetooth/bluetooth.c SRC += $(DRIVER_PATH)/bluetooth/bluefruit_le.cpp @@ -921,7 +921,7 @@ ifeq ($(strip $(BLUETOOTH_ENABLE)), yes) QUANTUM_LIB_SRC += spi_master.c endif - ifeq ($(strip $(BLUETOOTH_DRIVER)), RN42) + ifeq ($(strip $(BLUETOOTH_DRIVER)), rn42) OPT_DEFS += -DBLUETOOTH_RN42 -DHAL_USE_SERIAL=TRUE SRC += $(DRIVER_PATH)/bluetooth/bluetooth.c SRC += $(DRIVER_PATH)/bluetooth/rn42.c diff --git a/builddefs/show_options.mk b/builddefs/show_options.mk index 8bcc02083b..c21f907881 100644 --- a/builddefs/show_options.mk +++ b/builddefs/show_options.mk @@ -60,7 +60,6 @@ OTHER_OPTION_NAMES = \ ENCODER_ENABLE_CUSTOM \ GERMAN_ENABLE \ HAPTIC_ENABLE \ - HHKB_RN42_ENABLE \ ISSI_ENABLE \ KEYLOGGER_ENABLE \ LCD_BACKLIGHT_ENABLE \ |